From eb6bf67d30c7370c20ef6c40e52889e671708198 Mon Sep 17 00:00:00 2001
From: Thomas Eizinger <thomas@eizinger.io>
Date: Wed, 24 Jan 2024 16:55:33 -0800
Subject: [PATCH] deps(transport-interop): add `v0.53` release of `rust-libp2p`
 (#326)

---
 .../impl/rust-chromium/v0.52/Makefile         |  2 +-
 .../impl/rust-chromium/v0.53/Makefile         | 20 +++++++++++++++++++
 transport-interop/impl/rust/v0.53/Makefile    | 20 +++++++++++++++++++
 transport-interop/versions.ts                 | 17 +++++++++++++++-
 4 files changed, 57 insertions(+), 2 deletions(-)
 create mode 100644 transport-interop/impl/rust-chromium/v0.53/Makefile
 create mode 100644 transport-interop/impl/rust/v0.53/Makefile

diff --git a/transport-interop/impl/rust-chromium/v0.52/Makefile b/transport-interop/impl/rust-chromium/v0.52/Makefile
index 43fd11e..551b701 100644
--- a/transport-interop/impl/rust-chromium/v0.52/Makefile
+++ b/transport-interop/impl/rust-chromium/v0.52/Makefile
@@ -1,4 +1,4 @@
-image_name := rust-v0.52
+image_name := rust-chromium-v0.52
 # BROKEN because glibc does not match.
 commitSha := f1bfe8d4ed423d03df4ef477072178e953c85f45
 
diff --git a/transport-interop/impl/rust-chromium/v0.53/Makefile b/transport-interop/impl/rust-chromium/v0.53/Makefile
new file mode 100644
index 0000000..7688345
--- /dev/null
+++ b/transport-interop/impl/rust-chromium/v0.53/Makefile
@@ -0,0 +1,20 @@
+image_name := rust-chromium-v0.53
+commitSha := b7914e407da34c99fb76dcc300b3d44b9af97fac
+
+all: image.json
+
+image.json: rust-libp2p-${commitSha}
+	cd rust-libp2p-${commitSha} && IMAGE_NAME=${image_name} ../../../../dockerBuildWrapper.sh -f interop-tests/Dockerfile.chromium .
+	docker image inspect ${image_name} -f "{{.Id}}" | \
+		xargs -I {} echo "{\"imageID\": \"{}\"}" > $@
+
+rust-libp2p-${commitSha}: rust-libp2p-${commitSha}.zip
+	unzip -o rust-libp2p-${commitSha}.zip
+
+rust-libp2p-${commitSha}.zip:
+	wget -O $@ "https://github.com/libp2p/rust-libp2p/archive/${commitSha}.zip"
+
+clean:
+	rm image.json
+	rm rust-libp2p-*.zip
+	rm -rf rust-libp2p-*
diff --git a/transport-interop/impl/rust/v0.53/Makefile b/transport-interop/impl/rust/v0.53/Makefile
new file mode 100644
index 0000000..999f464
--- /dev/null
+++ b/transport-interop/impl/rust/v0.53/Makefile
@@ -0,0 +1,20 @@
+image_name := rust-v0.53
+commitSha := b7914e407da34c99fb76dcc300b3d44b9af97fac
+
+all: image.json
+
+image.json: rust-libp2p-${commitSha}
+	cd rust-libp2p-${commitSha} && IMAGE_NAME=${image_name} ../../../../dockerBuildWrapper.sh -f interop-tests/Dockerfile.native .
+	docker image inspect ${image_name} -f "{{.Id}}" | \
+		xargs -I {} echo "{\"imageID\": \"{}\"}" > $@
+
+rust-libp2p-${commitSha}: rust-libp2p-${commitSha}.zip
+	unzip -o rust-libp2p-${commitSha}.zip
+
+rust-libp2p-${commitSha}.zip:
+	wget -O $@ "https://github.com/libp2p/rust-libp2p/archive/${commitSha}.zip"
+
+clean:
+	rm image.json
+	rm rust-libp2p-*.zip
+	rm -rf rust-libp2p-*
diff --git a/transport-interop/versions.ts b/transport-interop/versions.ts
index d67dce3..3c134f0 100644
--- a/transport-interop/versions.ts
+++ b/transport-interop/versions.ts
@@ -62,13 +62,28 @@ export const versions: Array<Version> = [
         secureChannels: ["tls", "noise"],
         muxers: ["mplex", "yamux"],
     },
-    // Re-enable when we figure out the glibc mismatch issue: https://github.com/libp2p/test-plans/pull/342
+    {
+        id: "rust-v0.53",
+        transports: ["ws", "tcp", "quic-v1", "webrtc-direct"],
+        secureChannels: ["tls", "noise"],
+        muxers: ["mplex", "yamux"],
+    },
     // {
     //     id: "rust-chromium-v0.52",
     //     transports: [{ name: "webtransport", onlyDial: true }],
     //     secureChannels: [],
     //     muxers: [],
     // },
+    {
+        id: "rust-chromium-v0.53",
+        "transports": [
+            { "name": "webtransport", "onlyDial": true },
+            { "name": "webrtc-direct", "onlyDial": true },
+            { "name": "ws", "onlyDial": true }
+        ],
+        "secureChannels": ["noise"],
+        "muxers": ["mplex", "yamux"]
+    },
     {
         id: "js-v0.45",
         transports: ["tcp", "ws", { name: "wss", onlyDial: true }],