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 ed941941e664262e31581535eab8e4211d280b26 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 2 Oct 2025 03:12:41 +0000 Subject: [PATCH 20/20] chore(deps): bump tracing-subscriber in /gossipsub-interop/rust-libp2p Bumps [tracing-subscriber](https://github.com/tokio-rs/tracing) from 0.3.19 to 0.3.20. - [Release notes](https://github.com/tokio-rs/tracing/releases) - [Commits](https://github.com/tokio-rs/tracing/compare/tracing-subscriber-0.3.19...tracing-subscriber-0.3.20) --- updated-dependencies: - dependency-name: tracing-subscriber dependency-version: 0.3.20 dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- gossipsub-interop/rust-libp2p/Cargo.lock | 46 +++++++----------------- gossipsub-interop/rust-libp2p/Cargo.toml | 2 +- 2 files changed, 13 insertions(+), 35 deletions(-) diff --git a/gossipsub-interop/rust-libp2p/Cargo.lock b/gossipsub-interop/rust-libp2p/Cargo.lock index 2136a94f3..0f675c0c0 100644 --- a/gossipsub-interop/rust-libp2p/Cargo.lock +++ b/gossipsub-interop/rust-libp2p/Cargo.lock @@ -2009,11 +2009,11 @@ checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" [[package]] name = "matchers" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +checksum = "d1525a2a28c7f4fa0fc98bb91ae755d1e2d1505079e05539e35bc876b5d65ae9" dependencies = [ - "regex-automata 0.1.10", + "regex-automata", ] [[package]] @@ -2214,12 +2214,11 @@ dependencies = [ [[package]] name = "nu-ansi-term" -version = "0.46.0" +version = "0.50.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +checksum = "d4a28e057d01f97e61255210fcff094d74ed0466038633e95017f5beb68e4399" dependencies = [ - "overload", - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -2296,12 +2295,6 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" -[[package]] -name = "overload" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - [[package]] name = "parking" version = "2.2.1" @@ -2729,17 +2722,8 @@ checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.9", - "regex-syntax 0.8.5", -] - -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" -dependencies = [ - "regex-syntax 0.6.29", + "regex-automata", + "regex-syntax", ] [[package]] @@ -2750,15 +2734,9 @@ checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.5", + "regex-syntax", ] -[[package]] -name = "regex-syntax" -version = "0.6.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" - [[package]] name = "regex-syntax" version = "0.8.5" @@ -3463,14 +3441,14 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.19" +version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008" +checksum = "2054a14f5307d601f88daf0553e1cbf472acc4f2c51afab632431cdcd72124d5" dependencies = [ "matchers", "nu-ansi-term", "once_cell", - "regex", + "regex-automata", "sharded-slab", "smallvec", "thread_local", diff --git a/gossipsub-interop/rust-libp2p/Cargo.toml b/gossipsub-interop/rust-libp2p/Cargo.toml index 0eaa0523a..d07dabcd8 100644 --- a/gossipsub-interop/rust-libp2p/Cargo.toml +++ b/gossipsub-interop/rust-libp2p/Cargo.toml @@ -18,7 +18,7 @@ libp2p = { version = "0.55.0", features = [ tokio = { version = "1.33.0", features = ["full"] } futures = "0.3.28" tracing = "0.1.37" -tracing-subscriber = { version = "0.3.17", features = ["env-filter"] } +tracing-subscriber = { version = "0.3.20", features = ["env-filter"] } serde = { version = "1.0.188", features = ["derive"] } serde_json = "1.0.107" clap = { version = "4.4.4", features = ["derive"] }