From 3071f8b75dcb8f4ea24c713b390370f4382c9ac6 Mon Sep 17 00:00:00 2001
From: Thomas Eizinger <thomas@eizinger.io>
Date: Thu, 16 Nov 2023 11:49:50 +1100
Subject: [PATCH] Add Rust v0.53 release

---
 .../impl/rust/{master => v0.53}/Makefile      |  4 ++--
 hole-punch-interop/versions.ts                |  3 +--
 .../impl/rust-chromium/v0.53/Makefile         | 20 +++++++++++++++++++
 transport-interop/impl/rust/v0.53/Makefile    | 20 +++++++++++++++++++
 transport-interop/versions.ts                 | 16 +++++++++++++++
 5 files changed, 59 insertions(+), 4 deletions(-)
 rename hole-punch-interop/impl/rust/{master => v0.53}/Makefile (87%)
 create mode 100644 transport-interop/impl/rust-chromium/v0.53/Makefile
 create mode 100644 transport-interop/impl/rust/v0.53/Makefile

diff --git a/hole-punch-interop/impl/rust/master/Makefile b/hole-punch-interop/impl/rust/v0.53/Makefile
similarity index 87%
rename from hole-punch-interop/impl/rust/master/Makefile
rename to hole-punch-interop/impl/rust/v0.53/Makefile
index 437c68a76..d5456b3dd 100644
--- a/hole-punch-interop/impl/rust/master/Makefile
+++ b/hole-punch-interop/impl/rust/v0.53/Makefile
@@ -1,5 +1,5 @@
-image_name := rust-master
-commitSha := 461209ab1ba6b8e2a653ca354a5aad38802a35f9
+image_name := rust-v0.53
+commitSha := caf9da4a69f1cce8183d4b17c792476ee44c37bc
 
 all: image.json
 
diff --git a/hole-punch-interop/versions.ts b/hole-punch-interop/versions.ts
index 609dc89d2..6613f4fcd 100644
--- a/hole-punch-interop/versions.ts
+++ b/hole-punch-interop/versions.ts
@@ -10,9 +10,8 @@ export type Version = {
 
 export const versions: Array<Version> = [
     {
-        id: "rust-master",
+        id: "rust-v0.53",
         transports: ["tcp", "quic"],
-        containerImageID: readImageId("./impl/rust/master/image.json"),
     } as Version,
 ].map((v: Version) => (typeof v.containerImageID === "undefined" ? ({ ...v, containerImageID: readImageId(canonicalImagePath(v.id)) }) : v))
 
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 000000000..b4ebee1a0
--- /dev/null
+++ b/transport-interop/impl/rust-chromium/v0.53/Makefile
@@ -0,0 +1,20 @@
+image_name := rust-v0.53
+commitSha := caf9da4a69f1cce8183d4b17c792476ee44c37bc
+
+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 000000000..f77b8c430
--- /dev/null
+++ b/transport-interop/impl/rust/v0.53/Makefile
@@ -0,0 +1,20 @@
+image_name := rust-v0.53
+commitSha := caf9da4a69f1cce8183d4b17c792476ee44c37bc
+
+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 57f8f4bd8..36acf0937 100644
--- a/transport-interop/versions.ts
+++ b/transport-interop/versions.ts
@@ -62,12 +62,28 @@ export const versions: Array<Version> = [
         secureChannels: ["tls", "noise"],
         muxers: ["mplex", "yamux"],
     },
+    {
+        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 }],