From e1b96b783ebcacbab12c96abaf74be6c37e7201e Mon Sep 17 00:00:00 2001 From: uink45 <79078981+uink45@users.noreply.github.com> Date: Wed, 4 Jun 2025 10:52:31 +1000 Subject: [PATCH 01/20] Add c-libp2p --- transport-interop/impl/c/.gitignore | 4 +++ transport-interop/impl/c/v0.0.1/Makefile | 26 ++++++++++++++++++++ transport-interop/impl/c/v0.0.1/version.lock | 1 + 3 files changed, 31 insertions(+) create mode 100644 transport-interop/impl/c/.gitignore create mode 100644 transport-interop/impl/c/v0.0.1/Makefile create mode 100644 transport-interop/impl/c/v0.0.1/version.lock diff --git a/transport-interop/impl/c/.gitignore b/transport-interop/impl/c/.gitignore new file mode 100644 index 000000000..d84214176 --- /dev/null +++ b/transport-interop/impl/c/.gitignore @@ -0,0 +1,4 @@ +c-libp2p-*.zip +c-libp2p-* +c-libp2p-*/* +image.json diff --git a/transport-interop/impl/c/v0.0.1/Makefile b/transport-interop/impl/c/v0.0.1/Makefile new file mode 100644 index 000000000..70a40b576 --- /dev/null +++ b/transport-interop/impl/c/v0.0.1/Makefile @@ -0,0 +1,26 @@ +image_name := c-v0.0.1 +commitSha := 8374eaadca988020bfbdfbaba72094f7ef1705b1 +# directory name based on commit + dir_name := c-libp2p-$(commitSha) + +all: image.json + +image.json: + # Clean previous source + rm -rf $(dir_name) + # Download source zip for the specific commit + wget -O $(dir_name).zip https://github.com/Pier-Two/c-libp2p/archive/$(commitSha).zip + # Verify checksum against version.lock + shasum -a 256 -c version.lock + # Unpack source + unzip -o $(dir_name).zip + # Build Docker image using the specified Dockerfile + cd $(dir_name) && docker build -t $(image_name) -f ../../../../../../test-plans/transport-interop/impl/c/v0.0.1/Dockerfile . + # Record image ID + docker image inspect $(image_name) -f '{{.Id}}' | \ + xargs -I {} echo '{"imageID": "{}"}' > image.json + +clean: + rm -rf image.json $(dir_name) $(dir_name).zip + +.PHONY: all clean \ No newline at end of file diff --git a/transport-interop/impl/c/v0.0.1/version.lock b/transport-interop/impl/c/v0.0.1/version.lock new file mode 100644 index 000000000..feb464652 --- /dev/null +++ b/transport-interop/impl/c/v0.0.1/version.lock @@ -0,0 +1 @@ +7038dd3ae68c2530690d96079b664c5de33d728c8428dd87e3b82e1075d8ec4f c-libp2p-8374eaadca988020bfbdfbaba72094f7ef1705b1.zip From e957f8105e9294127276a72371a8b60cae84af9e Mon Sep 17 00:00:00 2001 From: uink45 <79078981+uink45@users.noreply.github.com> Date: Wed, 4 Jun 2025 11:00:08 +1000 Subject: [PATCH 02/20] Add c-libp2p --- transport-interop/versionsInput.json | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/transport-interop/versionsInput.json b/transport-interop/versionsInput.json index 60b166f5d..9d453593e 100644 --- a/transport-interop/versionsInput.json +++ b/transport-interop/versionsInput.json @@ -349,5 +349,18 @@ "muxers": [ "yamux" ] + }, + { + "id": "c-v0.0.1", + "transports": [ + "tcp" + ], + "secureChannels": [ + "noise" + ], + "muxers": [ + "mplex", + "yamux" + ] } ] From 1bbaede0f823b9c1f3de65b817f3480b6b39424b Mon Sep 17 00:00:00 2001 From: uink45 <79078981+uink45@users.noreply.github.com> Date: Wed, 4 Jun 2025 11:09:44 +1000 Subject: [PATCH 03/20] Update Makefile --- transport-interop/Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/transport-interop/Makefile b/transport-interop/Makefile index ed98ff716..4fb5ef2f3 100644 --- a/transport-interop/Makefile +++ b/transport-interop/Makefile @@ -4,8 +4,9 @@ RUST_SUBDIRS := $(wildcard impl/rust/*/.) NIM_SUBDIRS := $(wildcard impl/nim/*/.) ZIG_SUBDIRS := $(wildcard impl/zig/*/.) JAVA_SUBDIRS := $(wildcard impl/java/*/.) +C_SUBDIRS := $(wildcard impl/c/*/.) -all: $(GO_SUBDIRS) $(JS_SUBDIRS) $(RUST_SUBDIRS) $(NIM_SUBDIRS) $(ZIG_SUBDIRS) $(JAVA_SUBDIRS) +all: $(GO_SUBDIRS) $(JS_SUBDIRS) $(RUST_SUBDIRS) $(NIM_SUBDIRS) $(ZIG_SUBDIRS) $(JAVA_SUBDIRS) $(C_SUBDIRS) $(JS_SUBDIRS): $(MAKE) -C $@ $(GO_SUBDIRS): @@ -18,5 +19,7 @@ $(ZIG_SUBDIRS): $(MAKE) -C $@ $(JAVA_SUBDIRS): $(MAKE) -C $@ +$(C_SUBDIRS): + $(MAKE) -C $@ -.PHONY: $(GO_SUBDIRS) $(JS_SUBDIRS) $(RUST_SUBDIRS) $(NIM_SUBDIRS) $(ZIG_SUBDIRS) $(JAVA_SUBDIRS) all +.PHONY: $(GO_SUBDIRS) $(JS_SUBDIRS) $(RUST_SUBDIRS) $(NIM_SUBDIRS) $(ZIG_SUBDIRS) $(JAVA_SUBDIRS) $(C_SUBDIRS) all From d4d2877016e829d086416a104c96fc253c4c9cdb Mon Sep 17 00:00:00 2001 From: uink45 <79078981+uink45@users.noreply.github.com> Date: Wed, 4 Jun 2025 12:43:29 +1000 Subject: [PATCH 04/20] update --- transport-interop/impl/c/v0.0.1/Makefile | 23 +++++++++++--------- transport-interop/impl/c/v0.0.1/version.lock | 2 +- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/transport-interop/impl/c/v0.0.1/Makefile b/transport-interop/impl/c/v0.0.1/Makefile index 70a40b576..e05f6ea66 100644 --- a/transport-interop/impl/c/v0.0.1/Makefile +++ b/transport-interop/impl/c/v0.0.1/Makefile @@ -1,5 +1,5 @@ image_name := c-v0.0.1 -commitSha := 8374eaadca988020bfbdfbaba72094f7ef1705b1 +commitSha := 412167cd62b141c2bc48374cb5b39eb8d6042402 # directory name based on commit dir_name := c-libp2p-$(commitSha) @@ -8,19 +8,22 @@ all: image.json image.json: # Clean previous source rm -rf $(dir_name) - # Download source zip for the specific commit - wget -O $(dir_name).zip https://github.com/Pier-Two/c-libp2p/archive/$(commitSha).zip - # Verify checksum against version.lock - shasum -a 256 -c version.lock - # Unpack source - unzip -o $(dir_name).zip - # Build Docker image using the specified Dockerfile - cd $(dir_name) && docker build -t $(image_name) -f ../../../../../../test-plans/transport-interop/impl/c/v0.0.1/Dockerfile . + # Clone repo with submodules for the specific commit + git clone https://github.com/Pier-Two/c-libp2p.git $(dir_name) + cd $(dir_name) && git checkout $(commitSha) && git submodule update --init --recursive + # Generate Dockerfile from interop-tests, stripping stray 'en', fixing base image tag, and removing strip + @echo "Generating Dockerfile from interop-tests, applying patches" + @sed -e '/^en$$/d' \ + -e 's|FROM ubuntu:22.04-slim|FROM ubuntu:22.04|' \ + -e 's| && strip interop-c||' \ + $(dir_name)/interop-tests/Dockerfile > $(dir_name)/Dockerfile + # Build Docker image using the generated Dockerfile + cd $(dir_name) && docker build -t $(image_name) -f Dockerfile . # Record image ID docker image inspect $(image_name) -f '{{.Id}}' | \ xargs -I {} echo '{"imageID": "{}"}' > image.json clean: - rm -rf image.json $(dir_name) $(dir_name).zip + rm -rf image.json $(dir_name) .PHONY: all clean \ No newline at end of file diff --git a/transport-interop/impl/c/v0.0.1/version.lock b/transport-interop/impl/c/v0.0.1/version.lock index feb464652..2e9447892 100644 --- a/transport-interop/impl/c/v0.0.1/version.lock +++ b/transport-interop/impl/c/v0.0.1/version.lock @@ -1 +1 @@ -7038dd3ae68c2530690d96079b664c5de33d728c8428dd87e3b82e1075d8ec4f c-libp2p-8374eaadca988020bfbdfbaba72094f7ef1705b1.zip +8e402ec16218cd963224bee6d97731ab5582c2432d4a05d5adf96de1044c2052 c-libp2p-412167cd62b141c2bc48374cb5b39eb8d6042402.zip \ No newline at end of file From 2ae19a38b628a1012715dae80922763220d0a60a Mon Sep 17 00:00:00 2001 From: uink45 <79078981+uink45@users.noreply.github.com> Date: Wed, 4 Jun 2025 14:22:29 +1000 Subject: [PATCH 05/20] Update commit --- transport-interop/impl/c/v0.0.1/Makefile | 28 ++++++-------------- transport-interop/impl/c/v0.0.1/version.lock | 1 - 2 files changed, 8 insertions(+), 21 deletions(-) delete mode 100644 transport-interop/impl/c/v0.0.1/version.lock diff --git a/transport-interop/impl/c/v0.0.1/Makefile b/transport-interop/impl/c/v0.0.1/Makefile index e05f6ea66..72db925ff 100644 --- a/transport-interop/impl/c/v0.0.1/Makefile +++ b/transport-interop/impl/c/v0.0.1/Makefile @@ -1,29 +1,17 @@ image_name := c-v0.0.1 -commitSha := 412167cd62b141c2bc48374cb5b39eb8d6042402 -# directory name based on commit - dir_name := c-libp2p-$(commitSha) +commitSha := f7c2f9386cd45489d768f7e0424a3022d0d21d69 +zip_name := c-libp2p-$(commitSha).zip +dir_name := c-libp2p-$(commitSha) all: image.json image.json: - # Clean previous source - rm -rf $(dir_name) - # Clone repo with submodules for the specific commit - git clone https://github.com/Pier-Two/c-libp2p.git $(dir_name) - cd $(dir_name) && git checkout $(commitSha) && git submodule update --init --recursive - # Generate Dockerfile from interop-tests, stripping stray 'en', fixing base image tag, and removing strip - @echo "Generating Dockerfile from interop-tests, applying patches" - @sed -e '/^en$$/d' \ - -e 's|FROM ubuntu:22.04-slim|FROM ubuntu:22.04|' \ - -e 's| && strip interop-c||' \ - $(dir_name)/interop-tests/Dockerfile > $(dir_name)/Dockerfile - # Build Docker image using the generated Dockerfile - cd $(dir_name) && docker build -t $(image_name) -f Dockerfile . - # Record image ID + wget -O $(zip_name) https://github.com/Pier-Two/c-libp2p/archive/$(commitSha).zip && unzip -o $(zip_name) + cd $(dir_name) && IMAGE_NAME=$(image_name) ../../../../dockerBuildWrapper.sh --platform linux/amd64 -f interop-tests/Dockerfile . docker image inspect $(image_name) -f '{{.Id}}' | \ - xargs -I {} echo '{"imageID": "{}"}' > image.json + xargs -I {} echo '{"imageID": "{}"}' > $@ clean: - rm -rf image.json $(dir_name) + rm -rf image.json $(dir_name) $(zip_name) -.PHONY: all clean \ No newline at end of file +.PHONY: all clean diff --git a/transport-interop/impl/c/v0.0.1/version.lock b/transport-interop/impl/c/v0.0.1/version.lock deleted file mode 100644 index 2e9447892..000000000 --- a/transport-interop/impl/c/v0.0.1/version.lock +++ /dev/null @@ -1 +0,0 @@ -8e402ec16218cd963224bee6d97731ab5582c2432d4a05d5adf96de1044c2052 c-libp2p-412167cd62b141c2bc48374cb5b39eb8d6042402.zip \ No newline at end of file From dde8820f439cb5b13167ad00a1cce9c40e4dbc86 Mon Sep 17 00:00:00 2001 From: uink45 <79078981+uink45@users.noreply.github.com> Date: Fri, 6 Jun 2025 13:30:58 +1000 Subject: [PATCH 06/20] Update Makefile --- transport-interop/impl/c/v0.0.1/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/transport-interop/impl/c/v0.0.1/Makefile b/transport-interop/impl/c/v0.0.1/Makefile index 72db925ff..63813ed45 100644 --- a/transport-interop/impl/c/v0.0.1/Makefile +++ b/transport-interop/impl/c/v0.0.1/Makefile @@ -1,5 +1,5 @@ image_name := c-v0.0.1 -commitSha := f7c2f9386cd45489d768f7e0424a3022d0d21d69 +commitSha := 8b5a07037f173ff749ba4520652acfbbdf625846 zip_name := c-libp2p-$(commitSha).zip dir_name := c-libp2p-$(commitSha) From 0806cfccc969b166ef88c042e9cfb5ddf7dd8796 Mon Sep 17 00:00:00 2001 From: uink45 <79078981+uink45@users.noreply.github.com> Date: Wed, 25 Jun 2025 12:21:30 +0530 Subject: [PATCH 07/20] Update Makefile --- transport-interop/impl/c/v0.0.1/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/transport-interop/impl/c/v0.0.1/Makefile b/transport-interop/impl/c/v0.0.1/Makefile index 63813ed45..0cecf89e8 100644 --- a/transport-interop/impl/c/v0.0.1/Makefile +++ b/transport-interop/impl/c/v0.0.1/Makefile @@ -1,5 +1,5 @@ image_name := c-v0.0.1 -commitSha := 8b5a07037f173ff749ba4520652acfbbdf625846 +commitSha := bd398c51c286b2e00d8ac36fca6b7ef928b0b935 zip_name := c-libp2p-$(commitSha).zip dir_name := c-libp2p-$(commitSha) From 448ef37995e25363b4835dcffcc21552bbd90c1a Mon Sep 17 00:00:00 2001 From: uink45 <79078981+uink45@users.noreply.github.com> Date: Wed, 25 Jun 2025 12:55:15 +0530 Subject: [PATCH 08/20] Update Makefile --- transport-interop/impl/c/v0.0.1/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/transport-interop/impl/c/v0.0.1/Makefile b/transport-interop/impl/c/v0.0.1/Makefile index 0cecf89e8..f4a69d6cc 100644 --- a/transport-interop/impl/c/v0.0.1/Makefile +++ b/transport-interop/impl/c/v0.0.1/Makefile @@ -1,5 +1,5 @@ image_name := c-v0.0.1 -commitSha := bd398c51c286b2e00d8ac36fca6b7ef928b0b935 +commitSha := 0806cfccc969b166ef88c042e9cfb5ddf7dd8796 zip_name := c-libp2p-$(commitSha).zip dir_name := c-libp2p-$(commitSha) From e81453873e6c4c6c337b7ae61daee0765ee95c85 Mon Sep 17 00:00:00 2001 From: uink45 <79078981+uink45@users.noreply.github.com> Date: Wed, 25 Jun 2025 13:21:00 +0530 Subject: [PATCH 09/20] Update Makefile --- transport-interop/impl/c/v0.0.1/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/transport-interop/impl/c/v0.0.1/Makefile b/transport-interop/impl/c/v0.0.1/Makefile index f4a69d6cc..f22002e9b 100644 --- a/transport-interop/impl/c/v0.0.1/Makefile +++ b/transport-interop/impl/c/v0.0.1/Makefile @@ -1,5 +1,5 @@ image_name := c-v0.0.1 -commitSha := 0806cfccc969b166ef88c042e9cfb5ddf7dd8796 +commitSha := a60ff942063eaf1b379b918396640672518af056 zip_name := c-libp2p-$(commitSha).zip dir_name := c-libp2p-$(commitSha) From e07eeba34d85d349a6e68911326f2ac1a4683e76 Mon Sep 17 00:00:00 2001 From: uink45 <79078981+uink45@users.noreply.github.com> Date: Wed, 25 Jun 2025 14:26:37 +0530 Subject: [PATCH 10/20] Update Makefile --- transport-interop/impl/c/v0.0.1/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/transport-interop/impl/c/v0.0.1/Makefile b/transport-interop/impl/c/v0.0.1/Makefile index f22002e9b..2a61726a4 100644 --- a/transport-interop/impl/c/v0.0.1/Makefile +++ b/transport-interop/impl/c/v0.0.1/Makefile @@ -1,5 +1,5 @@ image_name := c-v0.0.1 -commitSha := a60ff942063eaf1b379b918396640672518af056 +commitSha := f20d98be040c7600d8f559ab4d62559326a2439a zip_name := c-libp2p-$(commitSha).zip dir_name := c-libp2p-$(commitSha) From 4264034b0d62d52f07c5ceb0b8864bbd760c9c9b Mon Sep 17 00:00:00 2001 From: uink45 <79078981+uink45@users.noreply.github.com> Date: Wed, 25 Jun 2025 14:31:31 +0530 Subject: [PATCH 11/20] Update Makefile --- transport-interop/impl/c/v0.0.1/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/transport-interop/impl/c/v0.0.1/Makefile b/transport-interop/impl/c/v0.0.1/Makefile index 2a61726a4..80be2233d 100644 --- a/transport-interop/impl/c/v0.0.1/Makefile +++ b/transport-interop/impl/c/v0.0.1/Makefile @@ -1,5 +1,5 @@ image_name := c-v0.0.1 -commitSha := f20d98be040c7600d8f559ab4d62559326a2439a +commitSha := f60014c1503c18fa86d9e2e98ba1715e474eb445 zip_name := c-libp2p-$(commitSha).zip dir_name := c-libp2p-$(commitSha) From d888103598f064fa01bf2c55a7d54536955d1cd0 Mon Sep 17 00:00:00 2001 From: uink45 <79078981+uink45@users.noreply.github.com> Date: Wed, 25 Jun 2025 16:04:00 +0530 Subject: [PATCH 12/20] Update Makefile --- transport-interop/impl/c/v0.0.1/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/transport-interop/impl/c/v0.0.1/Makefile b/transport-interop/impl/c/v0.0.1/Makefile index 80be2233d..510f8f464 100644 --- a/transport-interop/impl/c/v0.0.1/Makefile +++ b/transport-interop/impl/c/v0.0.1/Makefile @@ -1,5 +1,5 @@ image_name := c-v0.0.1 -commitSha := f60014c1503c18fa86d9e2e98ba1715e474eb445 +commitSha := f7b9f8e2545e93f1c6d7d0dee30900b551e468fc zip_name := c-libp2p-$(commitSha).zip dir_name := c-libp2p-$(commitSha) From 5634f502af065d7bc358ab120bf8fb2c6b79f490 Mon Sep 17 00:00:00 2001 From: uink45 <79078981+uink45@users.noreply.github.com> Date: Wed, 25 Jun 2025 16:18:09 +0530 Subject: [PATCH 13/20] Update Makefile --- transport-interop/impl/c/v0.0.1/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/transport-interop/impl/c/v0.0.1/Makefile b/transport-interop/impl/c/v0.0.1/Makefile index 510f8f464..1bd18d20c 100644 --- a/transport-interop/impl/c/v0.0.1/Makefile +++ b/transport-interop/impl/c/v0.0.1/Makefile @@ -7,7 +7,7 @@ all: image.json image.json: wget -O $(zip_name) https://github.com/Pier-Two/c-libp2p/archive/$(commitSha).zip && unzip -o $(zip_name) - cd $(dir_name) && IMAGE_NAME=$(image_name) ../../../../dockerBuildWrapper.sh --platform linux/amd64 -f interop-tests/Dockerfile . + cd $(dir_name) && IMAGE_NAME=$(image_name) ../../../../dockerBuildWrapper.sh -f interop-tests/Dockerfile . docker image inspect $(image_name) -f '{{.Id}}' | \ xargs -I {} echo '{"imageID": "{}"}' > $@ From 108d1177d2a9d3ae147ca3666b2789ef0c03b83d Mon Sep 17 00:00:00 2001 From: uink45 <79078981+uink45@users.noreply.github.com> Date: Sun, 6 Jul 2025 21:22:14 +0530 Subject: [PATCH 14/20] Update Makefile --- transport-interop/impl/c/v0.0.1/Makefile | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/transport-interop/impl/c/v0.0.1/Makefile b/transport-interop/impl/c/v0.0.1/Makefile index 1bd18d20c..d5190c5ba 100644 --- a/transport-interop/impl/c/v0.0.1/Makefile +++ b/transport-interop/impl/c/v0.0.1/Makefile @@ -1,5 +1,5 @@ image_name := c-v0.0.1 -commitSha := f7b9f8e2545e93f1c6d7d0dee30900b551e468fc +commitSha := e3e91ba49b343daf9e7822dd215a21f4234c0fd9 zip_name := c-libp2p-$(commitSha).zip dir_name := c-libp2p-$(commitSha) @@ -7,6 +7,15 @@ all: image.json image.json: wget -O $(zip_name) https://github.com/Pier-Two/c-libp2p/archive/$(commitSha).zip && unzip -o $(zip_name) + cd $(dir_name) && \ + mkdir -p lib/secp256k1 && wget -O secp256k1.zip https://github.com/bitcoin-core/secp256k1/archive/master.zip && unzip -o secp256k1.zip && mv secp256k1-master/* lib/secp256k1/ && rm -rf secp256k1.zip secp256k1-master && \ + mkdir -p lib/libtomcrypt && wget -O libtomcrypt.zip https://github.com/libtom/libtomcrypt/archive/develop.zip && unzip -o libtomcrypt.zip && mv libtomcrypt-develop/* lib/libtomcrypt/ && rm -rf libtomcrypt.zip libtomcrypt-develop && \ + mkdir -p lib/libtommath && wget -O libtommath.zip https://github.com/libtom/libtommath/archive/master.zip && unzip -o libtommath.zip && mv libtommath-master/* lib/libtommath/ && rm -rf libtommath.zip libtommath-master && \ + mkdir -p lib/libeddsa && wget -O libeddsa.zip https://github.com/phlay/libeddsa/archive/master.zip && unzip -o libeddsa.zip && mv libeddsa-master/* lib/libeddsa/ && rm -rf libeddsa.zip libeddsa-master && \ + mkdir -p lib/noise-c && wget -O noise-c.zip https://github.com/uink45/noise-c/archive/master.zip && unzip -o noise-c.zip && mv noise-c-master/* lib/noise-c/ && rm -rf noise-c.zip noise-c-master && \ + mkdir -p lib/wjcryptlib && wget -O wjcryptlib.zip https://github.com/WaterJuice/WjCryptLib/archive/master.zip && unzip -o wjcryptlib.zip && mv WjCryptLib-master/* lib/wjcryptlib/ && rm -rf wjcryptlib.zip WjCryptLib-master && \ + mkdir -p lib/sha3 && wget -O sha3.zip https://github.com/pablotron/sha3/archive/main.zip && unzip -o sha3.zip && mv sha3-main/* lib/sha3/ && rm -rf sha3.zip sha3-main && \ + mkdir -p lib/c20p1305 && wget -O c20p1305.zip https://github.com/wg/c20p1305/archive/master.zip && unzip -o c20p1305.zip && mv c20p1305-master/* lib/c20p1305/ && rm -rf c20p1305.zip c20p1305-master cd $(dir_name) && IMAGE_NAME=$(image_name) ../../../../dockerBuildWrapper.sh -f interop-tests/Dockerfile . docker image inspect $(image_name) -f '{{.Id}}' | \ xargs -I {} echo '{"imageID": "{}"}' > $@ From c835349a0fe7e6cf1c46a8ca8576a7c40edf0f35 Mon Sep 17 00:00:00 2001 From: uink45 <79078981+uink45@users.noreply.github.com> Date: Mon, 7 Jul 2025 12:48:16 +0530 Subject: [PATCH 15/20] Update Makefile --- transport-interop/impl/c/v0.0.1/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/transport-interop/impl/c/v0.0.1/Makefile b/transport-interop/impl/c/v0.0.1/Makefile index d5190c5ba..dc8203cdd 100644 --- a/transport-interop/impl/c/v0.0.1/Makefile +++ b/transport-interop/impl/c/v0.0.1/Makefile @@ -1,5 +1,5 @@ image_name := c-v0.0.1 -commitSha := e3e91ba49b343daf9e7822dd215a21f4234c0fd9 +commitSha := b52d00cecee6a46b4c55389c09a7ab47550b0991 zip_name := c-libp2p-$(commitSha).zip dir_name := c-libp2p-$(commitSha) From 65683af45dfd8a55cb825ff66d071483835a4e87 Mon Sep 17 00:00:00 2001 From: uink45 <79078981+uink45@users.noreply.github.com> Date: Mon, 7 Jul 2025 16:04:42 +0530 Subject: [PATCH 16/20] Update Makefile --- transport-interop/impl/c/v0.0.1/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/transport-interop/impl/c/v0.0.1/Makefile b/transport-interop/impl/c/v0.0.1/Makefile index dc8203cdd..43752a8c6 100644 --- a/transport-interop/impl/c/v0.0.1/Makefile +++ b/transport-interop/impl/c/v0.0.1/Makefile @@ -1,5 +1,5 @@ image_name := c-v0.0.1 -commitSha := b52d00cecee6a46b4c55389c09a7ab47550b0991 +commitSha := ba3d94d26c429a9b365176dcece83825903f71cc zip_name := c-libp2p-$(commitSha).zip dir_name := c-libp2p-$(commitSha) From cd6a17873f1d2238cb6f310f68c479b6d6d18a82 Mon Sep 17 00:00:00 2001 From: uink45 <79078981+uink45@users.noreply.github.com> Date: Mon, 7 Jul 2025 21:17:15 +0530 Subject: [PATCH 17/20] Update Makefile --- transport-interop/impl/c/v0.0.1/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/transport-interop/impl/c/v0.0.1/Makefile b/transport-interop/impl/c/v0.0.1/Makefile index 43752a8c6..846a3924d 100644 --- a/transport-interop/impl/c/v0.0.1/Makefile +++ b/transport-interop/impl/c/v0.0.1/Makefile @@ -1,5 +1,5 @@ image_name := c-v0.0.1 -commitSha := ba3d94d26c429a9b365176dcece83825903f71cc +commitSha := 19bad9fec4307d4638845183b6171c6a90977229 zip_name := c-libp2p-$(commitSha).zip dir_name := c-libp2p-$(commitSha) From e490bf6298c3f7ffcff2df648339d8edc00c8c40 Mon Sep 17 00:00:00 2001 From: uink45 <79078981+uink45@users.noreply.github.com> Date: Mon, 7 Jul 2025 21:26:40 +0530 Subject: [PATCH 18/20] Update Makefile --- transport-interop/impl/c/v0.0.1/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/transport-interop/impl/c/v0.0.1/Makefile b/transport-interop/impl/c/v0.0.1/Makefile index 846a3924d..2bd630af7 100644 --- a/transport-interop/impl/c/v0.0.1/Makefile +++ b/transport-interop/impl/c/v0.0.1/Makefile @@ -1,5 +1,5 @@ image_name := c-v0.0.1 -commitSha := 19bad9fec4307d4638845183b6171c6a90977229 +commitSha := 9ee22b6a2272ffa5cecbce2af61d4bda8b7a1b21 zip_name := c-libp2p-$(commitSha).zip dir_name := c-libp2p-$(commitSha) From 80b6c98db96c6cfa40eed525b364bafef41b2269 Mon Sep 17 00:00:00 2001 From: uink45 <79078981+uink45@users.noreply.github.com> Date: Thu, 2 Oct 2025 13:07:10 +1000 Subject: [PATCH 19/20] update; --- transport-interop/impl/c/v0.0.1/Makefile | 11 +++++++---- transport-interop/package-lock.json | 4 ++-- transport-interop/versionsInput.json | 3 ++- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/transport-interop/impl/c/v0.0.1/Makefile b/transport-interop/impl/c/v0.0.1/Makefile index 2bd630af7..8380edb39 100644 --- a/transport-interop/impl/c/v0.0.1/Makefile +++ b/transport-interop/impl/c/v0.0.1/Makefile @@ -1,12 +1,15 @@ image_name := c-v0.0.1 -commitSha := 9ee22b6a2272ffa5cecbce2af61d4bda8b7a1b21 -zip_name := c-libp2p-$(commitSha).zip +commitSha := 2d6ccc96b39a5129ebdaf5b2577eba5880f3dc0a +repo_url := https://github.com/Pier-Two/c-libp2p.git dir_name := c-libp2p-$(commitSha) all: image.json image.json: - wget -O $(zip_name) https://github.com/Pier-Two/c-libp2p/archive/$(commitSha).zip && unzip -o $(zip_name) + rm -rf $(dir_name) + git clone $(repo_url) $(dir_name) + cd $(dir_name) && git checkout $(commitSha) + cd $(dir_name) && git submodule update --init --recursive lib/picoquic cd $(dir_name) && \ mkdir -p lib/secp256k1 && wget -O secp256k1.zip https://github.com/bitcoin-core/secp256k1/archive/master.zip && unzip -o secp256k1.zip && mv secp256k1-master/* lib/secp256k1/ && rm -rf secp256k1.zip secp256k1-master && \ mkdir -p lib/libtomcrypt && wget -O libtomcrypt.zip https://github.com/libtom/libtomcrypt/archive/develop.zip && unzip -o libtomcrypt.zip && mv libtomcrypt-develop/* lib/libtomcrypt/ && rm -rf libtomcrypt.zip libtomcrypt-develop && \ @@ -21,6 +24,6 @@ image.json: xargs -I {} echo '{"imageID": "{}"}' > $@ clean: - rm -rf image.json $(dir_name) $(zip_name) + rm -rf image.json $(dir_name) .PHONY: all clean diff --git a/transport-interop/package-lock.json b/transport-interop/package-lock.json index c2916e005..3df99c364 100644 --- a/transport-interop/package-lock.json +++ b/transport-interop/package-lock.json @@ -1,11 +1,11 @@ { - "name": "Multidimensional libp2p interop test", + "name": "@libp2p/transport-interop", "version": "0.0.1", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "Multidimensional libp2p interop test", + "name": "@libp2p/transport-interop", "version": "0.0.1", "license": "MIT", "dependencies": { diff --git a/transport-interop/versionsInput.json b/transport-interop/versionsInput.json index 9d453593e..dab7204de 100644 --- a/transport-interop/versionsInput.json +++ b/transport-interop/versionsInput.json @@ -353,7 +353,8 @@ { "id": "c-v0.0.1", "transports": [ - "tcp" + "tcp", + "quic-v1" ], "secureChannels": [ "noise" From 9776609bdacdeb7708bf096ad1f38dc23e5314fe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 2 Oct 2025 03:12:37 +0000 Subject: [PATCH 20/20] chore(deps): bump golang.org/x/net in /gossipsub-interop/go-libp2p Bumps [golang.org/x/net](https://github.com/golang/net) from 0.35.0 to 0.38.0. - [Commits](https://github.com/golang/net/compare/v0.35.0...v0.38.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-version: 0.38.0 dependency-type: indirect ... Signed-off-by: dependabot[bot] --- gossipsub-interop/go-libp2p/go.mod | 10 +++++----- gossipsub-interop/go-libp2p/go.sum | 20 ++++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/gossipsub-interop/go-libp2p/go.mod b/gossipsub-interop/go-libp2p/go.mod index 477b01ceb..5c8991b70 100644 --- a/gossipsub-interop/go-libp2p/go.mod +++ b/gossipsub-interop/go-libp2p/go.mod @@ -98,13 +98,13 @@ require ( go.uber.org/mock v0.5.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect - golang.org/x/crypto v0.35.0 // indirect + golang.org/x/crypto v0.36.0 // indirect golang.org/x/exp v0.0.0-20250218142911-aa4b98e5adaa // indirect golang.org/x/mod v0.23.0 // indirect - golang.org/x/net v0.35.0 // indirect - golang.org/x/sync v0.11.0 // indirect - golang.org/x/sys v0.30.0 // indirect - golang.org/x/text v0.22.0 // indirect + golang.org/x/net v0.38.0 // indirect + golang.org/x/sync v0.12.0 // indirect + golang.org/x/sys v0.31.0 // indirect + golang.org/x/text v0.23.0 // indirect golang.org/x/tools v0.30.0 // indirect google.golang.org/protobuf v1.36.5 // indirect lukechampine.com/blake3 v1.4.0 // indirect diff --git a/gossipsub-interop/go-libp2p/go.sum b/gossipsub-interop/go-libp2p/go.sum index 9453d0bc0..7a24f7a64 100644 --- a/gossipsub-interop/go-libp2p/go.sum +++ b/gossipsub-interop/go-libp2p/go.sum @@ -366,8 +366,8 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.8.0/go.mod h1:mRqEX+O9/h5TFCrQhkgjo2yKi0yYA+9ecGkdQoHrywE= golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw= golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg= -golang.org/x/crypto v0.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs= -golang.org/x/crypto v0.35.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ= +golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34= +golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20250218142911-aa4b98e5adaa h1:t2QcU6V556bFjYgu4L6C+6VrCPyJZ+eyRsABUPs1mz4= golang.org/x/exp v0.0.0-20250218142911-aa4b98e5adaa/go.mod h1:BHOTPb3L19zxehTsLoJXVaTktb06DFgmdW6Wb9s8jqk= @@ -406,8 +406,8 @@ golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= -golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8= -golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk= +golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8= +golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -423,8 +423,8 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w= -golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw= +golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= golang.org/x/sys v0.0.0-20180810173357-98c5dad5d1a0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -449,8 +449,8 @@ golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc= -golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik= +golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= @@ -466,8 +466,8 @@ golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM= -golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY= +golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY= +golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=