From c6f8e619b7379e3439f77e1dc2db148c0a86d887 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Wed, 22 Nov 2023 11:59:44 +0300 Subject: [PATCH 01/86] try to build bridges + zombienet image --- .gitlab/pipeline/build.yml | 16 ++++++ .gitlab/pipeline/publish.yml | 20 ++++++- ...ridges_zombienet_tests_injected.Dockerfile | 52 +++++++++++++++++++ 3 files changed, 87 insertions(+), 1 deletion(-) create mode 100644 docker/dockerfiles/bridges_zombienet_tests_injected.Dockerfile diff --git a/.gitlab/pipeline/build.yml b/.gitlab/pipeline/build.yml index 5c13045706c4..cee919a1838d 100644 --- a/.gitlab/pipeline/build.yml +++ b/.gitlab/pipeline/build.yml @@ -372,3 +372,19 @@ build-subkey-linux: # after_script: [""] # tags: # - osx + +# bridges + +# we need some non-binary artifacts in our bridges+zombienet image +prepare-bridges-zombienet-artifacts: + stage: build + extends: + - .docker-env + - .common-refs + - .collect-artifacts + before_script: + - mkdir -p ./artifacts/bridges/ + script: + - cp -r bridges/zombienet ./artifacts/bridges + - cp -r cumulus/scripts ./artifacts/bridges/cumulus-scripts + - cp -r cumulus/zombienet/brige-hubs ./artifacts/bridges/cumulus-brige-hubs diff --git a/.gitlab/pipeline/publish.yml b/.gitlab/pipeline/publish.yml index 3cc2002cc1c5..bdebbed238d4 100644 --- a/.gitlab/pipeline/publish.yml +++ b/.gitlab/pipeline/publish.yml @@ -77,7 +77,8 @@ publish-rustdoc: --format=docker --build-arg VCS_REF="${CI_COMMIT_SHA}" --build-arg BUILD_DATE="$(date -u '+%Y-%m-%dT%H:%M:%SZ')" - --build-arg IMAGE_NAME="${IMAGE_NAME}" + --build-arg IMAGE_NAME="${IMAGE_NAME}"\ + --build-arg ZOMBIENET_IMAGE="${ZOMBIENET_IMAGE}" --tag "$IMAGE_NAME:${DOCKER_IMAGES_VERSION}" --file ${DOCKERFILE} . - echo "$PARITYPR_PASS" | @@ -357,3 +358,20 @@ build-push-image-substrate-pr: # artifacts: true # after_script: # - buildah logout "$IMAGE_NAME" + +build-push-image-bridges-zombienet-tests: + stage: publish + extends: + - .kubernetes-env + - .common-refs + - .build-push-image + needs: + - job: build-linux-stable + artifacts: true + - job: build-linux-stable-cumulus + artifacts: true + - job: prepare-bridges-zombienet-artifacts + artifacts: true + variables: + DOCKERFILE: "docker/dockerfiles/bridges_zombienet_tests_injected.Dockerfile" + IMAGE_NAME: "docker.io/paritypr/bridges-zombienet-tests" diff --git a/docker/dockerfiles/bridges_zombienet_tests_injected.Dockerfile b/docker/dockerfiles/bridges_zombienet_tests_injected.Dockerfile new file mode 100644 index 000000000000..af9bc06b1e8e --- /dev/null +++ b/docker/dockerfiles/bridges_zombienet_tests_injected.Dockerfile @@ -0,0 +1,52 @@ +# this image is built on top of existing Zombienet image +ARG ZOMBIENET_IMAGE +# this image uses substrate-relay image built elsewhere +ARG SUBSTRATE_RELAY_IMAGE=paritytech/substrate-relay:v2023-11-07-rococo-westend-initial-relayer + +# metadata +ARG VCS_REF +ARG BUILD_DATE +ARG IMAGE_NAME + +# we need `substrate-relay` binary, built elsewhere +FROM ${SUBSTRATE_RELAY_IMAGE} as relay-builder + +# the base image is the zombienet image - we are planning to run zombienet tests using native +# provider here +FROM ${ZOMBIENET_IMAGE} + +LABEL io.parity.image.authors="devops-team@parity.io" \ + io.parity.image.vendor="Parity Technologies" \ + io.parity.image.title="${IMAGE_NAME}" \ + io.parity.image.description="Bridges Zombienet tests." \ + io.parity.image.source="https://github.com/paritytech/polkadot-sdk/blob/${VCS_REF}/docker/dockerfiles/bridges_zombienet_tests_injected.Dockerfile" \ + io.parity.image.revision="${VCS_REF}" \ + io.parity.image.created="${BUILD_DATE}" \ + io.parity.image.documentation="https://github.com/paritytech/polkadot-sdk/bridges/zombienet" + +# show backtraces +ENV RUST_BACKTRACE 1 +USER root + +# add polkadot binary to the docker image +COPY ./artifacts/polkadot /usr/local/bin/ +COPY ./artifacts/polkadot-execute-worker /usr/local/bin/ +COPY ./artifacts/polkadot-prepare-worker /usr/local/bin/ +# add polkadot-parachain binary to the docker image +COPY ./artifacts/polkadot-parachain /usr/local/bin +# copy substrate-relay to the docker image +COPY --from=relay /home/user/substrate-relay /usr/local/bin/ +# finally - we need bridges zombienet runner and tests +RUN mkdir -p /home/nonroot/bridges +COPY ./artifacts/bridges /home/nonroot/bridges + +# check if executable works in this container +USER nonroot +RUN /usr/local/bin/polkadot --version +RUN /usr/local/bin/polkadot-parachain --version +RUN /usr/local/bin/substrate-relay --version + +# https://polkadot.js.org/apps/?rpc=ws://127.0.0.1:{PORT}#/explorer +EXPOSE 9942 9910 8943 9945 9010 8945 + +ENTRYPOINT ["/bin/bash", "-c", "/home/nonroot/bridges/zombienet/run-tests.sh"] From 1e369ee2e138288881802ac06671a38e3cf43c67 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Wed, 22 Nov 2023 12:37:10 +0300 Subject: [PATCH 02/86] fix --- .gitlab/pipeline/publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab/pipeline/publish.yml b/.gitlab/pipeline/publish.yml index bdebbed238d4..1871688773ae 100644 --- a/.gitlab/pipeline/publish.yml +++ b/.gitlab/pipeline/publish.yml @@ -77,7 +77,7 @@ publish-rustdoc: --format=docker --build-arg VCS_REF="${CI_COMMIT_SHA}" --build-arg BUILD_DATE="$(date -u '+%Y-%m-%dT%H:%M:%SZ')" - --build-arg IMAGE_NAME="${IMAGE_NAME}"\ + --build-arg IMAGE_NAME="${IMAGE_NAME}" --build-arg ZOMBIENET_IMAGE="${ZOMBIENET_IMAGE}" --tag "$IMAGE_NAME:${DOCKER_IMAGES_VERSION}" --file ${DOCKERFILE} . From 58e9981599913d3df89375c94cff7407d94c590f Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Thu, 23 Nov 2023 09:57:30 +0300 Subject: [PATCH 03/86] another try --- .gitlab/pipeline/build.yml | 1 + .gitlab/pipeline/zombienet/bridges.yml | 48 ++++++++++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 .gitlab/pipeline/zombienet/bridges.yml diff --git a/.gitlab/pipeline/build.yml b/.gitlab/pipeline/build.yml index cee919a1838d..ae376c959dde 100644 --- a/.gitlab/pipeline/build.yml +++ b/.gitlab/pipeline/build.yml @@ -381,6 +381,7 @@ prepare-bridges-zombienet-artifacts: extends: - .docker-env - .common-refs + - .run-immediately - .collect-artifacts before_script: - mkdir -p ./artifacts/bridges/ diff --git a/.gitlab/pipeline/zombienet/bridges.yml b/.gitlab/pipeline/zombienet/bridges.yml new file mode 100644 index 000000000000..62f5d821fc44 --- /dev/null +++ b/.gitlab/pipeline/zombienet/bridges.yml @@ -0,0 +1,48 @@ +# This file is part of .gitlab-ci.yml +# Here are all jobs that are executed during "zombienet" stage for bridges + +# common settings for all zombienet jobs +.zombienet-bridges-common: + before_script: + # Exit if the job is not merge queue + # - if [[ $CI_COMMIT_REF_NAME != *"gh-readonly-queue"* ]]; then echo "I will run only in a merge queue"; exit 0; fi + - echo "Zombienet Tests Config" + - echo "${ZOMBIENET_IMAGE}" + - echo "${GH_DIR}" + - echo "${LOCAL_DIR}" + - export DEBUG=zombie,zombie::network-node + - export ZOMBIENET_INTEGRATION_TEST_IMAGE="${BRIDGES_ZOMBIENET_TESTS_IMAGE}":${BRIDGES_ZOMBIENET_TESTS_IMAGE_TAG} + - echo "${ZOMBIENET_INTEGRATION_TEST_IMAGE}" + stage: zombienet + image: "${ZOMBIENET_INTEGRATION_TEST_IMAGE}" + needs: + - job: build-push-image-bridges-zombienet-tests + artifacts: true + extends: + - .kubernetes-env + - .zombienet-refs + variables: + BRIDGES_ZOMBIENET_TESTS_IMAGE_TAG: ${DOCKER_IMAGES_VERSION} + BRIDGES_ZOMBIENET_TESTS_IMAGE: "docker.io/paritypr/bridges-zombienet-tests" + GH_DIR: "https://github.com/paritytech/polkadot-sdk/tree/${CI_COMMIT_SHA}/bridges/zombienet" + LOCAL_DIR: "/builds/parity/mirrors/polkadot-sdk/substrate/zombienet" + FF_DISABLE_UMASK_FOR_DOCKER_EXECUTOR: 1 + RUN_IN_CONTAINER: "1" + artifacts: + name: "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}" + when: always + expire_in: 2 days + paths: + - ./zombienet-logs + after_script: + - mkdir -p ./zombienet-logs + - cp /tmp/zombie*/logs/* ./zombienet-logs/ + retry: 2 + tags: + - zombienet-polkadot-integration-test + +run-zombienet-bridges-tests: + extends: + - .zombienet-bridges-common + script: + - /home/nonroot/bridges/zombienet/run-tests.sh From da2bd72043c41c696929a1a8d94f6f6de31397d7 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Thu, 23 Nov 2023 10:10:02 +0300 Subject: [PATCH 04/86] typo --- .gitlab/pipeline/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab/pipeline/build.yml b/.gitlab/pipeline/build.yml index ae376c959dde..fb78f2eea03b 100644 --- a/.gitlab/pipeline/build.yml +++ b/.gitlab/pipeline/build.yml @@ -388,4 +388,4 @@ prepare-bridges-zombienet-artifacts: script: - cp -r bridges/zombienet ./artifacts/bridges - cp -r cumulus/scripts ./artifacts/bridges/cumulus-scripts - - cp -r cumulus/zombienet/brige-hubs ./artifacts/bridges/cumulus-brige-hubs + - cp -r cumulus/zombienet/bridge-hubs ./artifacts/bridges/cumulus-brige-hubs From baf85c9c6fcbabba6d9a681a3dbed5ed40f72a72 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Thu, 23 Nov 2023 10:21:41 +0300 Subject: [PATCH 05/86] add bridges.yml --- .gitlab/pipeline/zombienet.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab/pipeline/zombienet.yml b/.gitlab/pipeline/zombienet.yml index fc3fd1256194..59959ea7b6c1 100644 --- a/.gitlab/pipeline/zombienet.yml +++ b/.gitlab/pipeline/zombienet.yml @@ -10,3 +10,5 @@ include: - .gitlab/pipeline/zombienet/cumulus.yml # polkadot tests - .gitlab/pipeline/zombienet/polkadot.yml + # bridges tests + - .gitlab/pipeline/zombienet/bridges.yml From 9c921c80b82e2710c4daa24262c48fd32f885814 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Thu, 23 Nov 2023 10:42:55 +0300 Subject: [PATCH 06/86] pass ZOMBIENET_IMAGE --- .gitlab/pipeline/publish.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitlab/pipeline/publish.yml b/.gitlab/pipeline/publish.yml index 23a9ee8c6454..a5e32bd64300 100644 --- a/.gitlab/pipeline/publish.yml +++ b/.gitlab/pipeline/publish.yml @@ -66,6 +66,8 @@ publish-rustdoc: # note: images are used not only in zombienet but also in rococo, wococo and versi .build-push-image: image: $BUILDAH_IMAGE + extends: + - .zombienet-refs variables: DOCKERFILE: "" # docker/path-to.Dockerfile IMAGE_NAME: "" # docker.io/paritypr/image_name @@ -73,6 +75,7 @@ publish-rustdoc: # Dockertag should differ in a merge queue # TODO: test this # - if [[ $CI_COMMIT_REF_NAME == *"gh-readonly-queue"* ]]; export DOCKER_IMAGES_VERSION="${CI_COMMIT_SHORT_SHA}"; fi + - echo "${ZOMBIENET_IMAGE}" - $BUILDAH_COMMAND build --format=docker --build-arg VCS_REF="${CI_COMMIT_SHA}" From 5e5c72b6d82aa61a8ba90704442d10c937f14ec2 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Thu, 23 Nov 2023 11:03:08 +0300 Subject: [PATCH 07/86] typo --- docker/dockerfiles/bridges_zombienet_tests_injected.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/dockerfiles/bridges_zombienet_tests_injected.Dockerfile b/docker/dockerfiles/bridges_zombienet_tests_injected.Dockerfile index af9bc06b1e8e..0b1205cd7b7d 100644 --- a/docker/dockerfiles/bridges_zombienet_tests_injected.Dockerfile +++ b/docker/dockerfiles/bridges_zombienet_tests_injected.Dockerfile @@ -35,7 +35,7 @@ COPY ./artifacts/polkadot-prepare-worker /usr/local/bin/ # add polkadot-parachain binary to the docker image COPY ./artifacts/polkadot-parachain /usr/local/bin # copy substrate-relay to the docker image -COPY --from=relay /home/user/substrate-relay /usr/local/bin/ +COPY --from=relay-builder /home/user/substrate-relay /usr/local/bin/ # finally - we need bridges zombienet runner and tests RUN mkdir -p /home/nonroot/bridges COPY ./artifacts/bridges /home/nonroot/bridges From 5ccf7fe46782872006083000b5038b62051eb174 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Thu, 23 Nov 2023 11:27:32 +0300 Subject: [PATCH 08/86] use full image name --- docker/dockerfiles/bridges_zombienet_tests_injected.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/dockerfiles/bridges_zombienet_tests_injected.Dockerfile b/docker/dockerfiles/bridges_zombienet_tests_injected.Dockerfile index 0b1205cd7b7d..183e12f9ebcb 100644 --- a/docker/dockerfiles/bridges_zombienet_tests_injected.Dockerfile +++ b/docker/dockerfiles/bridges_zombienet_tests_injected.Dockerfile @@ -1,7 +1,7 @@ # this image is built on top of existing Zombienet image ARG ZOMBIENET_IMAGE # this image uses substrate-relay image built elsewhere -ARG SUBSTRATE_RELAY_IMAGE=paritytech/substrate-relay:v2023-11-07-rococo-westend-initial-relayer +ARG SUBSTRATE_RELAY_IMAGE=docker.io/paritytech/substrate-relay:v2023-11-07-rococo-westend-initial-relayer # metadata ARG VCS_REF From dd7b63105a0f01d265021707c4d5478948e54c12 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Thu, 23 Nov 2023 17:31:18 +0300 Subject: [PATCH 09/86] fixes --- .gitlab/pipeline/build.yml | 5 +++-- bridges/zombienet/run-tests.sh | 12 ++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.gitlab/pipeline/build.yml b/.gitlab/pipeline/build.yml index fb78f2eea03b..7766cb571a81 100644 --- a/.gitlab/pipeline/build.yml +++ b/.gitlab/pipeline/build.yml @@ -385,7 +385,8 @@ prepare-bridges-zombienet-artifacts: - .collect-artifacts before_script: - mkdir -p ./artifacts/bridges/ + - mkdir -p ./artifacts/bridges/cumulus script: - cp -r bridges/zombienet ./artifacts/bridges - - cp -r cumulus/scripts ./artifacts/bridges/cumulus-scripts - - cp -r cumulus/zombienet/bridge-hubs ./artifacts/bridges/cumulus-brige-hubs + - cp -r cumulus/scripts ./artifacts/bridges/cumulus/scripts + - cp -r cumulus/zombienet/bridge-hubs ./artifacts/bridges/cumulus/brige-hubs diff --git a/bridges/zombienet/run-tests.sh b/bridges/zombienet/run-tests.sh index 22fefd093602..02ca71101e09 100755 --- a/bridges/zombienet/run-tests.sh +++ b/bridges/zombienet/run-tests.sh @@ -6,13 +6,13 @@ trap "trap - SIGTERM && kill -- -$$" SIGINT SIGTERM EXIT # assuming that we'll be using native provide && all processes will be executing locally # (we need absolute paths here, because they're used when scripts are called by zombienet from tmp folders) -export POLKADOT_SDK_FOLDER=`realpath $(dirname "$0")/../..` +export POLKADOT_SDK_FOLDER=/home/nonroot/bridges export BRIDGE_TESTS_FOLDER=$POLKADOT_SDK_FOLDER/bridges/zombienet/tests -export POLKADOT_BINARY_PATH=$POLKADOT_SDK_FOLDER/target/release/polkadot -export POLKADOT_PARACHAIN_BINARY_PATH=$POLKADOT_SDK_FOLDER/target/release/polkadot-parachain -export POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_ROCOCO=$POLKADOT_PARACHAIN_BINARY_PATH -export POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_WESTEND=$POLKADOT_PARACHAIN_BINARY_PATH -export ZOMBIENET_BINARY_PATH=~/local_bridge_testing/bin/zombienet-linux +export POLKADOT_BINARY_PATH=/usr/local/bin/polkadot +export POLKADOT_PARACHAIN_BINARY_PATH=/usr/local/bin/polkadot-parachain +export POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_ROCOCO=/usr/local/bin/polkadot-parachain +export POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_WESTEND=/usr/local/bin/polkadot-parachain +export ZOMBIENET_BINARY_PATH=/usr/local/bin/zombie # bridge configuration export LANE_ID="00000002" From 97b7666e1d72f69ee35115342c772c86eb299e6f Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Fri, 24 Nov 2023 12:23:02 +0300 Subject: [PATCH 10/86] dbg --- .gitlab/pipeline/zombienet/bridges.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitlab/pipeline/zombienet/bridges.yml b/.gitlab/pipeline/zombienet/bridges.yml index 62f5d821fc44..17ac52963b10 100644 --- a/.gitlab/pipeline/zombienet/bridges.yml +++ b/.gitlab/pipeline/zombienet/bridges.yml @@ -25,7 +25,7 @@ BRIDGES_ZOMBIENET_TESTS_IMAGE_TAG: ${DOCKER_IMAGES_VERSION} BRIDGES_ZOMBIENET_TESTS_IMAGE: "docker.io/paritypr/bridges-zombienet-tests" GH_DIR: "https://github.com/paritytech/polkadot-sdk/tree/${CI_COMMIT_SHA}/bridges/zombienet" - LOCAL_DIR: "/builds/parity/mirrors/polkadot-sdk/substrate/zombienet" + LOCAL_DIR: "/builds/parity/mirrors/polkadot-sdk/bridges/zombienet" FF_DISABLE_UMASK_FOR_DOCKER_EXECUTOR: 1 RUN_IN_CONTAINER: "1" artifacts: @@ -45,4 +45,8 @@ run-zombienet-bridges-tests: extends: - .zombienet-bridges-common script: + - ls -la /home + - ls -la /home/nonroot + - ls -la /home/nonroot/bridges + - ls -la /home/nonroot/bridges/zombienet - /home/nonroot/bridges/zombienet/run-tests.sh From 638924c9fa342718c93a9b5fe8111b3e5466fc6e Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Fri, 24 Nov 2023 12:51:19 +0300 Subject: [PATCH 11/86] dbg --- .gitlab/pipeline/publish.yml | 156 ++++++++++++------------- .gitlab/pipeline/zombienet.yml | 14 +-- .gitlab/pipeline/zombienet/bridges.yml | 2 +- 3 files changed, 86 insertions(+), 86 deletions(-) diff --git a/.gitlab/pipeline/publish.yml b/.gitlab/pipeline/publish.yml index a5e32bd64300..b3123c1d50f2 100644 --- a/.gitlab/pipeline/publish.yml +++ b/.gitlab/pipeline/publish.yml @@ -91,84 +91,84 @@ publish-rustdoc: after_script: - buildah logout --all -build-push-image-polkadot-parachain-debug: - stage: publish - extends: - - .kubernetes-env - - .common-refs - - .build-push-image - needs: - - job: build-linux-stable-cumulus - artifacts: true - variables: - DOCKERFILE: "docker/dockerfiles/polkadot-parachain/polkadot-parachain-debug_unsigned_injected.Dockerfile" - IMAGE_NAME: "docker.io/paritypr/polkadot-parachain-debug" - -build-push-image-test-parachain: - stage: publish - extends: - - .kubernetes-env - - .common-refs - - .build-push-image - needs: - - job: build-test-parachain - artifacts: true - variables: - DOCKERFILE: "docker/dockerfiles/test-parachain_injected.Dockerfile" - IMAGE_NAME: "docker.io/paritypr/test-parachain" - -build-push-image-polkadot-debug: - stage: publish - extends: - - .kubernetes-env - - .common-refs - - .build-push-image - needs: - - job: build-linux-stable - artifacts: true - variables: - DOCKERFILE: "docker/dockerfiles/polkadot/polkadot_injected_debug.Dockerfile" - IMAGE_NAME: "docker.io/paritypr/polkadot-debug" - -build-push-image-colander: - stage: publish - extends: - - .kubernetes-env - - .common-refs - - .build-push-image - needs: - - job: build-test-collators - artifacts: true - variables: - DOCKERFILE: "docker/dockerfiles/collator_injected.Dockerfile" - IMAGE_NAME: "docker.io/paritypr/colander" - -build-push-image-malus: - stage: publish - extends: - - .kubernetes-env - - .common-refs - - .build-push-image - needs: - - job: build-malus - artifacts: true - variables: - DOCKERFILE: "docker/dockerfiles/malus_injected.Dockerfile" - IMAGE_NAME: "docker.io/paritypr/malus" - -build-push-image-substrate-pr: - stage: publish - extends: - - .kubernetes-env - - .common-refs - - .build-push-image - needs: - - job: build-linux-substrate - artifacts: true - variables: - DOCKERFILE: "docker/dockerfiles/substrate_injected.Dockerfile" - IMAGE_NAME: "docker.io/paritypr/substrate" - +#build-push-image-polkadot-parachain-debug: +# stage: publish +# extends: +# - .kubernetes-env +# - .common-refs +# - .build-push-image +# needs: +# - job: build-linux-stable-cumulus +# artifacts: true +# variables: +# DOCKERFILE: "docker/dockerfiles/polkadot-parachain/polkadot-parachain-debug_unsigned_injected.Dockerfile" +# IMAGE_NAME: "docker.io/paritypr/polkadot-parachain-debug" +# +#build-push-image-test-parachain: +# stage: publish +# extends: +# - .kubernetes-env +# - .common-refs +# - .build-push-image +# needs: +# - job: build-test-parachain +# artifacts: true +# variables: +# DOCKERFILE: "docker/dockerfiles/test-parachain_injected.Dockerfile" +# IMAGE_NAME: "docker.io/paritypr/test-parachain" +# +#build-push-image-polkadot-debug: +# stage: publish +# extends: +# - .kubernetes-env +# - .common-refs +# - .build-push-image +# needs: +# - job: build-linux-stable +# artifacts: true +# variables: +# DOCKERFILE: "docker/dockerfiles/polkadot/polkadot_injected_debug.Dockerfile" +# IMAGE_NAME: "docker.io/paritypr/polkadot-debug" +# +#build-push-image-colander: +# stage: publish +# extends: +# - .kubernetes-env +# - .common-refs +# - .build-push-image +# needs: +# - job: build-test-collators +# artifacts: true +# variables: +# DOCKERFILE: "docker/dockerfiles/collator_injected.Dockerfile" +# IMAGE_NAME: "docker.io/paritypr/colander" +# +#build-push-image-malus: +# stage: publish +# extends: +# - .kubernetes-env +# - .common-refs +# - .build-push-image +# needs: +# - job: build-malus +# artifacts: true +# variables: +# DOCKERFILE: "docker/dockerfiles/malus_injected.Dockerfile" +# IMAGE_NAME: "docker.io/paritypr/malus" +# +#build-push-image-substrate-pr: +# stage: publish +# extends: +# - .kubernetes-env +# - .common-refs +# - .build-push-image +# needs: +# - job: build-linux-substrate +# artifacts: true +# variables: +# DOCKERFILE: "docker/dockerfiles/substrate_injected.Dockerfile" +# IMAGE_NAME: "docker.io/paritypr/substrate" +# build-push-image-bridges-zombienet-tests: stage: publish extends: diff --git a/.gitlab/pipeline/zombienet.yml b/.gitlab/pipeline/zombienet.yml index 59959ea7b6c1..669fc06886d4 100644 --- a/.gitlab/pipeline/zombienet.yml +++ b/.gitlab/pipeline/zombienet.yml @@ -4,11 +4,11 @@ ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.3.82" include: - # substrate tests - - .gitlab/pipeline/zombienet/substrate.yml - # cumulus tests - - .gitlab/pipeline/zombienet/cumulus.yml - # polkadot tests - - .gitlab/pipeline/zombienet/polkadot.yml +# # substrate tests +# - .gitlab/pipeline/zombienet/substrate.yml +# # cumulus tests +# - .gitlab/pipeline/zombienet/cumulus.yml +# # polkadot tests +# - .gitlab/pipeline/zombienet/polkadot.yml # bridges tests - - .gitlab/pipeline/zombienet/bridges.yml + - .gitlab/pipeline/zombienet/bridges.yml \ No newline at end of file diff --git a/.gitlab/pipeline/zombienet/bridges.yml b/.gitlab/pipeline/zombienet/bridges.yml index 17ac52963b10..398c4677a99c 100644 --- a/.gitlab/pipeline/zombienet/bridges.yml +++ b/.gitlab/pipeline/zombienet/bridges.yml @@ -14,7 +14,7 @@ - export ZOMBIENET_INTEGRATION_TEST_IMAGE="${BRIDGES_ZOMBIENET_TESTS_IMAGE}":${BRIDGES_ZOMBIENET_TESTS_IMAGE_TAG} - echo "${ZOMBIENET_INTEGRATION_TEST_IMAGE}" stage: zombienet - image: "${ZOMBIENET_INTEGRATION_TEST_IMAGE}" + image: "${BRIDGES_ZOMBIENET_TESTS_IMAGE}:${BRIDGES_ZOMBIENET_TESTS_IMAGE_TAG}" needs: - job: build-push-image-bridges-zombienet-tests artifacts: true From 8653c0523c919a39d02b20d342e1cf5fc7e3a68e Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Fri, 24 Nov 2023 13:32:40 +0300 Subject: [PATCH 12/86] dbg++ --- .gitlab/pipeline/build.yml | 10 +++++----- .gitlab/pipeline/zombienet/bridges.yml | 6 +----- bridges/zombienet/run-tests.sh | 4 ++-- .../bridges_zombienet_tests_injected.Dockerfile | 6 +++--- 4 files changed, 11 insertions(+), 15 deletions(-) diff --git a/.gitlab/pipeline/build.yml b/.gitlab/pipeline/build.yml index 7766cb571a81..2153a2b36e68 100644 --- a/.gitlab/pipeline/build.yml +++ b/.gitlab/pipeline/build.yml @@ -384,9 +384,9 @@ prepare-bridges-zombienet-artifacts: - .run-immediately - .collect-artifacts before_script: - - mkdir -p ./artifacts/bridges/ - - mkdir -p ./artifacts/bridges/cumulus + - mkdir -p ./artifacts/bridges-polkadot-sdk/bridges + - mkdir -p ./artifacts/bridges-polkadot-sdk/cumulus/zombienet script: - - cp -r bridges/zombienet ./artifacts/bridges - - cp -r cumulus/scripts ./artifacts/bridges/cumulus/scripts - - cp -r cumulus/zombienet/bridge-hubs ./artifacts/bridges/cumulus/brige-hubs + - cp -r bridges/zombienet ./artifacts/bridges-polkadot-sdk/bridges/zombienet + - cp -r cumulus/scripts ./artifacts/bridges-polkadot-sdk/cumulus/scripts + - cp -r cumulus/zombienet/bridge-hubs ./artifacts/bridges-polkadot-sdk/cumulus/zombienet/bridge-hubs diff --git a/.gitlab/pipeline/zombienet/bridges.yml b/.gitlab/pipeline/zombienet/bridges.yml index 398c4677a99c..0c33f2d8f910 100644 --- a/.gitlab/pipeline/zombienet/bridges.yml +++ b/.gitlab/pipeline/zombienet/bridges.yml @@ -45,8 +45,4 @@ run-zombienet-bridges-tests: extends: - .zombienet-bridges-common script: - - ls -la /home - - ls -la /home/nonroot - - ls -la /home/nonroot/bridges - - ls -la /home/nonroot/bridges/zombienet - - /home/nonroot/bridges/zombienet/run-tests.sh + - /home/nonroot/bridges-polkadot-sdk/bridges/zombienet/run-tests.sh diff --git a/bridges/zombienet/run-tests.sh b/bridges/zombienet/run-tests.sh index 02ca71101e09..c52daa5d1f76 100755 --- a/bridges/zombienet/run-tests.sh +++ b/bridges/zombienet/run-tests.sh @@ -6,8 +6,8 @@ trap "trap - SIGTERM && kill -- -$$" SIGINT SIGTERM EXIT # assuming that we'll be using native provide && all processes will be executing locally # (we need absolute paths here, because they're used when scripts are called by zombienet from tmp folders) -export POLKADOT_SDK_FOLDER=/home/nonroot/bridges -export BRIDGE_TESTS_FOLDER=$POLKADOT_SDK_FOLDER/bridges/zombienet/tests +export POLKADOT_SDK_FOLDER=`realpath $(dirname "$0")/../..` +export BRIDGE_TESTS_FOLDER=$POLKADOT_SDK_FOLDER/zombienet/tests export POLKADOT_BINARY_PATH=/usr/local/bin/polkadot export POLKADOT_PARACHAIN_BINARY_PATH=/usr/local/bin/polkadot-parachain export POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_ROCOCO=/usr/local/bin/polkadot-parachain diff --git a/docker/dockerfiles/bridges_zombienet_tests_injected.Dockerfile b/docker/dockerfiles/bridges_zombienet_tests_injected.Dockerfile index 183e12f9ebcb..47ea866cf391 100644 --- a/docker/dockerfiles/bridges_zombienet_tests_injected.Dockerfile +++ b/docker/dockerfiles/bridges_zombienet_tests_injected.Dockerfile @@ -37,8 +37,8 @@ COPY ./artifacts/polkadot-parachain /usr/local/bin # copy substrate-relay to the docker image COPY --from=relay-builder /home/user/substrate-relay /usr/local/bin/ # finally - we need bridges zombienet runner and tests -RUN mkdir -p /home/nonroot/bridges -COPY ./artifacts/bridges /home/nonroot/bridges +RUN mkdir -p /home/nonroot/bridges-polkadot-sdk +COPY ./artifacts/bridges-polkadot-sdk /home/nonroot/bridges-polkadot-sdk # check if executable works in this container USER nonroot @@ -49,4 +49,4 @@ RUN /usr/local/bin/substrate-relay --version # https://polkadot.js.org/apps/?rpc=ws://127.0.0.1:{PORT}#/explorer EXPOSE 9942 9910 8943 9945 9010 8945 -ENTRYPOINT ["/bin/bash", "-c", "/home/nonroot/bridges/zombienet/run-tests.sh"] +ENTRYPOINT ["/bin/bash", "-c", "/home/nonroot/bridges-polkadot-sdk/bridges/zombienet/run-tests.sh"] From 0ebc852bb1178140acc6085b7190e341d1218920 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Fri, 24 Nov 2023 14:21:19 +0300 Subject: [PATCH 13/86] dbg++++ --- bridges/zombienet/README.md | 2 +- bridges/zombienet/run-tests.sh | 2 +- cumulus/parachains/runtimes/bridge-hubs/README.md | 2 +- cumulus/scripts/bridges_common.sh | 4 ++-- cumulus/scripts/bridges_rococo_westend.sh | 6 +++--- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/bridges/zombienet/README.md b/bridges/zombienet/README.md index b601154b624c..8b037d47d15b 100644 --- a/bridges/zombienet/README.md +++ b/bridges/zombienet/README.md @@ -21,7 +21,7 @@ To start those tests, you need to: - build Substrate relay by running `cargo build -p substrate-relay --release` command in the [`parity-bridges-common`](https://github.com/paritytech/parity-bridges-common) repository clone. -- copy fresh `substrate-relay` binary, built in previous point, to the `~/local_bridge_testing/bin/substrate-relay`; +- copy fresh `substrate-relay` binary, built in previous point, to the `/usr/local/bin/substrate-relay`; - change the `POLKADOT_SDK_FOLDER` and `ZOMBIENET_BINARY_PATH` (and ensure that the nearby variables have correct values) in the `./run-tests.sh`. diff --git a/bridges/zombienet/run-tests.sh b/bridges/zombienet/run-tests.sh index c52daa5d1f76..1b44a469f034 100755 --- a/bridges/zombienet/run-tests.sh +++ b/bridges/zombienet/run-tests.sh @@ -7,7 +7,7 @@ trap "trap - SIGTERM && kill -- -$$" SIGINT SIGTERM EXIT # assuming that we'll be using native provide && all processes will be executing locally # (we need absolute paths here, because they're used when scripts are called by zombienet from tmp folders) export POLKADOT_SDK_FOLDER=`realpath $(dirname "$0")/../..` -export BRIDGE_TESTS_FOLDER=$POLKADOT_SDK_FOLDER/zombienet/tests +export BRIDGE_TESTS_FOLDER=$POLKADOT_SDK_FOLDER/bridges/zombienet/tests export POLKADOT_BINARY_PATH=/usr/local/bin/polkadot export POLKADOT_PARACHAIN_BINARY_PATH=/usr/local/bin/polkadot-parachain export POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_ROCOCO=/usr/local/bin/polkadot-parachain diff --git a/cumulus/parachains/runtimes/bridge-hubs/README.md b/cumulus/parachains/runtimes/bridge-hubs/README.md index cf617db730dd..c45322cfd2ed 100644 --- a/cumulus/parachains/runtimes/bridge-hubs/README.md +++ b/cumulus/parachains/runtimes/bridge-hubs/README.md @@ -69,7 +69,7 @@ cd parity-bridges-common git checkout -b polkadot-staging --track origin/polkadot-staging cargo build --release -p substrate-relay -cp target/release/substrate-relay ~/local_bridge_testing/bin/substrate-relay +cp target/release/substrate-relay /usr/local/bin/substrate-relay --- diff --git a/cumulus/scripts/bridges_common.sh b/cumulus/scripts/bridges_common.sh index 8d64c5ede52a..e63d098b00e3 100755 --- a/cumulus/scripts/bridges_common.sh +++ b/cumulus/scripts/bridges_common.sh @@ -16,8 +16,8 @@ function ensure_binaries() { } function ensure_relayer() { - if [[ ! -f ~/local_bridge_testing/bin/substrate-relay ]]; then - echo " Required substrate-relay binary '~/local_bridge_testing/bin/substrate-relay' does not exist!" + if [[ ! -f /usr/local/bin/substrate-relay ]]; then + echo " Required substrate-relay binary '/usr/local/bin/substrate-relay' does not exist!" echo " You need to build it and copy to this location!" echo " Please, check ./parachains/runtimes/bridge-hubs/README.md (Prepare/Build/Deploy)" exit 1 diff --git a/cumulus/scripts/bridges_rococo_westend.sh b/cumulus/scripts/bridges_rococo_westend.sh index 9b3bd350276f..b5f3c6dbf294 100755 --- a/cumulus/scripts/bridges_rococo_westend.sh +++ b/cumulus/scripts/bridges_rococo_westend.sh @@ -134,7 +134,7 @@ function init_ro_wnd() { ensure_relayer RUST_LOG=runtime=trace,rpc=trace,bridge=trace \ - ~/local_bridge_testing/bin/substrate-relay init-bridge rococo-to-bridge-hub-westend \ + /usr/local/bin/substrate-relay init-bridge rococo-to-bridge-hub-westend \ --source-host localhost \ --source-port 9942 \ --source-version-mode Auto \ @@ -148,7 +148,7 @@ function init_wnd_ro() { ensure_relayer RUST_LOG=runtime=trace,rpc=trace,bridge=trace \ - ~/local_bridge_testing/bin/substrate-relay init-bridge westend-to-bridge-hub-rococo \ + /usr/local/bin/substrate-relay init-bridge westend-to-bridge-hub-rococo \ --source-host localhost \ --source-port 9945 \ --source-version-mode Auto \ @@ -162,7 +162,7 @@ function run_relay() { ensure_relayer RUST_LOG=runtime=trace,rpc=trace,bridge=trace \ - ~/local_bridge_testing/bin/substrate-relay relay-headers-and-messages bridge-hub-rococo-bridge-hub-westend \ + /usr/local/bin/substrate-relay relay-headers-and-messages bridge-hub-rococo-bridge-hub-westend \ --rococo-host localhost \ --rococo-port 9942 \ --rococo-version-mode Auto \ From 81c9ec6be9a30f06a97524f728f7a5470529202a Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Fri, 24 Nov 2023 16:06:43 +0300 Subject: [PATCH 14/86] try with other zombienet? --- docker/dockerfiles/bridges_zombienet_tests_injected.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/dockerfiles/bridges_zombienet_tests_injected.Dockerfile b/docker/dockerfiles/bridges_zombienet_tests_injected.Dockerfile index 47ea866cf391..d1cf20a2a5b3 100644 --- a/docker/dockerfiles/bridges_zombienet_tests_injected.Dockerfile +++ b/docker/dockerfiles/bridges_zombienet_tests_injected.Dockerfile @@ -13,7 +13,7 @@ FROM ${SUBSTRATE_RELAY_IMAGE} as relay-builder # the base image is the zombienet image - we are planning to run zombienet tests using native # provider here -FROM ${ZOMBIENET_IMAGE} +FROM docker.io/paritytech/zombienet:v1.3.79 LABEL io.parity.image.authors="devops-team@parity.io" \ io.parity.image.vendor="Parity Technologies" \ From 065a69efeb1d348d9799a3b33372abd80983eeaf Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Mon, 27 Nov 2023 09:51:25 +0300 Subject: [PATCH 15/86] install ps --- docker/dockerfiles/bridges_zombienet_tests_injected.Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker/dockerfiles/bridges_zombienet_tests_injected.Dockerfile b/docker/dockerfiles/bridges_zombienet_tests_injected.Dockerfile index d1cf20a2a5b3..313f114355f0 100644 --- a/docker/dockerfiles/bridges_zombienet_tests_injected.Dockerfile +++ b/docker/dockerfiles/bridges_zombienet_tests_injected.Dockerfile @@ -28,6 +28,9 @@ LABEL io.parity.image.authors="devops-team@parity.io" \ ENV RUST_BACKTRACE 1 USER root +# for native provider to work (TODO: fix in zn docker?) +RUN apt-get update && apt-get install procps + # add polkadot binary to the docker image COPY ./artifacts/polkadot /usr/local/bin/ COPY ./artifacts/polkadot-execute-worker /usr/local/bin/ From 4afa6a85f2333842f81528770380d2031ca13597 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Mon, 27 Nov 2023 10:28:50 +0300 Subject: [PATCH 16/86] fix --- docker/dockerfiles/bridges_zombienet_tests_injected.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/dockerfiles/bridges_zombienet_tests_injected.Dockerfile b/docker/dockerfiles/bridges_zombienet_tests_injected.Dockerfile index 313f114355f0..3b06bbb63579 100644 --- a/docker/dockerfiles/bridges_zombienet_tests_injected.Dockerfile +++ b/docker/dockerfiles/bridges_zombienet_tests_injected.Dockerfile @@ -29,7 +29,7 @@ ENV RUST_BACKTRACE 1 USER root # for native provider to work (TODO: fix in zn docker?) -RUN apt-get update && apt-get install procps +RUN apt-get update && apt-get install -y procps # add polkadot binary to the docker image COPY ./artifacts/polkadot /usr/local/bin/ From fcc42168527ddf810ab73d02e83ac3eeb357ba14 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Mon, 27 Nov 2023 13:10:55 +0300 Subject: [PATCH 17/86] yarn global add @polkadot/api-cli --- docker/dockerfiles/bridges_zombienet_tests_injected.Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker/dockerfiles/bridges_zombienet_tests_injected.Dockerfile b/docker/dockerfiles/bridges_zombienet_tests_injected.Dockerfile index 3b06bbb63579..273989e34562 100644 --- a/docker/dockerfiles/bridges_zombienet_tests_injected.Dockerfile +++ b/docker/dockerfiles/bridges_zombienet_tests_injected.Dockerfile @@ -13,7 +13,7 @@ FROM ${SUBSTRATE_RELAY_IMAGE} as relay-builder # the base image is the zombienet image - we are planning to run zombienet tests using native # provider here -FROM docker.io/paritytech/zombienet:v1.3.79 +FROM ${ZOMBIENET_IMAGE} LABEL io.parity.image.authors="devops-team@parity.io" \ io.parity.image.vendor="Parity Technologies" \ @@ -30,6 +30,7 @@ USER root # for native provider to work (TODO: fix in zn docker?) RUN apt-get update && apt-get install -y procps +RUN yarn global add @polkadot/api-cli # add polkadot binary to the docker image COPY ./artifacts/polkadot /usr/local/bin/ From 71725809fd23258cc0beb397a6c7bfb8892e97f0 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Mon, 18 Dec 2023 12:53:21 +0300 Subject: [PATCH 18/86] flush --- bridges/zombienet/Dockerfile | 55 +++++++++++++++++++++++++++++++ bridges/zombienet/build-docker.sh | 5 +++ bridges/zombienet/run-tests.sh | 36 ++++++++++++++------ 3 files changed, 86 insertions(+), 10 deletions(-) create mode 100644 bridges/zombienet/Dockerfile create mode 100755 bridges/zombienet/build-docker.sh diff --git a/bridges/zombienet/Dockerfile b/bridges/zombienet/Dockerfile new file mode 100644 index 000000000000..a919e2393541 --- /dev/null +++ b/bridges/zombienet/Dockerfile @@ -0,0 +1,55 @@ +# build me from the project root using +# docker build -f bridges/zombienet/Dockerfile ./target/release + +ARG DEBIAN_CODENAME=bullseye + +FROM paritytech/substrate-relay:v2023-11-07-rococo-westend-initial-relayer as relay +FROM paritypr/polkadot-debug:4ccd3fae58c406c2698198075d5e3c65d95708ee as polkadot +FROM paritypr/polkadot-parachain-debug:07127dea7fc0dcceca0c14e2f7081625eb24333b as polkadot-parachain + +FROM docker.io/paritytech/zombienet:v1.3.79 + +USER root +WORKDIR /home/root + +# install tools and dependencies +RUN set -eux; \ + apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 15CF4D18AF4F7421; \ + apt-get -y update; \ + apt-get install -y --no-install-recommends \ + libssl-dev make cmake graphviz \ + git pkg-config curl time rhash ca-certificates jq \ + python3 python3-pip lsof ruby ruby-bundler git-restore-mtime xz-utils zstd unzip gnupg protobuf-compiler && \ +# add clang 14 repo + echo "deb http://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-14 main" >> /etc/apt/sources.list.d/llvm-toolchain-bullseye-14.list; \ + echo "deb-src http://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-14 main" >> /etc/apt/sources.list.d/llvm-toolchain-bullseye-14.list; \ + apt-get -y update; \ + apt-get install -y --no-install-recommends \ + clang-14 lldb-14 lld-14 libclang-14-dev + + +COPY --from=relay /home/user/substrate-relay /home/nonroot/local_bridge_testing/bin/substrate-relay +COPY --from=polkadot /usr/local/bin/polkadot /home/nonroot/polkadot-sdk/target/release/polkadot +COPY --from=polkadot /usr/local/bin/polkadot-execute-worker /home/nonroot/polkadot-sdk/target/release/polkadot-execute-worker +COPY --from=polkadot /usr/local/bin/polkadot-prepare-worker /home/nonroot/polkadot-sdk/target/release/polkadot-prepare-worker +COPY --from=polkadot-parachain /usr/local/bin/polkadot-parachain /home/nonroot/polkadot-sdk/target/release/polkadot-parachain + +#COPY artifacts/polkadot-parachain /home/nonroot/polkadot-sdk/target/release/polkadot-parachain +#COPY artifacts/polkadot /home/nonroot/polkadot-sdk/target/release/polkadot + +COPY cumulus/scripts /home/nonroot/polkadot-sdk/cumulus/scripts +COPY cumulus/zombienet /home/nonroot/polkadot-sdk/cumulus/zombienet + +COPY helpers /home/nonroot/polkadot-sdk/bridges/zombienet/helpers +COPY scripts /home/nonroot/polkadot-sdk/bridges/zombienet/scripts +COPY tests /home/nonroot/polkadot-sdk/bridges/zombienet/tests +COPY run-tests.sh /home/nonroot/polkadot-sdk/bridges/zombienet + +# https://polkadot.js.org/apps/?rpc=ws://127.0.0.1:{PORT}#/explorer +EXPOSE 9942 9910 8943 9945 9010 8945 + +USER nonroot + +#ENTRYPOINT ["/home/nonroot/polkadot-sdk/target/release/polkadot"] +#ENTRYPOINT ["ls", "-la", "/usr/local/bin/"] +ENTRYPOINT ["/home/nonroot/polkadot-sdk/bridges/zombienet/run-tests.sh"] diff --git a/bridges/zombienet/build-docker.sh b/bridges/zombienet/build-docker.sh new file mode 100755 index 000000000000..9fcf476055a0 --- /dev/null +++ b/bridges/zombienet/build-docker.sh @@ -0,0 +1,5 @@ +#!/bin/bash +set -eux +CONTEXT=`dirname "$0"` +docker build -f $CONTEXT/Dockerfile $CONTEXT -t bzn +docker run -it -p 9942:9942 -p 9910:9910 -p 8943:8943 -p 9945:9945 -p 9010:9010 -p 8945:8945 bzn diff --git a/bridges/zombienet/run-tests.sh b/bridges/zombienet/run-tests.sh index 1b44a469f034..e0b7bb9d7fe1 100755 --- a/bridges/zombienet/run-tests.sh +++ b/bridges/zombienet/run-tests.sh @@ -1,5 +1,6 @@ #!/bin/bash #set -eu +set -x shopt -s nullglob trap "trap - SIGTERM && kill -- -$$" SIGINT SIGTERM EXIT @@ -8,12 +9,20 @@ trap "trap - SIGTERM && kill -- -$$" SIGINT SIGTERM EXIT # (we need absolute paths here, because they're used when scripts are called by zombienet from tmp folders) export POLKADOT_SDK_FOLDER=`realpath $(dirname "$0")/../..` export BRIDGE_TESTS_FOLDER=$POLKADOT_SDK_FOLDER/bridges/zombienet/tests -export POLKADOT_BINARY_PATH=/usr/local/bin/polkadot -export POLKADOT_PARACHAIN_BINARY_PATH=/usr/local/bin/polkadot-parachain -export POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_ROCOCO=/usr/local/bin/polkadot-parachain -export POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_WESTEND=/usr/local/bin/polkadot-parachain +#export POLKADOT_BINARY_PATH=/usr/local/bin/polkadot +#export POLKADOT_PARACHAIN_BINARY_PATH=/usr/local/bin/polkadot-parachain +#export POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_ROCOCO=/usr/local/bin/polkadot-parachain +#export POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_WESTEND=/usr/local/bin/polkadot-parachain +#export ZOMBIENET_BINARY_PATH=/usr/local/bin/zombie +export POLKADOT_BINARY_PATH=$POLKADOT_SDK_FOLDER/target/release/polkadot +export POLKADOT_PARACHAIN_BINARY_PATH=$POLKADOT_SDK_FOLDER/target/release/polkadot-parachain +export POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_ROCOCO=$POLKADOT_PARACHAIN_BINARY_PATH +export POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_WESTEND=$POLKADOT_PARACHAIN_BINARY_PATH export ZOMBIENET_BINARY_PATH=/usr/local/bin/zombie +# check if `wait` supports -p flag +if [ `printf "$BASH_VERSION\n5.1" | sort -V | head -n 1` = "5.1" ]; then IS_BASH_5_1=1; else IS_BASH_5_1=0; fi + # bridge configuration export LANE_ID="00000002" @@ -66,12 +75,19 @@ do # wait until all tests are completed relay_exited=0 for n in `seq 1 $TEST_COPROCS_COUNT`; do - wait -n -p COPROC_PID - exit_code=$? - coproc_name=${TEST_COPROCS[$COPROC_PID, 0]} - coproc_log=${TEST_COPROCS[$COPROC_PID, 1]} - coproc_stdout=$(cat $coproc_log) - relay_exited=$(expr "${coproc_name}" == "relay") + if [ "$IS_BASH_5_1" -eq 1 ]; then + wait -n -p COPROC_PID + exit_code=$? + coproc_name=${TEST_COPROCS[$COPROC_PID, 0]} + coproc_log=${TEST_COPROCS[$COPROC_PID, 1]} + coproc_stdout=$(cat $coproc_log) + relay_exited=$(expr "${coproc_name}" == "relay") + else + wait -n + exit_code=$? + coproc_name="" + coproc_stdout="" + fi echo "Process $coproc_name has finished with exit code: $exit_code" # if exit code is not zero, exit From 7393a97c19126d70b91f22ca338e644e20136351 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Mon, 18 Dec 2023 13:13:55 +0300 Subject: [PATCH 19/86] flush --- .dockerignore | 1 + .../native-assets-balance-increased.js | 20 +++++++ bridges/zombienet/test.js | 30 ++++++++++ ...set-transfer-works-rococo-to-westend.zndsl | 13 ++++- ...set-transfer-works-westend-to-rococo.zndsl | 7 +++ emulate-ci.sh | 38 +++++++++++++ issue | 56 +++++++++++++++++++ 7 files changed, 162 insertions(+), 3 deletions(-) create mode 100644 .dockerignore create mode 100644 bridges/zombienet/helpers/native-assets-balance-increased.js create mode 100644 bridges/zombienet/test.js create mode 100755 emulate-ci.sh create mode 100644 issue diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 000000000000..eb5a316cbd19 --- /dev/null +++ b/.dockerignore @@ -0,0 +1 @@ +target diff --git a/bridges/zombienet/helpers/native-assets-balance-increased.js b/bridges/zombienet/helpers/native-assets-balance-increased.js new file mode 100644 index 000000000000..9ee1a769e9f2 --- /dev/null +++ b/bridges/zombienet/helpers/native-assets-balance-increased.js @@ -0,0 +1,20 @@ +async function run(nodeName, networkInfo, args) { + const {wsUri, userDefinedTypes} = networkInfo.nodesByName[nodeName]; + const api = await zombie.connect(wsUri, userDefinedTypes); + + const accountAddress = args[0]; + const initialAccountData = await api.query.system.account(accountAddress); + const initialAccountBalance = initialAccountData.data['free']; + while (true) { + const accountData = await api.query.system.account(accountAddress); + const accountBalance = accountData.data['free']; + if (accountBalance > initialAccountBalance) { + return accountBalance; + } + + // else sleep and retry + await new Promise((resolve) => setTimeout(resolve, 12000)); + } +} + +module.exports = { run } diff --git a/bridges/zombienet/test.js b/bridges/zombienet/test.js new file mode 100644 index 000000000000..be8707a60dc6 --- /dev/null +++ b/bridges/zombienet/test.js @@ -0,0 +1,30 @@ +#!node +const { WsProvider, ApiPromise } = require("@polkadot/api"); +const util = require("@polkadot/util"); + +async function connect(endpoint, types = {}) { + const provider = new WsProvider(endpoint); + const api = await ApiPromise.create({ + provider, + types: {/* + HeaderId: { + number: "u32", + hash: "H256" + }*/ + }, + throwOnConnect: false, + }); + return api; +} + +async function test() { + const api = await connect("ws://127.0.0.1:9910"); + + const accountAddress = "5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY"; + const accountData = await api.query.system.account(accountAddress); + console.log(accountData.data['free']); + console.log(accountData.data['free'] > 0); + console.log(accountData.data['free'] < 0xFFFF); +} + +test() \ No newline at end of file diff --git a/bridges/zombienet/tests/0001-asset-transfer-works-rococo-to-westend.zndsl b/bridges/zombienet/tests/0001-asset-transfer-works-rococo-to-westend.zndsl index f68d658cdacb..2787b774a38a 100644 --- a/bridges/zombienet/tests/0001-asset-transfer-works-rococo-to-westend.zndsl +++ b/bridges/zombienet/tests/0001-asset-transfer-works-rococo-to-westend.zndsl @@ -12,15 +12,22 @@ bridge-hub-westend-collator1: run ../scripts/invoke-script.sh with "init-bridge- # step 3: relay is started elsewhere - let's wait until with-Rococo GRANPDA pallet is initialized at Westend bridge-hub-westend-collator1: js-script ../helpers/best-finalized-header-at-bridged-chain.js with "Rococo,0" within 400 seconds -# step 2: send WOC to Rococo +# step 4: send WOC to Rococo asset-hub-westend-collator1: run ../scripts/invoke-script.sh with "reserve-transfer-assets-from-asset-hub-westend-local" within 60 seconds -# step 3: elsewhere Rococo has sent ROC to //Alice - let's wait for it +# step 5: elsewhere Rococo has sent ROC to //Alice - let's wait for it asset-hub-westend-collator1: js-script ../helpers/wrapped-assets-balance.js with "5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY,0,Rococo" within 600 seconds -# step 4: check that the relayer //Charlie is rewarded by both our AH and target AH +# step 6: check that the relayer //Charlie is rewarded by both our AH and target AH bridge-hub-westend-collator1: js-script ../helpers/relayer-rewards.js with "5FLSigC9HGRKVhB9FiEo4Y3koPsNmBmLJbpXg2mp1hXcS59Y,0x00000002,0x6268726f,BridgedChain,0" within 300 seconds bridge-hub-westend-collator1: js-script ../helpers/relayer-rewards.js with "5FLSigC9HGRKVhB9FiEo4Y3koPsNmBmLJbpXg2mp1hXcS59Y,0x00000002,0x6268726F,ThisChain,0" within 300 seconds +# step 7: send wROC back to Alice at Rococo AH +asset-hub-westend-collator1: run ../scripts/invoke-script.sh with "withdraw-reserve-assets-from-asset-hub-westend-local" within 60 seconds + +# step 8: elsewhere Rococo has sent wWND to //Alice - let's wait for it +# (we wait until //Alice account increases here - there's no other transactionc that may increase it) +asset-hub-westend-collator1: js-script ../helpers/native-assets-balance-increased.js with "5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY" within 600 seconds + # wait until other network test has completed OR exit with an error too asset-hub-westend-collator1: run ../scripts/sync-exit.sh within 600 seconds diff --git a/bridges/zombienet/tests/0001-asset-transfer-works-westend-to-rococo.zndsl b/bridges/zombienet/tests/0001-asset-transfer-works-westend-to-rococo.zndsl index c862fa6d1760..bcbc0d147cd6 100644 --- a/bridges/zombienet/tests/0001-asset-transfer-works-westend-to-rococo.zndsl +++ b/bridges/zombienet/tests/0001-asset-transfer-works-westend-to-rococo.zndsl @@ -22,5 +22,12 @@ asset-hub-rococo-collator1: js-script ../helpers/wrapped-assets-balance.js with bridge-hub-rococo-collator1: js-script ../helpers/relayer-rewards.js with "5FLSigC9HGRKVhB9FiEo4Y3koPsNmBmLJbpXg2mp1hXcS59Y,0x00000002,0x62687764,BridgedChain,0" within 300 seconds bridge-hub-rococo-collator1: js-script ../helpers/relayer-rewards.js with "5FLSigC9HGRKVhB9FiEo4Y3koPsNmBmLJbpXg2mp1hXcS59Y,0x00000002,0x62687764,ThisChain,0" within 300 seconds +# step 7: send wROC back to Alice at Rococo AH +asset-hub-rococo-collator1: run ../scripts/invoke-script.sh with "withdraw-reserve-assets-from-asset-hub-rococo-local" within 60 seconds + +# step 8: elsewhere Rococo has sent wWND to //Alice - let's wait for it +# (we wait until //Alice account increases here - there's no other transactionc that may increase it) +asset-hub-rococo-collator1: js-script ../helpers/native-assets-balance-increased.js with "5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY" within 600 seconds + # wait until other network test has completed OR exit with an error too asset-hub-rococo-collator1: run ../scripts/sync-exit.sh within 600 seconds diff --git a/emulate-ci.sh b/emulate-ci.sh new file mode 100755 index 000000000000..d9348dc03055 --- /dev/null +++ b/emulate-ci.sh @@ -0,0 +1,38 @@ +#!/bin/bash +set -x + +mkdir -p ./artifacts +mkdir -p ./artifacts/bridges/ +cp target/release/polkadot ./artifacts/. +cp target/release/polkadot-prepare-worker ./artifacts/. +cp target/release/polkadot-execute-worker ./artifacts/. +cp target/release/polkadot-parachain ./artifacts/. +cp -r bridges/zombienet ./artifacts/bridges/. +cp -r cumulus/scripts ./artifacts/bridges/cumulus-scripts +cp -r cumulus/zombienet/bridge-hubs ./artifacts/bridges/cumulus-brige-hubs + +#docker build -f docker/dockerfiles/polkadot/polkadot_builder.Dockerfile . -t polkadot-builder \ +# --build-arg VCS_REF=x \ +# --build-arg BUILD_DATE=y \ +# --build-arg IMAGE_NAME=z \ +# --build-arg ZOMBIENET_IMAGE=docker.io/paritytech/zombienet:v1.3.79 + +docker build -f docker/dockerfiles/bridges-zombienet-debug_injected.Dockerfile . -t bzn \ + --build-arg VCS_REF=x \ + --build-arg BUILD_DATE=y \ + --build-arg IMAGE_NAME=z \ + --build-arg ZOMBIENET_IMAGE=docker.io/paritytech/zombienet:v1.3.79 + +# docker run -it --entrypoint /bin/bash paritytech/substrate-relay:v2023-11-07-rococo-westend-initial-relayer: +# +# user@0fd8c0122d04:~$ ls -la /usr/lib/x86_64-linux-gnu/libstdc++.so.6 +# lrwxrwxrwx 1 root root 19 Jul 9 06:45 /usr/lib/x86_64-linux-gnu/libstdc++.so.6 -> libstdc++.so.6.0.28 + +# docker run -it --entrypoint /bin/bash docker.io/paritytech/zombienet:v1.3.79 +# +# nonroot@39db69fc2525:~/zombie-net$ ls -la /usr/lib/x86_64-linux-gnu/libstdc++.so.6 +# lrwxrwxrwx 1 root root 19 Jan 10 2021 /usr/lib/x86_64-linux-gnu/libstdc++.so.6 -> libstdc++.so.6.0.28 + +# docker run -it --entrypoint /bin/bash -p 9942:9942 -p 9910:9910 -p 8943:8943 -p 9945:9945 -p 9010:9010 -p 8945:8945 bzn + +# docker run -it --entrypoint /bin/bash -p 9942:9942 -p 9910:9910 -p 8943:8943 -p 9945:9945 -p 9010:9010 -p 8945:8945 docker.io/paritypr/bridges-zombienet-tests:2439-fcc42168 \ No newline at end of file diff --git a/issue b/issue new file mode 100644 index 000000000000..1a9114eae53c --- /dev/null +++ b/issue @@ -0,0 +1,56 @@ +Spawned relay coprocess. StdOut + StdErr: /tmp/tmp.qEiIRbsIXw/tmp.wnkWVp4XHl/tmp.8mqWXrJcVf +/home/nonroot/bridges-polkadot-sdk/bridges/zombienet/run-tests.sh: line 23: warning: execute_coproc: coproc [14:COPROC] still exists +Spawned /home/nonroot/bridges-polkadot-sdk/bridges/zombienet/tests/0001-asset-transfer-works-rococo-to-westend.zndsl coprocess. StdOut + StdErr: /tmp/tmp.qEiIRbsIXw/tmp.wnkWVp4XHl/tmp.80ppV9hiNr +/home/nonroot/bridges-polkadot-sdk/bridges/zombienet/run-tests.sh: line 23: warning: execute_coproc: coproc [17:COPROC] still exists +Spawned /home/nonroot/bridges-polkadot-sdk/bridges/zombienet/tests/0001-asset-transfer-works-westend-to-rococo.zndsl coprocess. StdOut + StdErr: /tmp/tmp.qEiIRbsIXw/tmp.wnkWVp4XHl/tmp.AgcWMgcGDg +Process /home/nonroot/bridges-polkadot-sdk/bridges/zombienet/tests/0001-asset-transfer-works-rococo-to-westend.zndsl has finished with exit code: 1 +===================================================================== + +Rococo -> Westend: +Unable to map [u8; 32] to a lookup index +2023-12-18 09:54:48 API/INIT: westmint/1003000: Not decorating unknown runtime apis: 0xfbc577b9d747efd6/1 + + Error running script: ../helpers/wrapped-assets-balance.js Error: Timeout(600), "custom-js ../helpers/wrapped-assets-balance.js within 600 secs" didn't complete on time. + + +Westend -> Rococo: +Unable to map [u8; 32] to a lookup index +2023-12-18 09:52:48 API/INIT: statemine/1003000: Not decorating unknown runtime apis: 0xfbc577b9d747efd6/1 + + Error running script: ../helpers/wrapped-assets-balance.js Error: Timeout(600), "custom-js ../helpers/wrapped-assets-balance.js within 600 secs" didn't complete on time. + +[BridgeHubRococo_to_BridgeHubWestend_MessageLane_00000002] 2023-12-18 10:04:39 +00 INFO bridge Synced Some(1) of Some(1) nonces in BridgeHubWestend::ReceivingConfirmationsDelivery -> BridgeHubRococo::ReceivingConfirmationsDelivery race +[BridgeHubRococo_to_BridgeHubWestend_MessageLane_00000002] 2023-12-18 10:04:39 +00 INFO bridge Synced Some(1) of Some(1) nonces in BridgeHubRococo::MessagesDelivery -> BridgeHubWestend::MessagesDelivery race +[BridgeHubWestend_to_BridgeHubRococo_MessageLane_00000002] 2023-12-18 10:04:39 +00 INFO bridge Synced Some(1) of Some(1) nonces in BridgeHubRococo::ReceivingConfirmationsDelivery -> BridgeHubWestend::ReceivingConfirmationsDelivery race +[BridgeHubWestend_to_BridgeHubRococo_MessageLane_00000002] 2023-12-18 10:04:39 +00 INFO bridge Synced Some(1) of Some(1) nonces in BridgeHubWestend::MessagesDelivery -> BridgeHubRococo::MessagesDelivery race + +===================================================================== + +Rococo BH: +2023-12-18 09:56:00.071 DEBUG tokio-runtime-worker runtime::bridge-messages: [Parachain] Received messages: total=1, valid=1. Weight used: Weight(ref_time: 1131543667, proof_size: 8207)/Weight(ref_time: 1131543667, proof_size: 57359). +2023-12-18 09:56:00.071 TRACE tokio-runtime-worker runtime::bridge-relayers: [Parachain] Relayer can now claim reward for serving payer RewardsAccountParams { lane_id: [0, 0, 0, 2], bridged_chain_id: [98, 104, 119, 100], owner: ThisChain }: 148445654 + +Rococo AH: + +023-12-18 09:56:24.137 TRACE tokio-runtime-worker xcm::weight: [Parachain] WeightInfoBounds message: Xcm([DescendOrigin(X1(PalletInstance(51))), UniversalOrigin(GlobalConsensus(Westend)), DescendOrigin(X1(Parachain(1000))), ReserveAssetDeposited(MultiAssets([MultiAsset { id: Concrete(MultiLocation { parents: 2, interior: X1(GlobalConsensus(Westend)) }), fun: Fungible(150000000000) }])), ClearOrigin, BuyExecution { fees: MultiAsset { id: Concrete(MultiLocation { parents: 2, interior: X1(GlobalConsensus(Westend)) }), fun: Fungible(150000000000) }, weight_limit: Unlimited }, DepositAsset { assets: Wild(AllCounted(1)), beneficiary: MultiLocation { parents: 0, interior: X1(AccountId32 { network: None, id: [212, 53, 147, 199, 21, 253, 211, 28, 97, 20, 26, 189, 4, 169, 159, 214, 130, 44, 133, 88, 133, 76, 205, 227, 154, 86, 132, 231, 165, 109, 162, 125] }) } }, SetTopic([69, 190, 44, 151, 178, 35, 82, 208, 221, 233, 67, 201, 206, 212, 56, 63, 223, 119, 195, 127, 31, 87, 59, 196, 23, 20, 40, 202, 162, 213, 159, 53])]) +2023-12-18 09:56:24.137 TRACE tokio-runtime-worker xcm::execute_xcm_in_credit: [Parachain] origin: MultiLocation { parents: 1, interior: X1(Parachain(1013)) }, message: Xcm([DescendOrigin(X1(PalletInstance(51))), UniversalOrigin(GlobalConsensus(Westend)), DescendOrigin(X1(Parachain(1000))), ReserveAssetDeposited(MultiAssets([MultiAsset { id: Concrete(MultiLocation { parents: 2, interior: X1(GlobalConsensus(Westend)) }), fun: Fungible(150000000000) }])), ClearOrigin, BuyExecution { fees: MultiAsset { id: Concrete(MultiLocation { parents: 2, interior: X1(GlobalConsensus(Westend)) }), fun: Fungible(150000000000) }, weight_limit: Unlimited }, DepositAsset { assets: Wild(AllCounted(1)), beneficiary: MultiLocation { parents: 0, interior: X1(AccountId32 { network: None, id: [212, 53, 147, 199, 21, 253, 211, 28, 97, 20, 26, 189, 4, 169, 159, 214, 130, 44, 133, 88, 133, 76, 205, 227, 154, 86, 132, 231, 165, 109, 162, 125] }) } }, SetTopic([69, 190, 44, 151, 178, 35, 82, 208, 221, 233, 67, 201, 206, 212, 56, 63, 223, 119, 195, 127, 31, 87, 59, 196, 23, 20, 40, 202, 162, 213, 159, 53])]), weight_credit: Weight { ref_time: 0, proof_size: 0 } +2023-12-18 09:56:24.137 TRACE tokio-runtime-worker xcm::barriers: [Parachain] TrailingSetTopicAsId origin: MultiLocation { parents: 1, interior: X1(Parachain(1013)) }, instructions: [DescendOrigin(X1(PalletInstance(51))), UniversalOrigin(GlobalConsensus(Westend)), DescendOrigin(X1(Parachain(1000))), ReserveAssetDeposited(MultiAssets([MultiAsset { id: Concrete(MultiLocation { parents: 2, interior: X1(GlobalConsensus(Westend)) }), fun: Fungible(150000000000) }])), ClearOrigin, BuyExecution { fees: MultiAsset { id: Concrete(MultiLocation { parents: 2, interior: X1(GlobalConsensus(Westend)) }), fun: Fungible(150000000000) }, weight_limit: Unlimited }, DepositAsset { assets: Wild(AllCounted(1)), beneficiary: MultiLocation { parents: 0, interior: X1(AccountId32 { network: None, id: [212, 53, 147, 199, 21, 253, 211, 28, 97, 20, 26, 189, 4, 169, 159, 214, 130, 44, 133, 88, 133, 76, 205, 227, 154, 86, 132, 231, 165, 109, 162, 125] }) } }, SetTopic([69, 190, 44, 151, 178, 35, 82, 208, 221, 233, 67, 201, 206, 212, 56, 63, 223, 119, 195, 127, 31, 87, 59, 196, 23, 20, 40, 202, 162, 213, 159, 53])], max_weight: Weight { ref_time: 219970000, proof_size: 6571 }, properties: Properties { weight_credit: Weight { ref_time: 0, proof_size: 0 }, message_id: None } +2023-12-18 09:56:24.137 TRACE tokio-runtime-worker xcm::barriers: [Parachain] TakeWeightCredit origin: MultiLocation { parents: 1, interior: X1(Parachain(1013)) }, instructions: [DescendOrigin(X1(PalletInstance(51))), UniversalOrigin(GlobalConsensus(Westend)), DescendOrigin(X1(Parachain(1000))), ReserveAssetDeposited(MultiAssets([MultiAsset { id: Concrete(MultiLocation { parents: 2, interior: X1(GlobalConsensus(Westend)) }), fun: Fungible(150000000000) }])), ClearOrigin, BuyExecution { fees: MultiAsset { id: Concrete(MultiLocation { parents: 2, interior: X1(GlobalConsensus(Westend)) }), fun: Fungible(150000000000) }, weight_limit: Unlimited }, DepositAsset { assets: Wild(AllCounted(1)), beneficiary: MultiLocation { parents: 0, interior: X1(AccountId32 { network: None, id: [212, 53, 147, 199, 21, 253, 211, 28, 97, 20, 26, 189, 4, 169, 159, 214, 130, 44, 133, 88, 133, 76, 205, 227, 154, 86, 132, 231, 165, 109, 162, 125] }) } }], max_weight: Weight { ref_time: 219970000, proof_size: 6571 }, properties: Properties { weight_credit: Weight { ref_time: 0, proof_size: 0 }, message_id: Some([69, 190, 44, 151, 178, 35, 82, 208, 221, 233, 67, 201, 206, 212, 56, 63, 223, 119, 195, 127, 31, 87, 59, 196, 23, 20, 40, 202, 162, 213, 159, 53]) } +2023-12-18 09:56:24.137 TRACE tokio-runtime-worker xcm::barriers: [Parachain] AllowKnownQueryResponses origin: MultiLocation { parents: 1, interior: X1(Parachain(1013)) }, instructions: [DescendOrigin(X1(PalletInstance(51))), UniversalOrigin(GlobalConsensus(Westend)), DescendOrigin(X1(Parachain(1000))), ReserveAssetDeposited(MultiAssets([MultiAsset { id: Concrete(MultiLocation { parents: 2, interior: X1(GlobalConsensus(Westend)) }), fun: Fungible(150000000000) }])), ClearOrigin, BuyExecution { fees: MultiAsset { id: Concrete(MultiLocation { parents: 2, interior: X1(GlobalConsensus(Westend)) }), fun: Fungible(150000000000) }, weight_limit: Unlimited }, DepositAsset { assets: Wild(AllCounted(1)), beneficiary: MultiLocation { parents: 0, interior: X1(AccountId32 { network: None, id: [212, 53, 147, 199, 21, 253, 211, 28, 97, 20, 26, 189, 4, 169, 159, 214, 130, 44, 133, 88, 133, 76, 205, 227, 154, 86, 132, 231, 165, 109, 162, 125] }) } }], max_weight: Weight { ref_time: 219970000, proof_size: 6571 }, properties: Properties { weight_credit: Weight { ref_time: 0, proof_size: 0 }, message_id: Some([69, 190, 44, 151, 178, 35, 82, 208, 221, 233, 67, 201, 206, 212, 56, 63, 223, 119, 195, 127, 31, 87, 59, 196, 23, 20, 40, 202, 162, 213, 159, 53]) } +2023-12-18 09:56:24.137 TRACE tokio-runtime-worker xcm::barriers: [Parachain] WithComputedOrigin origin: MultiLocation { parents: 1, interior: X1(Parachain(1013)) }, instructions: [DescendOrigin(X1(PalletInstance(51))), UniversalOrigin(GlobalConsensus(Westend)), DescendOrigin(X1(Parachain(1000))), ReserveAssetDeposited(MultiAssets([MultiAsset { id: Concrete(MultiLocation { parents: 2, interior: X1(GlobalConsensus(Westend)) }), fun: Fungible(150000000000) }])), ClearOrigin, BuyExecution { fees: MultiAsset { id: Concrete(MultiLocation { parents: 2, interior: X1(GlobalConsensus(Westend)) }), fun: Fungible(150000000000) }, weight_limit: Unlimited }, DepositAsset { assets: Wild(AllCounted(1)), beneficiary: MultiLocation { parents: 0, interior: X1(AccountId32 { network: None, id: [212, 53, 147, 199, 21, 253, 211, 28, 97, 20, 26, 189, 4, 169, 159, 214, 130, 44, 133, 88, 133, 76, 205, 227, 154, 86, 132, 231, 165, 109, 162, 125] }) } }], max_weight: Weight { ref_time: 219970000, proof_size: 6571 }, properties: Properties { weight_credit: Weight { ref_time: 0, proof_size: 0 }, message_id: Some([69, 190, 44, 151, 178, 35, 82, 208, 221, 233, 67, 201, 206, 212, 56, 63, 223, 119, 195, 127, 31, 87, 59, 196, 23, 20, 40, 202, 162, 213, 159, 53]) } +2023-12-18 09:56:24.137 TRACE tokio-runtime-worker xcm::barriers: [Parachain] AllowTopLevelPaidExecutionFrom origin: MultiLocation { parents: 2, interior: X2(GlobalConsensus(Westend), Parachain(1000)) }, instructions: [ReserveAssetDeposited(MultiAssets([MultiAsset { id: Concrete(MultiLocation { parents: 2, interior: X1(GlobalConsensus(Westend)) }), fun: Fungible(150000000000) }])), ClearOrigin, BuyExecution { fees: MultiAsset { id: Concrete(MultiLocation { parents: 2, interior: X1(GlobalConsensus(Westend)) }), fun: Fungible(150000000000) }, weight_limit: Unlimited }, DepositAsset { assets: Wild(AllCounted(1)), beneficiary: MultiLocation { parents: 0, interior: X1(AccountId32 { network: None, id: [212, 53, 147, 199, 21, 253, 211, 28, 97, 20, 26, 189, 4, 169, 159, 214, 130, 44, 133, 88, 133, 76, 205, 227, 154, 86, 132, 231, 165, 109, 162, 125] }) } }], max_weight: Weight { ref_time: 219970000, proof_size: 6571 }, properties: Properties { weight_credit: Weight { ref_time: 0, proof_size: 0 }, message_id: Some([69, 190, 44, 151, 178, 35, 82, 208, 221, 233, 67, 201, 206, 212, 56, 63, 223, 119, 195, 127, 31, 87, 59, 196, 23, 20, 40, 202, 162, 213, 159, 53]) } +2023-12-18 09:56:24.137 TRACE tokio-runtime-worker xcm::process: [Parachain] origin: Some(MultiLocation { parents: 1, interior: X1(Parachain(1013)) }), total_surplus/refunded: Weight { ref_time: 0, proof_size: 0 }/Weight { ref_time: 0, proof_size: 0 }, error_handler_weight: Weight { ref_time: 0, proof_size: 0 } +2023-12-18 09:56:24.137 TRACE tokio-runtime-worker xcm::process_instruction: [Parachain] === DescendOrigin(X1(PalletInstance(51))) +2023-12-18 09:56:24.137 TRACE tokio-runtime-worker xcm::process_instruction: [Parachain] === UniversalOrigin(GlobalConsensus(Westend)) +2023-12-18 09:56:24.137 TRACE tokio-runtime-worker xcm::process_instruction: [Parachain] === DescendOrigin(X1(Parachain(1000))) +2023-12-18 09:56:24.137 TRACE tokio-runtime-worker xcm::process_instruction: [Parachain] === ReserveAssetDeposited(MultiAssets([MultiAsset { id: Concrete(MultiLocation { parents: 2, interior: X1(GlobalConsensus(Westend)) }), fun: Fungible(150000000000) }])) +2023-12-18 09:56:24.137 TRACE tokio-runtime-worker xcm::contains: [Parachain] IsTrustedBridgedReserveLocationForConcreteAsset asset: MultiAsset { id: Concrete(MultiLocation { parents: 2, interior: X1(GlobalConsensus(Westend)) }), fun: Fungible(150000000000) }, origin: MultiLocation { parents: 2, interior: X2(GlobalConsensus(Westend), Parachain(1000)) }, universal_source: X2(GlobalConsensus(Rococo), Parachain(1000)) +2023-12-18 09:56:24.137 TRACE tokio-runtime-worker xcm::contains: [Parachain] Case asset: MultiAsset { id: Concrete(MultiLocation { parents: 2, interior: X1(GlobalConsensus(Westend)) }), fun: Fungible(150000000000) }, origin: MultiLocation { parents: 2, interior: X2(GlobalConsensus(Westend), Parachain(1000)) } +2023-12-18 09:56:24.137 TRACE tokio-runtime-worker xcm::process_instruction: [Parachain] === ClearOrigin +2023-12-18 09:56:24.137 TRACE tokio-runtime-worker xcm::process_instruction: [Parachain] === BuyExecution { fees: MultiAsset { id: Concrete(MultiLocation { parents: 2, interior: X1(GlobalConsensus(Westend)) }), fun: Fungible(150000000000) }, weight_limit: Limited(Weight { ref_time: 219970000, proof_size: 6571 }) } +2023-12-18 09:56:24.137 TRACE tokio-runtime-worker xcm::weight: [Parachain] UsingComponents::buy_weight weight: Weight { ref_time: 219970000, proof_size: 6571 }, payment: , context: XcmContext { origin: None, message_id: [69, 190, 44, 151, 178, 35, 82, 208, 221, 233, 67, 201, 206, 212, 56, 63, 223, 119, 195, 127, 31, 87, 59, 196, 23, 20, 40, 202, 162, 213, 159, 53], topic: None } +2023-12-18 09:56:24.137 TRACE tokio-runtime-worker xcm::weight: [Parachain] TakeFirstAssetTrader::buy_weight weight: Weight { ref_time: 219970000, proof_size: 6571 }, payment: , context: XcmContext { origin: None, message_id: [69, 190, 44, 151, 178, 35, 82, 208, 221, 233, 67, 201, 206, 212, 56, 63, 223, 119, 195, 127, 31, 87, 59, 196, 23, 20, 40, 202, 162, 213, 159, 53], topic: None } +2023-12-18 09:56:24.137 TRACE tokio-runtime-worker xcm::weight: [Parachain] TakeFirstAssetTrader::buy_weight weight: Weight { ref_time: 219970000, proof_size: 6571 }, payment: , context: XcmContext { origin: None, message_id: [69, 190, 44, 151, 178, 35, 82, 208, 221, 233, 67, 201, 206, 212, 56, 63, 223, 119, 195, 127, 31, 87, 59, 196, 23, 20, 40, 202, 162, 213, 159, 53], topic: None } +2023-12-18 09:56:24.137 TRACE tokio-runtime-worker xcm::buy_weight: [Parachain] last_error: Some(TooExpensive), too_expensive_error_found: true +2023-12-18 09:56:24.137 TRACE tokio-runtime-worker xcm::execute: [Parachain] !!! ERROR: TooExpensive +2023-12-18 09:56:24.137 TRACE tokio-runtime-worker xcm::execute_xcm_in_credit: [Parachain] result: Err(ExecutorError { index: 5, xcm_error: TooExpensive, weight: Weight { ref_time: 146900000, proof_size: 3593 } }) From e0382ea3d796bf79dd44a49c83945b88bf9df2a2 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Mon, 18 Dec 2023 13:42:37 +0300 Subject: [PATCH 20/86] fix paths for CI --- bridges/zombienet/run-tests.sh | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/bridges/zombienet/run-tests.sh b/bridges/zombienet/run-tests.sh index a522949adaab..928a35099f28 100755 --- a/bridges/zombienet/run-tests.sh +++ b/bridges/zombienet/run-tests.sh @@ -9,17 +9,21 @@ trap "trap - SIGTERM && kill -- -$$" SIGINT SIGTERM EXIT # (we need absolute paths here, because they're used when scripts are called by zombienet from tmp folders) export POLKADOT_SDK_FOLDER=`realpath $(dirname "$0")/../..` export BRIDGE_TESTS_FOLDER=$POLKADOT_SDK_FOLDER/bridges/zombienet/tests -#export POLKADOT_BINARY_PATH=/usr/local/bin/polkadot -#export POLKADOT_PARACHAIN_BINARY_PATH=/usr/local/bin/polkadot-parachain -#export POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_ROCOCO=/usr/local/bin/polkadot-parachain -#export POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_WESTEND=/usr/local/bin/polkadot-parachain -#export ZOMBIENET_BINARY_PATH=/usr/local/bin/zombie -export POLKADOT_BINARY_PATH=$POLKADOT_SDK_FOLDER/target/release/polkadot -export POLKADOT_PARACHAIN_BINARY_PATH=$POLKADOT_SDK_FOLDER/target/release/polkadot-parachain -export POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_ROCOCO=$POLKADOT_PARACHAIN_BINARY_PATH -export POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_WESTEND=$POLKADOT_PARACHAIN_BINARY_PATH + +# for CI: +export POLKADOT_BINARY_PATH=/usr/local/bin/polkadot +export POLKADOT_PARACHAIN_BINARY_PATH=/usr/local/bin/polkadot-parachain +export POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_ROCOCO=/usr/local/bin/polkadot-parachain +export POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_WESTEND=/usr/local/bin/polkadot-parachain export ZOMBIENET_BINARY_PATH=/usr/local/bin/zombie +# for local tests: +#export POLKADOT_BINARY_PATH=$POLKADOT_SDK_FOLDER/target/release/polkadot +#export POLKADOT_PARACHAIN_BINARY_PATH=$POLKADOT_SDK_FOLDER/target/release/polkadot-parachain +#export POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_ROCOCO=$POLKADOT_PARACHAIN_BINARY_PATH +#export POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_WESTEND=$POLKADOT_PARACHAIN_BINARY_PATH +#export ZOMBIENET_BINARY_PATH=/usr/local/bin/zombie + # check if `wait` supports -p flag if [ `printf "$BASH_VERSION\n5.1" | sort -V | head -n 1` = "5.1" ]; then IS_BASH_5_1=1; else IS_BASH_5_1=0; fi From 8e20872a4b16dcf09a3fbb169a72a828af43efeb Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Mon, 18 Dec 2023 14:53:36 +0300 Subject: [PATCH 21/86] updated costs + constants --- bridges/primitives/chain-bridge-hub-rococo/src/lib.rs | 6 +++--- bridges/primitives/chain-bridge-hub-westend/src/lib.rs | 6 +++--- cumulus/scripts/bridges_rococo_westend.sh | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/bridges/primitives/chain-bridge-hub-rococo/src/lib.rs b/bridges/primitives/chain-bridge-hub-rococo/src/lib.rs index 1fe44597c3d4..f79b8a8afb32 100644 --- a/bridges/primitives/chain-bridge-hub-rococo/src/lib.rs +++ b/bridges/primitives/chain-bridge-hub-rococo/src/lib.rs @@ -86,13 +86,13 @@ frame_support::parameter_types! { /// The XCM fee that is paid for executing XCM program (with `ExportMessage` instruction) at the Rococo /// BridgeHub. /// (initially was calculated by test `BridgeHubRococo::can_calculate_weight_for_paid_export_message_with_reserve_transfer` + `33%`) - pub const BridgeHubRococoBaseXcmFeeInRocs: u128 = 1628875538; + pub const BridgeHubRococoBaseXcmFeeInRocs: u128 = 1_640_102_205; /// Transaction fee that is paid at the Rococo BridgeHub for delivering single inbound message. /// (initially was calculated by test `BridgeHubRococo::can_calculate_fee_for_complex_message_delivery_transaction` + `33%`) - pub const BridgeHubRococoBaseDeliveryFeeInRocs: u128 = 6417262881; + pub const BridgeHubRococoBaseDeliveryFeeInRocs: u128 = 5_651_581_649; /// Transaction fee that is paid at the Rococo BridgeHub for delivering single outbound message confirmation. /// (initially was calculated by test `BridgeHubRococo::can_calculate_fee_for_complex_message_confirmation_transaction` + `33%`) - pub const BridgeHubRococoBaseConfirmationFeeInRocs: u128 = 6159996668; + pub const BridgeHubRococoBaseConfirmationFeeInRocs: u128 = 4_045_736_577; } diff --git a/bridges/primitives/chain-bridge-hub-westend/src/lib.rs b/bridges/primitives/chain-bridge-hub-westend/src/lib.rs index 0124e05bf887..f4524f719f9f 100644 --- a/bridges/primitives/chain-bridge-hub-westend/src/lib.rs +++ b/bridges/primitives/chain-bridge-hub-westend/src/lib.rs @@ -78,13 +78,13 @@ frame_support::parameter_types! { /// The XCM fee that is paid for executing XCM program (with `ExportMessage` instruction) at the Westend /// BridgeHub. /// (initially was calculated by test `BridgeHubWestend::can_calculate_weight_for_paid_export_message_with_reserve_transfer` + `33%`) - pub const BridgeHubWestendBaseXcmFeeInWnds: u128 = 488662666666; + pub const BridgeHubWestendBaseXcmFeeInWnds: u128 = 492_077_333_333; /// Transaction fee that is paid at the Westend BridgeHub for delivering single inbound message. /// (initially was calculated by test `BridgeHubWestend::can_calculate_fee_for_complex_message_delivery_transaction` + `33%`) - pub const BridgeHubWestendBaseDeliveryFeeInWnds: u128 = 1925196628010; + pub const BridgeHubWestendBaseDeliveryFeeInWnds: u128 = 1_695_489_961_344; /// Transaction fee that is paid at the Westend BridgeHub for delivering single outbound message confirmation. /// (initially was calculated by test `BridgeHubWestend::can_calculate_fee_for_complex_message_confirmation_transaction` + `33%`) - pub const BridgeHubWestendBaseConfirmationFeeInWnds: u128 = 1848016628010; + pub const BridgeHubWestendBaseConfirmationFeeInWnds: u128 = 1_618_309_961_344; } diff --git a/cumulus/scripts/bridges_rococo_westend.sh b/cumulus/scripts/bridges_rococo_westend.sh index bcba6878e6d0..eda3ee3a16e8 100755 --- a/cumulus/scripts/bridges_rococo_westend.sh +++ b/cumulus/scripts/bridges_rococo_westend.sh @@ -326,7 +326,7 @@ case "$1" in "//Alice" \ "$(jq --null-input '{ "V3": { "parents": 2, "interior": { "X2": [ { "GlobalConsensus": "Westend" }, { "Parachain": 1000 } ] } } }')" \ "$(jq --null-input '{ "V3": { "parents": 0, "interior": { "X1": { "AccountId32": { "id": [212, 53, 147, 199, 21, 253, 211, 28, 97, 20, 26, 189, 4, 169, 159, 214, 130, 44, 133, 88, 133, 76, 205, 227, 154, 86, 132, 231, 165, 109, 162, 125] } } } } }')" \ - "$(jq --null-input '{ "V3": [ { "id": { "Concrete": { "parents": 1, "interior": "Here" } }, "fun": { "Fungible": 200000000000 } } ] }')" \ + "$(jq --null-input '{ "V3": [ { "id": { "Concrete": { "parents": 1, "interior": "Here" } }, "fun": { "Fungible": 5000000000000 } } ] }')" \ 0 \ "Unlimited" ;; @@ -338,7 +338,7 @@ case "$1" in "//Alice" \ "$(jq --null-input '{ "V3": { "parents": 2, "interior": { "X2": [ { "GlobalConsensus": "Westend" }, { "Parachain": 1000 } ] } } }')" \ "$(jq --null-input '{ "V3": { "parents": 0, "interior": { "X1": { "AccountId32": { "id": [212, 53, 147, 199, 21, 253, 211, 28, 97, 20, 26, 189, 4, 169, 159, 214, 130, 44, 133, 88, 133, 76, 205, 227, 154, 86, 132, 231, 165, 109, 162, 125] } } } } }')" \ - "$(jq --null-input '{ "V3": [ { "id": { "Concrete": { "parents": 2, "interior": { "X1": { "GlobalConsensus": "Westend" } } } }, "fun": { "Fungible": 40000000000 } } ] }')" \ + "$(jq --null-input '{ "V3": [ { "id": { "Concrete": { "parents": 2, "interior": { "X1": { "GlobalConsensus": "Westend" } } } }, "fun": { "Fungible": 3000000000000 } } ] }')" \ 0 \ "Unlimited" ;; @@ -350,7 +350,7 @@ case "$1" in "//Alice" \ "$(jq --null-input '{ "V3": { "parents": 2, "interior": { "X2": [ { "GlobalConsensus": "Rococo" }, { "Parachain": 1000 } ] } } }')" \ "$(jq --null-input '{ "V3": { "parents": 0, "interior": { "X1": { "AccountId32": { "id": [212, 53, 147, 199, 21, 253, 211, 28, 97, 20, 26, 189, 4, 169, 159, 214, 130, 44, 133, 88, 133, 76, 205, 227, 154, 86, 132, 231, 165, 109, 162, 125] } } } } }')" \ - "$(jq --null-input '{ "V3": [ { "id": { "Concrete": { "parents": 1, "interior": "Here" } }, "fun": { "Fungible": 150000000000 } } ] }')" \ + "$(jq --null-input '{ "V3": [ { "id": { "Concrete": { "parents": 1, "interior": "Here" } }, "fun": { "Fungible": 5000000000000 } } ] }')" \ 0 \ "Unlimited" ;; @@ -362,7 +362,7 @@ case "$1" in "//Alice" \ "$(jq --null-input '{ "V3": { "parents": 2, "interior": { "X2": [ { "GlobalConsensus": "Rococo" }, { "Parachain": 1000 } ] } } }')" \ "$(jq --null-input '{ "V3": { "parents": 0, "interior": { "X1": { "AccountId32": { "id": [212, 53, 147, 199, 21, 253, 211, 28, 97, 20, 26, 189, 4, 169, 159, 214, 130, 44, 133, 88, 133, 76, 205, 227, 154, 86, 132, 231, 165, 109, 162, 125] } } } } }')" \ - "$(jq --null-input '{ "V3": [ { "id": { "Concrete": { "parents": 2, "interior": { "X1": { "GlobalConsensus": "Rococo" } } } }, "fun": { "Fungible": 100000000000 } } ] }')" \ + "$(jq --null-input '{ "V3": [ { "id": { "Concrete": { "parents": 2, "interior": { "X1": { "GlobalConsensus": "Rococo" } } } }, "fun": { "Fungible": 3000000000000 } } ] }')" \ 0 \ "Unlimited" ;; From b050f1a13dfdc507bf08483710481c0c2c97b5d0 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Mon, 18 Dec 2023 18:02:05 +0300 Subject: [PATCH 22/86] npm install for generate_hex_encoded_call --- bridges/zombienet/Dockerfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/bridges/zombienet/Dockerfile b/bridges/zombienet/Dockerfile index a919e2393541..78e3a8b96a48 100644 --- a/bridges/zombienet/Dockerfile +++ b/bridges/zombienet/Dockerfile @@ -15,7 +15,7 @@ WORKDIR /home/root # install tools and dependencies RUN set -eux; \ apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 15CF4D18AF4F7421; \ - apt-get -y update; \ + apt-get -y update; \ apt-get install -y --no-install-recommends \ libssl-dev make cmake graphviz \ git pkg-config curl time rhash ca-certificates jq \ @@ -45,6 +45,11 @@ COPY scripts /home/nonroot/polkadot-sdk/bridges/zombienet/scripts COPY tests /home/nonroot/polkadot-sdk/bridges/zombienet/tests COPY run-tests.sh /home/nonroot/polkadot-sdk/bridges/zombienet +RUN set -eux; \ + pushd /home/nonroot/polkadot-sdk/cumulus/scripts/generate_hex_encoded_call; \ + npm install; \ + popd + # https://polkadot.js.org/apps/?rpc=ws://127.0.0.1:{PORT}#/explorer EXPOSE 9942 9910 8943 9945 9010 8945 From 3230786bdf4a402fef94e633984d2f97ca1f39a6 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Mon, 18 Dec 2023 18:41:09 +0300 Subject: [PATCH 23/86] cc --- .../bridges_zombienet_tests_injected.Dockerfile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/docker/dockerfiles/bridges_zombienet_tests_injected.Dockerfile b/docker/dockerfiles/bridges_zombienet_tests_injected.Dockerfile index 273989e34562..5e2805fc40d0 100644 --- a/docker/dockerfiles/bridges_zombienet_tests_injected.Dockerfile +++ b/docker/dockerfiles/bridges_zombienet_tests_injected.Dockerfile @@ -40,9 +40,15 @@ COPY ./artifacts/polkadot-prepare-worker /usr/local/bin/ COPY ./artifacts/polkadot-parachain /usr/local/bin # copy substrate-relay to the docker image COPY --from=relay-builder /home/user/substrate-relay /usr/local/bin/ -# finally - we need bridges zombienet runner and tests +# we need bridges zombienet runner and tests RUN mkdir -p /home/nonroot/bridges-polkadot-sdk COPY ./artifacts/bridges-polkadot-sdk /home/nonroot/bridges-polkadot-sdk +# also prepare `generate_hex_encoded_call` for running +RUN set -eux; \ + pushd /home/nonroot/polkadot-sdk/cumulus/scripts/generate_hex_encoded_call; \ + npm install; \ + popd + # check if executable works in this container USER nonroot From d107297a63b8bd2b2a654b629fc4b027b44b273c Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Tue, 19 Dec 2023 09:10:13 +0300 Subject: [PATCH 24/86] pushd -> cd --- .../dockerfiles/bridges_zombienet_tests_injected.Dockerfile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/docker/dockerfiles/bridges_zombienet_tests_injected.Dockerfile b/docker/dockerfiles/bridges_zombienet_tests_injected.Dockerfile index 5e2805fc40d0..4a0102caff54 100644 --- a/docker/dockerfiles/bridges_zombienet_tests_injected.Dockerfile +++ b/docker/dockerfiles/bridges_zombienet_tests_injected.Dockerfile @@ -45,10 +45,8 @@ RUN mkdir -p /home/nonroot/bridges-polkadot-sdk COPY ./artifacts/bridges-polkadot-sdk /home/nonroot/bridges-polkadot-sdk # also prepare `generate_hex_encoded_call` for running RUN set -eux; \ - pushd /home/nonroot/polkadot-sdk/cumulus/scripts/generate_hex_encoded_call; \ - npm install; \ - popd - + cd /home/nonroot/polkadot-sdk/cumulus/scripts/generate_hex_encoded_call; \ + npm install # check if executable works in this container USER nonroot From 3022c82cc342ac2b3210c8755f66f93d21e26360 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Tue, 19 Dec 2023 09:40:50 +0300 Subject: [PATCH 25/86] fix path --- docker/dockerfiles/bridges_zombienet_tests_injected.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/dockerfiles/bridges_zombienet_tests_injected.Dockerfile b/docker/dockerfiles/bridges_zombienet_tests_injected.Dockerfile index 4a0102caff54..c2ded6074ebe 100644 --- a/docker/dockerfiles/bridges_zombienet_tests_injected.Dockerfile +++ b/docker/dockerfiles/bridges_zombienet_tests_injected.Dockerfile @@ -45,7 +45,7 @@ RUN mkdir -p /home/nonroot/bridges-polkadot-sdk COPY ./artifacts/bridges-polkadot-sdk /home/nonroot/bridges-polkadot-sdk # also prepare `generate_hex_encoded_call` for running RUN set -eux; \ - cd /home/nonroot/polkadot-sdk/cumulus/scripts/generate_hex_encoded_call; \ + cd /home/nonroot/bridges-polkadot-sdk/cumulus/scripts/generate_hex_encoded_call; \ npm install # check if executable works in this container From f19668c91ef037de9259dae5a0340eeab1c17f80 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Tue, 19 Dec 2023 11:24:43 +0300 Subject: [PATCH 26/86] try to chear zombienet --- bridges/zombienet/run-tests.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bridges/zombienet/run-tests.sh b/bridges/zombienet/run-tests.sh index 928a35099f28..f6907bd90a1f 100755 --- a/bridges/zombienet/run-tests.sh +++ b/bridges/zombienet/run-tests.sh @@ -22,7 +22,7 @@ export ZOMBIENET_BINARY_PATH=/usr/local/bin/zombie #export POLKADOT_PARACHAIN_BINARY_PATH=$POLKADOT_SDK_FOLDER/target/release/polkadot-parachain #export POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_ROCOCO=$POLKADOT_PARACHAIN_BINARY_PATH #export POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_WESTEND=$POLKADOT_PARACHAIN_BINARY_PATH -#export ZOMBIENET_BINARY_PATH=/usr/local/bin/zombie +#export ZOMBIENET_BINARY_PATH=~/local_bridge_testing/bin/zombienet-linux # check if `wait` supports -p flag if [ `printf "$BASH_VERSION\n5.1" | sort -V | head -n 1` = "5.1" ]; then IS_BASH_5_1=1; else IS_BASH_5_1=0; fi @@ -41,6 +41,10 @@ function start_coproc() { local name=$2 local coproc_log=`mktemp -p $TEST_FOLDER` coproc COPROC { + # otherwise zombienet uses some hardcoded paths + unset RUN_IN_CONTAINER + unset ZOMBIENET_IMAGE + $command >$coproc_log 2>&1 } TEST_COPROCS[$COPROC_PID, 0]=$name From 83d2177f7a5d19028eed16523c2861ce2bc8682a Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Tue, 19 Dec 2023 11:59:36 +0300 Subject: [PATCH 27/86] retry failure --- bridges/zombienet/run-tests.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bridges/zombienet/run-tests.sh b/bridges/zombienet/run-tests.sh index f6907bd90a1f..fedf991b4837 100755 --- a/bridges/zombienet/run-tests.sh +++ b/bridges/zombienet/run-tests.sh @@ -3,7 +3,7 @@ set -x shopt -s nullglob -trap "trap - SIGTERM && kill -- -$$" SIGINT SIGTERM EXIT +trap "trap - SIGINT SIGTERM EXIT && kill -- -$$" SIGINT SIGTERM EXIT # assuming that we'll be using native provide && all processes will be executing locally # (we need absolute paths here, because they're used when scripts are called by zombienet from tmp folders) @@ -42,8 +42,8 @@ function start_coproc() { local coproc_log=`mktemp -p $TEST_FOLDER` coproc COPROC { # otherwise zombienet uses some hardcoded paths - unset RUN_IN_CONTAINER - unset ZOMBIENET_IMAGE + #unset RUN_IN_CONTAINER + #unset ZOMBIENET_IMAGE $command >$coproc_log 2>&1 } From ab993187e3a3cb501b70b0bcb2fe4c750afcdf4b Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Tue, 19 Dec 2023 12:15:29 +0300 Subject: [PATCH 28/86] faster --- bridges/zombienet/run-tests.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bridges/zombienet/run-tests.sh b/bridges/zombienet/run-tests.sh index fedf991b4837..a39ac11c5d1f 100755 --- a/bridges/zombienet/run-tests.sh +++ b/bridges/zombienet/run-tests.sh @@ -42,8 +42,9 @@ function start_coproc() { local coproc_log=`mktemp -p $TEST_FOLDER` coproc COPROC { # otherwise zombienet uses some hardcoded paths - #unset RUN_IN_CONTAINER - #unset ZOMBIENET_IMAGE +exit 1 + unset RUN_IN_CONTAINER + unset ZOMBIENET_IMAGE $command >$coproc_log 2>&1 } From c562cd93acf550301a385844a87601518a80a77f Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Tue, 19 Dec 2023 12:48:28 +0300 Subject: [PATCH 29/86] add test runner logs to artifacts --- .gitlab/pipeline/zombienet/bridges.yml | 1 + bridges/zombienet/run-tests.sh | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab/pipeline/zombienet/bridges.yml b/.gitlab/pipeline/zombienet/bridges.yml index 0c33f2d8f910..85c648bf07c7 100644 --- a/.gitlab/pipeline/zombienet/bridges.yml +++ b/.gitlab/pipeline/zombienet/bridges.yml @@ -37,6 +37,7 @@ after_script: - mkdir -p ./zombienet-logs - cp /tmp/zombie*/logs/* ./zombienet-logs/ + - cp /tmp/bridges-zombienet-tests*/* ./zombienet-logs/ retry: 2 tags: - zombienet-polkadot-integration-test diff --git a/bridges/zombienet/run-tests.sh b/bridges/zombienet/run-tests.sh index a39ac11c5d1f..fd26399ddd32 100755 --- a/bridges/zombienet/run-tests.sh +++ b/bridges/zombienet/run-tests.sh @@ -34,7 +34,7 @@ if [ `printf "$BASH_VERSION\n5.1" | sort -V | head -n 1` = "5.1" ]; then IS_BASH export LANE_ID="00000002" # tests configuration -ALL_TESTS_FOLDER=`mktemp -d` +ALL_TESTS_FOLDER=`mktemp -d bridges-zombienet-tests.XXXXX` function start_coproc() { local command=$1 @@ -42,7 +42,6 @@ function start_coproc() { local coproc_log=`mktemp -p $TEST_FOLDER` coproc COPROC { # otherwise zombienet uses some hardcoded paths -exit 1 unset RUN_IN_CONTAINER unset ZOMBIENET_IMAGE From f2cb940482364e2421eda423c55b614f39008a51 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Tue, 19 Dec 2023 13:46:46 +0300 Subject: [PATCH 30/86] fix path --- bridges/zombienet/run-tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bridges/zombienet/run-tests.sh b/bridges/zombienet/run-tests.sh index fd26399ddd32..6349175705b2 100755 --- a/bridges/zombienet/run-tests.sh +++ b/bridges/zombienet/run-tests.sh @@ -34,7 +34,7 @@ if [ `printf "$BASH_VERSION\n5.1" | sort -V | head -n 1` = "5.1" ]; then IS_BASH export LANE_ID="00000002" # tests configuration -ALL_TESTS_FOLDER=`mktemp -d bridges-zombienet-tests.XXXXX` +ALL_TESTS_FOLDER=`mktemp -d /tmp/bridges-zombienet-tests.XXXXX` function start_coproc() { local command=$1 From 8a5ace0c063f1f12e2cddc1f98f6e390e8befb51 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Tue, 19 Dec 2023 14:28:57 +0300 Subject: [PATCH 31/86] fix path --- .gitlab/pipeline/zombienet/bridges.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab/pipeline/zombienet/bridges.yml b/.gitlab/pipeline/zombienet/bridges.yml index 85c648bf07c7..88d8e8918ee3 100644 --- a/.gitlab/pipeline/zombienet/bridges.yml +++ b/.gitlab/pipeline/zombienet/bridges.yml @@ -13,6 +13,7 @@ - export DEBUG=zombie,zombie::network-node - export ZOMBIENET_INTEGRATION_TEST_IMAGE="${BRIDGES_ZOMBIENET_TESTS_IMAGE}":${BRIDGES_ZOMBIENET_TESTS_IMAGE_TAG} - echo "${ZOMBIENET_INTEGRATION_TEST_IMAGE}" + - mkdir -p /home/nonroot/zombienet-logs stage: zombienet image: "${BRIDGES_ZOMBIENET_TESTS_IMAGE}:${BRIDGES_ZOMBIENET_TESTS_IMAGE_TAG}" needs: @@ -25,7 +26,7 @@ BRIDGES_ZOMBIENET_TESTS_IMAGE_TAG: ${DOCKER_IMAGES_VERSION} BRIDGES_ZOMBIENET_TESTS_IMAGE: "docker.io/paritypr/bridges-zombienet-tests" GH_DIR: "https://github.com/paritytech/polkadot-sdk/tree/${CI_COMMIT_SHA}/bridges/zombienet" - LOCAL_DIR: "/builds/parity/mirrors/polkadot-sdk/bridges/zombienet" + LOCAL_DIR: "/home/nonroot" FF_DISABLE_UMASK_FOR_DOCKER_EXECUTOR: 1 RUN_IN_CONTAINER: "1" artifacts: @@ -35,9 +36,8 @@ paths: - ./zombienet-logs after_script: - - mkdir -p ./zombienet-logs - - cp /tmp/zombie*/logs/* ./zombienet-logs/ - - cp /tmp/bridges-zombienet-tests*/* ./zombienet-logs/ + - cp /tmp/zombie*/logs/* /home/nonroot/zombienet-logs/ + - cp /tmp/bridges-zombienet-tests*/* /home/nonroot/zombienet-logs/ retry: 2 tags: - zombienet-polkadot-integration-test From 8a95a9ec2ae7dac7f3b3ca2711cd6d82e5c687df Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Tue, 19 Dec 2023 16:03:06 +0300 Subject: [PATCH 32/86] one more try --- .gitlab/pipeline/zombienet/bridges.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab/pipeline/zombienet/bridges.yml b/.gitlab/pipeline/zombienet/bridges.yml index 88d8e8918ee3..cdb2ff565e44 100644 --- a/.gitlab/pipeline/zombienet/bridges.yml +++ b/.gitlab/pipeline/zombienet/bridges.yml @@ -34,7 +34,7 @@ when: always expire_in: 2 days paths: - - ./zombienet-logs + - /home/nonroot/zombienet-logs after_script: - cp /tmp/zombie*/logs/* /home/nonroot/zombienet-logs/ - cp /tmp/bridges-zombienet-tests*/* /home/nonroot/zombienet-logs/ From 8c4a7b2e16b1a2a6a99dc1cc5d37279b47b99cf0 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Tue, 19 Dec 2023 17:08:41 +0300 Subject: [PATCH 33/86] try paths again --- .gitlab/pipeline/zombienet/bridges.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab/pipeline/zombienet/bridges.yml b/.gitlab/pipeline/zombienet/bridges.yml index cdb2ff565e44..361cf4b21588 100644 --- a/.gitlab/pipeline/zombienet/bridges.yml +++ b/.gitlab/pipeline/zombienet/bridges.yml @@ -13,7 +13,6 @@ - export DEBUG=zombie,zombie::network-node - export ZOMBIENET_INTEGRATION_TEST_IMAGE="${BRIDGES_ZOMBIENET_TESTS_IMAGE}":${BRIDGES_ZOMBIENET_TESTS_IMAGE_TAG} - echo "${ZOMBIENET_INTEGRATION_TEST_IMAGE}" - - mkdir -p /home/nonroot/zombienet-logs stage: zombienet image: "${BRIDGES_ZOMBIENET_TESTS_IMAGE}:${BRIDGES_ZOMBIENET_TESTS_IMAGE_TAG}" needs: @@ -26,7 +25,7 @@ BRIDGES_ZOMBIENET_TESTS_IMAGE_TAG: ${DOCKER_IMAGES_VERSION} BRIDGES_ZOMBIENET_TESTS_IMAGE: "docker.io/paritypr/bridges-zombienet-tests" GH_DIR: "https://github.com/paritytech/polkadot-sdk/tree/${CI_COMMIT_SHA}/bridges/zombienet" - LOCAL_DIR: "/home/nonroot" + LOCAL_DIR: "/builds/parity/mirrors/polkadot-sdk/bridges/zombienet" FF_DISABLE_UMASK_FOR_DOCKER_EXECUTOR: 1 RUN_IN_CONTAINER: "1" artifacts: @@ -36,8 +35,9 @@ paths: - /home/nonroot/zombienet-logs after_script: - - cp /tmp/zombie*/logs/* /home/nonroot/zombienet-logs/ - - cp /tmp/bridges-zombienet-tests*/* /home/nonroot/zombienet-logs/ + - mkdir -p ./zombienet-logs + - cp /tmp/zombie*/logs/* ./zombienet-logs/ + - cp -r /tmp/bridges-zombienet-tests*/* ./zombienet-logs/ retry: 2 tags: - zombienet-polkadot-integration-test From d79a43b8cb5e6960812172ecfdc48d3a444f6029 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Wed, 20 Dec 2023 10:38:27 +0300 Subject: [PATCH 34/86] ++ --- .gitlab/pipeline/zombienet/bridges.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab/pipeline/zombienet/bridges.yml b/.gitlab/pipeline/zombienet/bridges.yml index 361cf4b21588..ce8731d889b2 100644 --- a/.gitlab/pipeline/zombienet/bridges.yml +++ b/.gitlab/pipeline/zombienet/bridges.yml @@ -33,7 +33,7 @@ when: always expire_in: 2 days paths: - - /home/nonroot/zombienet-logs + - ./zombienet-logs after_script: - mkdir -p ./zombienet-logs - cp /tmp/zombie*/logs/* ./zombienet-logs/ From 1156753898623e785e4e3c38e80346be0328b268 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Wed, 20 Dec 2023 11:55:00 +0300 Subject: [PATCH 35/86] try dummy file??? --- .gitlab/pipeline/zombienet/bridges.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab/pipeline/zombienet/bridges.yml b/.gitlab/pipeline/zombienet/bridges.yml index ce8731d889b2..2b74f6545099 100644 --- a/.gitlab/pipeline/zombienet/bridges.yml +++ b/.gitlab/pipeline/zombienet/bridges.yml @@ -38,6 +38,7 @@ - mkdir -p ./zombienet-logs - cp /tmp/zombie*/logs/* ./zombienet-logs/ - cp -r /tmp/bridges-zombienet-tests*/* ./zombienet-logs/ + - echo X>./zombienet-logs/xxx retry: 2 tags: - zombienet-polkadot-integration-test From cb127c9a3452dd56917864ec76fa2501d1d65613 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Wed, 20 Dec 2023 12:38:53 +0300 Subject: [PATCH 36/86] continue debugging --- .gitlab/pipeline/zombienet/bridges.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab/pipeline/zombienet/bridges.yml b/.gitlab/pipeline/zombienet/bridges.yml index 2b74f6545099..26e68c46a8ef 100644 --- a/.gitlab/pipeline/zombienet/bridges.yml +++ b/.gitlab/pipeline/zombienet/bridges.yml @@ -38,6 +38,7 @@ - mkdir -p ./zombienet-logs - cp /tmp/zombie*/logs/* ./zombienet-logs/ - cp -r /tmp/bridges-zombienet-tests*/* ./zombienet-logs/ + - echo "Am I working???" - echo X>./zombienet-logs/xxx retry: 2 tags: From 46b13f76b7c93ec0030343511c0e4daaa172f4d9 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Wed, 20 Dec 2023 13:30:36 +0300 Subject: [PATCH 37/86] another try --- .gitlab/pipeline/zombienet/substrate.yml | 1 + bridges/zombienet/run-tests.sh | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitlab/pipeline/zombienet/substrate.yml b/.gitlab/pipeline/zombienet/substrate.yml index b687576267de..b1dd55462cde 100644 --- a/.gitlab/pipeline/zombienet/substrate.yml +++ b/.gitlab/pipeline/zombienet/substrate.yml @@ -33,6 +33,7 @@ expire_in: 2 days paths: - ./zombienet-logs + allow_failure: true after_script: - mkdir -p ./zombienet-logs - cp /tmp/zombie*/logs/* ./zombienet-logs/ diff --git a/bridges/zombienet/run-tests.sh b/bridges/zombienet/run-tests.sh index 6349175705b2..f0fdca71c6f2 100755 --- a/bridges/zombienet/run-tests.sh +++ b/bridges/zombienet/run-tests.sh @@ -3,7 +3,9 @@ set -x shopt -s nullglob -trap "trap - SIGINT SIGTERM EXIT && kill -- -$$" SIGINT SIGTERM EXIT +#trap "trap - SIGINT SIGTERM EXIT && kill -- -$$" SIGINT SIGTERM EXIT +trap "exit" INT TERM +trap "kill 0" EXIT # assuming that we'll be using native provide && all processes will be executing locally # (we need absolute paths here, because they're used when scripts are called by zombienet from tmp folders) From 1f0e26723ed2f8aba020f9dd43040274689803f1 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Wed, 20 Dec 2023 14:15:52 +0300 Subject: [PATCH 38/86] kill -9 --- bridges/zombienet/run-tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bridges/zombienet/run-tests.sh b/bridges/zombienet/run-tests.sh index f0fdca71c6f2..10745e5cae04 100755 --- a/bridges/zombienet/run-tests.sh +++ b/bridges/zombienet/run-tests.sh @@ -5,7 +5,7 @@ shopt -s nullglob #trap "trap - SIGINT SIGTERM EXIT && kill -- -$$" SIGINT SIGTERM EXIT trap "exit" INT TERM -trap "kill 0" EXIT +trap "kill -9 0" EXIT # assuming that we'll be using native provide && all processes will be executing locally # (we need absolute paths here, because they're used when scripts are called by zombienet from tmp folders) From 14ac8590012586f1931092d15b5e51f140e2b451 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Wed, 20 Dec 2023 15:15:04 +0300 Subject: [PATCH 39/86] temporary comment kill on exit --- bridges/zombienet/run-tests.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bridges/zombienet/run-tests.sh b/bridges/zombienet/run-tests.sh index 10745e5cae04..1b9af5d43902 100755 --- a/bridges/zombienet/run-tests.sh +++ b/bridges/zombienet/run-tests.sh @@ -4,8 +4,8 @@ set -x shopt -s nullglob #trap "trap - SIGINT SIGTERM EXIT && kill -- -$$" SIGINT SIGTERM EXIT -trap "exit" INT TERM -trap "kill -9 0" EXIT +#trap "exit" INT TERM +#trap "kill -9 0" EXIT # assuming that we'll be using native provide && all processes will be executing locally # (we need absolute paths here, because they're used when scripts are called by zombienet from tmp folders) From b0c8cf640bdda4e6800088192e2adea8e7cc3015 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Wed, 20 Dec 2023 17:00:34 +0300 Subject: [PATCH 40/86] ls --- .gitlab/pipeline/zombienet/bridges.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab/pipeline/zombienet/bridges.yml b/.gitlab/pipeline/zombienet/bridges.yml index 26e68c46a8ef..95f714140e92 100644 --- a/.gitlab/pipeline/zombienet/bridges.yml +++ b/.gitlab/pipeline/zombienet/bridges.yml @@ -10,6 +10,7 @@ - echo "${ZOMBIENET_IMAGE}" - echo "${GH_DIR}" - echo "${LOCAL_DIR}" + - ls "${LOCAL_DIR}" - export DEBUG=zombie,zombie::network-node - export ZOMBIENET_INTEGRATION_TEST_IMAGE="${BRIDGES_ZOMBIENET_TESTS_IMAGE}":${BRIDGES_ZOMBIENET_TESTS_IMAGE_TAG} - echo "${ZOMBIENET_INTEGRATION_TEST_IMAGE}" From a984032157f71558077c1e52fc963030759d786e Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Thu, 21 Dec 2023 11:54:00 +0300 Subject: [PATCH 41/86] try to cat zn logs from test runner --- bridges/zombienet/run-tests.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/bridges/zombienet/run-tests.sh b/bridges/zombienet/run-tests.sh index 1b9af5d43902..2e41b4bf5e12 100755 --- a/bridges/zombienet/run-tests.sh +++ b/bridges/zombienet/run-tests.sh @@ -109,6 +109,11 @@ do echo "=== Shutting down. Log of failed process below ===" echo "=====================================================================" echo $coproc_stdout + + for file in /tmp/zombie*/logs/* ; do + cat $file + done + exit 1 fi From accd8fcbba311bc4876a2c6887e04a8b01025b4f Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Fri, 22 Dec 2023 11:17:23 +0300 Subject: [PATCH 42/86] try to cat logs --- bridges/zombienet/run-tests.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bridges/zombienet/run-tests.sh b/bridges/zombienet/run-tests.sh index 2e41b4bf5e12..2859d3869271 100755 --- a/bridges/zombienet/run-tests.sh +++ b/bridges/zombienet/run-tests.sh @@ -114,6 +114,10 @@ do cat $file done + cat /var/log/lastlog || true + cat /var/log/faillog || true + cat /var/log/syslog || true + exit 1 fi From fd32ee7040844222a15c7873589e65c69c1bb678 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Fri, 22 Dec 2023 11:46:22 +0300 Subject: [PATCH 43/86] upd --- bridges/zombienet/run-tests.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bridges/zombienet/run-tests.sh b/bridges/zombienet/run-tests.sh index 2859d3869271..83c5ae232d03 100755 --- a/bridges/zombienet/run-tests.sh +++ b/bridges/zombienet/run-tests.sh @@ -114,8 +114,8 @@ do cat $file done - cat /var/log/lastlog || true - cat /var/log/faillog || true + #cat /var/log/lastlog || true + #cat /var/log/faillog || true cat /var/log/syslog || true exit 1 From 8e3b76d90c55253ac7967cd486735b164c89c074 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Fri, 22 Dec 2023 12:52:49 +0300 Subject: [PATCH 44/86] try more --- bridges/zombienet/run-tests.sh | 8 +++++++- .../bridges_zombienet_tests_injected.Dockerfile | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/bridges/zombienet/run-tests.sh b/bridges/zombienet/run-tests.sh index 83c5ae232d03..c6ec19d6b862 100755 --- a/bridges/zombienet/run-tests.sh +++ b/bridges/zombienet/run-tests.sh @@ -7,6 +7,10 @@ shopt -s nullglob #trap "exit" INT TERM #trap "kill -9 0" EXIT +sudo systemctl enable apport.service || true +sudo service apport start || true +cat /var/log/apport.log + # assuming that we'll be using native provide && all processes will be executing locally # (we need absolute paths here, because they're used when scripts are called by zombienet from tmp folders) export POLKADOT_SDK_FOLDER=`realpath $(dirname "$0")/../..` @@ -116,7 +120,9 @@ do #cat /var/log/lastlog || true #cat /var/log/faillog || true - cat /var/log/syslog || true + #cat /var/log/syslog || true + cat /var/log/apport.log || true + ls /var/crash || true exit 1 fi diff --git a/docker/dockerfiles/bridges_zombienet_tests_injected.Dockerfile b/docker/dockerfiles/bridges_zombienet_tests_injected.Dockerfile index c2ded6074ebe..10ad4a85a480 100644 --- a/docker/dockerfiles/bridges_zombienet_tests_injected.Dockerfile +++ b/docker/dockerfiles/bridges_zombienet_tests_injected.Dockerfile @@ -29,7 +29,7 @@ ENV RUST_BACKTRACE 1 USER root # for native provider to work (TODO: fix in zn docker?) -RUN apt-get update && apt-get install -y procps +RUN apt-get update && apt-get install -y procps sudo apport RUN yarn global add @polkadot/api-cli # add polkadot binary to the docker image From 67d0f16feb4a139e09d555863a9e9b4110ec5312 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Fri, 22 Dec 2023 13:49:20 +0300 Subject: [PATCH 45/86] more --- bridges/zombienet/run-tests.sh | 4 ++++ .../dockerfiles/bridges_zombienet_tests_injected.Dockerfile | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/bridges/zombienet/run-tests.sh b/bridges/zombienet/run-tests.sh index c6ec19d6b862..de34ceb3f4f3 100755 --- a/bridges/zombienet/run-tests.sh +++ b/bridges/zombienet/run-tests.sh @@ -123,6 +123,10 @@ do #cat /var/log/syslog || true cat /var/log/apport.log || true ls /var/crash || true + ls /var/log + ls /usr/local/bin/ + ls -la /home/nonroot + ls -la /home/nonroot/bridges-polkadot-sdk/bridges/zombienet exit 1 fi diff --git a/docker/dockerfiles/bridges_zombienet_tests_injected.Dockerfile b/docker/dockerfiles/bridges_zombienet_tests_injected.Dockerfile index 10ad4a85a480..ebad4046d268 100644 --- a/docker/dockerfiles/bridges_zombienet_tests_injected.Dockerfile +++ b/docker/dockerfiles/bridges_zombienet_tests_injected.Dockerfile @@ -29,7 +29,7 @@ ENV RUST_BACKTRACE 1 USER root # for native provider to work (TODO: fix in zn docker?) -RUN apt-get update && apt-get install -y procps sudo apport +RUN apt-get update && apt-get install -y procps sudo RUN yarn global add @polkadot/api-cli # add polkadot binary to the docker image From adad8410093f7bb66fc8b5e7718b69131de2e2cc Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Fri, 22 Dec 2023 14:46:23 +0300 Subject: [PATCH 46/86] ???!!! --- .gitlab/pipeline/zombienet/bridges.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab/pipeline/zombienet/bridges.yml b/.gitlab/pipeline/zombienet/bridges.yml index 95f714140e92..2767bf386dea 100644 --- a/.gitlab/pipeline/zombienet/bridges.yml +++ b/.gitlab/pipeline/zombienet/bridges.yml @@ -36,6 +36,7 @@ paths: - ./zombienet-logs after_script: + - echo "Am I working???!!!" - mkdir -p ./zombienet-logs - cp /tmp/zombie*/logs/* ./zombienet-logs/ - cp -r /tmp/bridges-zombienet-tests*/* ./zombienet-logs/ From 39ca333cb9f1e6fcb31b708ce07b95bbdd73800e Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Mon, 25 Dec 2023 11:50:10 +0300 Subject: [PATCH 47/86] tmp comment --- .gitlab/pipeline/zombienet/bridges.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.gitlab/pipeline/zombienet/bridges.yml b/.gitlab/pipeline/zombienet/bridges.yml index 2767bf386dea..408b55a79b16 100644 --- a/.gitlab/pipeline/zombienet/bridges.yml +++ b/.gitlab/pipeline/zombienet/bridges.yml @@ -29,19 +29,19 @@ LOCAL_DIR: "/builds/parity/mirrors/polkadot-sdk/bridges/zombienet" FF_DISABLE_UMASK_FOR_DOCKER_EXECUTOR: 1 RUN_IN_CONTAINER: "1" - artifacts: - name: "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}" - when: always - expire_in: 2 days - paths: - - ./zombienet-logs +# artifacts: +# name: "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}" +# when: always +# expire_in: 2 days +# paths: +# - ./zombienet-logs after_script: - echo "Am I working???!!!" - - mkdir -p ./zombienet-logs - - cp /tmp/zombie*/logs/* ./zombienet-logs/ - - cp -r /tmp/bridges-zombienet-tests*/* ./zombienet-logs/ - - echo "Am I working???" - - echo X>./zombienet-logs/xxx +# - mkdir -p ./zombienet-logs +# - cp /tmp/zombie*/logs/* ./zombienet-logs/ +# - cp -r /tmp/bridges-zombienet-tests*/* ./zombienet-logs/ +# - echo "Am I working???" +# - echo X>./zombienet-logs/xxx retry: 2 tags: - zombienet-polkadot-integration-test From 6a93477c75478e8ce19e838881adb963eb6699d6 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Mon, 25 Dec 2023 13:15:42 +0300 Subject: [PATCH 48/86] try++ --- .gitlab/pipeline/zombienet/bridges.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitlab/pipeline/zombienet/bridges.yml b/.gitlab/pipeline/zombienet/bridges.yml index 408b55a79b16..924fc5542211 100644 --- a/.gitlab/pipeline/zombienet/bridges.yml +++ b/.gitlab/pipeline/zombienet/bridges.yml @@ -42,12 +42,13 @@ # - cp -r /tmp/bridges-zombienet-tests*/* ./zombienet-logs/ # - echo "Am I working???" # - echo X>./zombienet-logs/xxx - retry: 2 - tags: - - zombienet-polkadot-integration-test +# retry: 2 +# tags: +# - zombienet-polkadot-integration-test run-zombienet-bridges-tests: extends: - .zombienet-bridges-common script: - /home/nonroot/bridges-polkadot-sdk/bridges/zombienet/run-tests.sh + - echo "Done" From 82f8e64cbd04b0448fce227369fdf01ea4ddbfa1 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Mon, 25 Dec 2023 14:16:25 +0300 Subject: [PATCH 49/86] logs? --- bridges/zombienet/run-tests.sh | 24 ++++++++++++++----- .../zombienet/scripts/polkadot-parachain-x.sh | 5 ++++ bridges/zombienet/scripts/polkadot-x.sh | 5 ++++ 3 files changed, 28 insertions(+), 6 deletions(-) create mode 100755 bridges/zombienet/scripts/polkadot-parachain-x.sh create mode 100755 bridges/zombienet/scripts/polkadot-x.sh diff --git a/bridges/zombienet/run-tests.sh b/bridges/zombienet/run-tests.sh index de34ceb3f4f3..46da855b6afa 100755 --- a/bridges/zombienet/run-tests.sh +++ b/bridges/zombienet/run-tests.sh @@ -23,6 +23,11 @@ export POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_ROCOCO=/usr/local/bin/polkad export POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_WESTEND=/usr/local/bin/polkadot-parachain export ZOMBIENET_BINARY_PATH=/usr/local/bin/zombie +export POLKADOT_BINARY_PATH=/home/nonroot/bridges-polkadot-sdk/bridges/zombienet/scripts/polkadot-x.sh +export POLKADOT_PARACHAIN_BINARY_PATH=/home/nonroot/bridges-polkadot-sdk/bridges/zombienet/scripts/polkadot-parachain-x.sh +export POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_ROCOCO=/home/nonroot/bridges-polkadot-sdk/bridges/zombienet/scripts/polkadot-parachain-x.sh +export POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_WESTEND=/home/nonroot/bridges-polkadot-sdk/bridges/zombienet/scripts/polkadot-parachain-x.sh + # for local tests: #export POLKADOT_BINARY_PATH=$POLKADOT_SDK_FOLDER/target/release/polkadot #export POLKADOT_PARACHAIN_BINARY_PATH=$POLKADOT_SDK_FOLDER/target/release/polkadot-parachain @@ -118,15 +123,22 @@ do cat $file done + for file in /tmp/polkadot.* ; do + cat $file + done + for file in /tmp/polkadot-parachain.* ; do + cat $file + done + #cat /var/log/lastlog || true #cat /var/log/faillog || true #cat /var/log/syslog || true - cat /var/log/apport.log || true - ls /var/crash || true - ls /var/log - ls /usr/local/bin/ - ls -la /home/nonroot - ls -la /home/nonroot/bridges-polkadot-sdk/bridges/zombienet + #cat /var/log/apport.log || true + #ls /var/crash || true + #ls /var/log + #ls /usr/local/bin/ + #ls -la /home/nonroot + #ls -la /home/nonroot/bridges-polkadot-sdk/bridges/zombienet exit 1 fi diff --git a/bridges/zombienet/scripts/polkadot-parachain-x.sh b/bridges/zombienet/scripts/polkadot-parachain-x.sh new file mode 100755 index 000000000000..76a51ff1ae13 --- /dev/null +++ b/bridges/zombienet/scripts/polkadot-parachain-x.sh @@ -0,0 +1,5 @@ +#!/bin/bash +LOG_FILE=`mktemp -d /tmp/polkadot-parachain.XXXXX` +echo "Starting polkadot-parachain with arguments: $@" +/usr/local/bin/polkadot-parachain "$@" 2>&1 | tee $LOG_FILE +echo "Stopping polkadot-parachain with arguments: $@" diff --git a/bridges/zombienet/scripts/polkadot-x.sh b/bridges/zombienet/scripts/polkadot-x.sh new file mode 100755 index 000000000000..7bbb4dcbb3fd --- /dev/null +++ b/bridges/zombienet/scripts/polkadot-x.sh @@ -0,0 +1,5 @@ +#!/bin/bash +LOG_FILE=`mktemp -d /tmp/polkadot.XXXXX` +echo "Starting polkadot with arguments: $@" +/usr/local/bin/polkadot "$@" 2>&1 | tee $LOG_FILE +echo "Stopping polkadot with arguments: $@" From 3a71ba67a1d962c2caed3b6133ca625d39b7b144 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Mon, 25 Dec 2023 14:50:16 +0300 Subject: [PATCH 50/86] fix scripts --- bridges/zombienet/run-tests.sh | 4 ++-- bridges/zombienet/scripts/polkadot-parachain-x.sh | 4 ++-- bridges/zombienet/scripts/polkadot-x.sh | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bridges/zombienet/run-tests.sh b/bridges/zombienet/run-tests.sh index 46da855b6afa..3f9951c1d779 100755 --- a/bridges/zombienet/run-tests.sh +++ b/bridges/zombienet/run-tests.sh @@ -123,10 +123,10 @@ do cat $file done - for file in /tmp/polkadot.* ; do + for file in /tmp/polkadot.*/* ; do cat $file done - for file in /tmp/polkadot-parachain.* ; do + for file in /tmp/polkadot-parachain.*/* ; do cat $file done diff --git a/bridges/zombienet/scripts/polkadot-parachain-x.sh b/bridges/zombienet/scripts/polkadot-parachain-x.sh index 76a51ff1ae13..989f144854ed 100755 --- a/bridges/zombienet/scripts/polkadot-parachain-x.sh +++ b/bridges/zombienet/scripts/polkadot-parachain-x.sh @@ -1,5 +1,5 @@ #!/bin/bash LOG_FILE=`mktemp -d /tmp/polkadot-parachain.XXXXX` -echo "Starting polkadot-parachain with arguments: $@" -/usr/local/bin/polkadot-parachain "$@" 2>&1 | tee $LOG_FILE +echo "Starting polkadot-parachain with arguments: $@. Log: $LOG_FILE" +/usr/local/bin/polkadot-parachain "$@" 2>&1 | tee $LOG_FILE/log echo "Stopping polkadot-parachain with arguments: $@" diff --git a/bridges/zombienet/scripts/polkadot-x.sh b/bridges/zombienet/scripts/polkadot-x.sh index 7bbb4dcbb3fd..6c211a51a712 100755 --- a/bridges/zombienet/scripts/polkadot-x.sh +++ b/bridges/zombienet/scripts/polkadot-x.sh @@ -1,5 +1,5 @@ #!/bin/bash LOG_FILE=`mktemp -d /tmp/polkadot.XXXXX` -echo "Starting polkadot with arguments: $@" -/usr/local/bin/polkadot "$@" 2>&1 | tee $LOG_FILE +echo "Starting polkadot with arguments: $@. Log: $LOG_FILE" +/usr/local/bin/polkadot "$@" 2>&1 | tee $LOG_FILE/log echo "Stopping polkadot with arguments: $@" From c3ebf00bc5c0dca69f65bcf562e9c3d13ca8d792 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Mon, 25 Dec 2023 15:19:24 +0300 Subject: [PATCH 51/86] xxx --- bridges/zombienet/scripts/polkadot-parachain-x.sh | 6 +++--- bridges/zombienet/scripts/polkadot-x.sh | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bridges/zombienet/scripts/polkadot-parachain-x.sh b/bridges/zombienet/scripts/polkadot-parachain-x.sh index 989f144854ed..0d866f7c8ed6 100755 --- a/bridges/zombienet/scripts/polkadot-parachain-x.sh +++ b/bridges/zombienet/scripts/polkadot-parachain-x.sh @@ -1,5 +1,5 @@ #!/bin/bash LOG_FILE=`mktemp -d /tmp/polkadot-parachain.XXXXX` -echo "Starting polkadot-parachain with arguments: $@. Log: $LOG_FILE" -/usr/local/bin/polkadot-parachain "$@" 2>&1 | tee $LOG_FILE/log -echo "Stopping polkadot-parachain with arguments: $@" +echo "Starting polkadot-parachain with arguments: $@. Log: $LOG_FILE" >$LOG_FILE/log +/usr/local/bin/polkadot-parachain "$@" 2>&1 | tee -a $LOG_FILE/log +echo "Stopping polkadot-parachain with arguments: $@" >>$LOG_FILE/log diff --git a/bridges/zombienet/scripts/polkadot-x.sh b/bridges/zombienet/scripts/polkadot-x.sh index 6c211a51a712..ac97c6341e64 100755 --- a/bridges/zombienet/scripts/polkadot-x.sh +++ b/bridges/zombienet/scripts/polkadot-x.sh @@ -1,5 +1,5 @@ #!/bin/bash LOG_FILE=`mktemp -d /tmp/polkadot.XXXXX` -echo "Starting polkadot with arguments: $@. Log: $LOG_FILE" -/usr/local/bin/polkadot "$@" 2>&1 | tee $LOG_FILE/log -echo "Stopping polkadot with arguments: $@" +echo "Starting polkadot with arguments: $@. Log: $LOG_FILE" >$LOG_FILE/log +/usr/local/bin/polkadot "$@" 2>&1 | tee -a $LOG_FILE/log +echo "Stopping polkadot with arguments: $@" >>$LOG_FILE/log From e02121c2d3d6bc3fc8cbc29f7f2dadada698fae8 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Mon, 25 Dec 2023 15:57:31 +0300 Subject: [PATCH 52/86] too long lines --- .../zombienet/scripts/polkadot-parachain-x.sh | 23 ++++++++++++++++--- bridges/zombienet/scripts/polkadot-x.sh | 23 ++++++++++++++++--- 2 files changed, 40 insertions(+), 6 deletions(-) diff --git a/bridges/zombienet/scripts/polkadot-parachain-x.sh b/bridges/zombienet/scripts/polkadot-parachain-x.sh index 0d866f7c8ed6..3435da2c81da 100755 --- a/bridges/zombienet/scripts/polkadot-parachain-x.sh +++ b/bridges/zombienet/scripts/polkadot-parachain-x.sh @@ -1,5 +1,22 @@ #!/bin/bash + +ARGS="$@" LOG_FILE=`mktemp -d /tmp/polkadot-parachain.XXXXX` -echo "Starting polkadot-parachain with arguments: $@. Log: $LOG_FILE" >$LOG_FILE/log -/usr/local/bin/polkadot-parachain "$@" 2>&1 | tee -a $LOG_FILE/log -echo "Stopping polkadot-parachain with arguments: $@" >>$LOG_FILE/log +BUILD_SPEC=0 +while test $# -gt 0 +do + case "$1" in + build-spec) + BUILD_SPEC=1 + ;; + esac + shift +done + +if [ $BUILD_SPEC -eq 1 ]; then + /usr/local/bin/polkadot-parachain $ARGS +else + echo "Starting polkadot-parachain with arguments: $ARGS. Log: $LOG_FILE" >$LOG_FILE/log + /usr/local/bin/polkadot-parachain $ARGS 2>&1 | tee -a $LOG_FILE/log + echo "Stopping polkadot-parachain with arguments: $ARGS" >>$LOG_FILE/log +fi diff --git a/bridges/zombienet/scripts/polkadot-x.sh b/bridges/zombienet/scripts/polkadot-x.sh index ac97c6341e64..ecefd3043d87 100755 --- a/bridges/zombienet/scripts/polkadot-x.sh +++ b/bridges/zombienet/scripts/polkadot-x.sh @@ -1,5 +1,22 @@ #!/bin/bash + +ARGS="$@" LOG_FILE=`mktemp -d /tmp/polkadot.XXXXX` -echo "Starting polkadot with arguments: $@. Log: $LOG_FILE" >$LOG_FILE/log -/usr/local/bin/polkadot "$@" 2>&1 | tee -a $LOG_FILE/log -echo "Stopping polkadot with arguments: $@" >>$LOG_FILE/log +BUILD_SPEC=0 +while test $# -gt 0 +do + case "$1" in + build-spec) + BUILD_SPEC=1 + ;; + esac + shift +done + +if [ $BUILD_SPEC -eq 1 ]; then + /usr/local/bin/polkadot $ARGS +else + echo "Starting polkadot with arguments: $ARGS. Log: $LOG_FILE" >$LOG_FILE/log + /usr/local/bin/polkadot $ARGS 2>&1 | tee -a $LOG_FILE/log + echo "Stopping polkadot with arguments: $ARGS" >>$LOG_FILE/log +fi From 960558fda6b6b51365d3403eb6ada465d3628d89 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Mon, 25 Dec 2023 16:53:23 +0300 Subject: [PATCH 53/86] why it works now? --- bridges/zombienet/scripts/polkadot-parachain-x.sh | 1 + bridges/zombienet/scripts/polkadot-x.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/bridges/zombienet/scripts/polkadot-parachain-x.sh b/bridges/zombienet/scripts/polkadot-parachain-x.sh index 3435da2c81da..29097ae3780b 100755 --- a/bridges/zombienet/scripts/polkadot-parachain-x.sh +++ b/bridges/zombienet/scripts/polkadot-parachain-x.sh @@ -20,3 +20,4 @@ else /usr/local/bin/polkadot-parachain $ARGS 2>&1 | tee -a $LOG_FILE/log echo "Stopping polkadot-parachain with arguments: $ARGS" >>$LOG_FILE/log fi + diff --git a/bridges/zombienet/scripts/polkadot-x.sh b/bridges/zombienet/scripts/polkadot-x.sh index ecefd3043d87..cb184049e66f 100755 --- a/bridges/zombienet/scripts/polkadot-x.sh +++ b/bridges/zombienet/scripts/polkadot-x.sh @@ -20,3 +20,4 @@ else /usr/local/bin/polkadot $ARGS 2>&1 | tee -a $LOG_FILE/log echo "Stopping polkadot with arguments: $ARGS" >>$LOG_FILE/log fi + From 92d3b7fc22073e7d5359c125712289d8f265fdc4 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Tue, 26 Dec 2023 09:42:40 +0300 Subject: [PATCH 54/86] Revert "why it works now?" This reverts commit 960558fda6b6b51365d3403eb6ada465d3628d89. --- bridges/zombienet/scripts/polkadot-parachain-x.sh | 1 - bridges/zombienet/scripts/polkadot-x.sh | 1 - 2 files changed, 2 deletions(-) diff --git a/bridges/zombienet/scripts/polkadot-parachain-x.sh b/bridges/zombienet/scripts/polkadot-parachain-x.sh index 29097ae3780b..3435da2c81da 100755 --- a/bridges/zombienet/scripts/polkadot-parachain-x.sh +++ b/bridges/zombienet/scripts/polkadot-parachain-x.sh @@ -20,4 +20,3 @@ else /usr/local/bin/polkadot-parachain $ARGS 2>&1 | tee -a $LOG_FILE/log echo "Stopping polkadot-parachain with arguments: $ARGS" >>$LOG_FILE/log fi - diff --git a/bridges/zombienet/scripts/polkadot-x.sh b/bridges/zombienet/scripts/polkadot-x.sh index cb184049e66f..ecefd3043d87 100755 --- a/bridges/zombienet/scripts/polkadot-x.sh +++ b/bridges/zombienet/scripts/polkadot-x.sh @@ -20,4 +20,3 @@ else /usr/local/bin/polkadot $ARGS 2>&1 | tee -a $LOG_FILE/log echo "Stopping polkadot with arguments: $ARGS" >>$LOG_FILE/log fi - From 49d3090cb78a5ba2cc6badc40b9d62884c2ca66b Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Tue, 26 Dec 2023 10:41:07 +0300 Subject: [PATCH 55/86] trigger CI again --- bridges/zombienet/scripts/polkadot-parachain-x.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bridges/zombienet/scripts/polkadot-parachain-x.sh b/bridges/zombienet/scripts/polkadot-parachain-x.sh index 3435da2c81da..729c215cd35b 100755 --- a/bridges/zombienet/scripts/polkadot-parachain-x.sh +++ b/bridges/zombienet/scripts/polkadot-parachain-x.sh @@ -20,3 +20,6 @@ else /usr/local/bin/polkadot-parachain $ARGS 2>&1 | tee -a $LOG_FILE/log echo "Stopping polkadot-parachain with arguments: $ARGS" >>$LOG_FILE/log fi + + + From 88d4c00107a83a9b62a087678ce0c1b3bf92f774 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Tue, 26 Dec 2023 12:48:27 +0300 Subject: [PATCH 56/86] remove test files --- emulate-ci.sh | 38 ---------------------------------- issue | 56 --------------------------------------------------- 2 files changed, 94 deletions(-) delete mode 100755 emulate-ci.sh delete mode 100644 issue diff --git a/emulate-ci.sh b/emulate-ci.sh deleted file mode 100755 index d9348dc03055..000000000000 --- a/emulate-ci.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash -set -x - -mkdir -p ./artifacts -mkdir -p ./artifacts/bridges/ -cp target/release/polkadot ./artifacts/. -cp target/release/polkadot-prepare-worker ./artifacts/. -cp target/release/polkadot-execute-worker ./artifacts/. -cp target/release/polkadot-parachain ./artifacts/. -cp -r bridges/zombienet ./artifacts/bridges/. -cp -r cumulus/scripts ./artifacts/bridges/cumulus-scripts -cp -r cumulus/zombienet/bridge-hubs ./artifacts/bridges/cumulus-brige-hubs - -#docker build -f docker/dockerfiles/polkadot/polkadot_builder.Dockerfile . -t polkadot-builder \ -# --build-arg VCS_REF=x \ -# --build-arg BUILD_DATE=y \ -# --build-arg IMAGE_NAME=z \ -# --build-arg ZOMBIENET_IMAGE=docker.io/paritytech/zombienet:v1.3.79 - -docker build -f docker/dockerfiles/bridges-zombienet-debug_injected.Dockerfile . -t bzn \ - --build-arg VCS_REF=x \ - --build-arg BUILD_DATE=y \ - --build-arg IMAGE_NAME=z \ - --build-arg ZOMBIENET_IMAGE=docker.io/paritytech/zombienet:v1.3.79 - -# docker run -it --entrypoint /bin/bash paritytech/substrate-relay:v2023-11-07-rococo-westend-initial-relayer: -# -# user@0fd8c0122d04:~$ ls -la /usr/lib/x86_64-linux-gnu/libstdc++.so.6 -# lrwxrwxrwx 1 root root 19 Jul 9 06:45 /usr/lib/x86_64-linux-gnu/libstdc++.so.6 -> libstdc++.so.6.0.28 - -# docker run -it --entrypoint /bin/bash docker.io/paritytech/zombienet:v1.3.79 -# -# nonroot@39db69fc2525:~/zombie-net$ ls -la /usr/lib/x86_64-linux-gnu/libstdc++.so.6 -# lrwxrwxrwx 1 root root 19 Jan 10 2021 /usr/lib/x86_64-linux-gnu/libstdc++.so.6 -> libstdc++.so.6.0.28 - -# docker run -it --entrypoint /bin/bash -p 9942:9942 -p 9910:9910 -p 8943:8943 -p 9945:9945 -p 9010:9010 -p 8945:8945 bzn - -# docker run -it --entrypoint /bin/bash -p 9942:9942 -p 9910:9910 -p 8943:8943 -p 9945:9945 -p 9010:9010 -p 8945:8945 docker.io/paritypr/bridges-zombienet-tests:2439-fcc42168 \ No newline at end of file diff --git a/issue b/issue deleted file mode 100644 index 1a9114eae53c..000000000000 --- a/issue +++ /dev/null @@ -1,56 +0,0 @@ -Spawned relay coprocess. StdOut + StdErr: /tmp/tmp.qEiIRbsIXw/tmp.wnkWVp4XHl/tmp.8mqWXrJcVf -/home/nonroot/bridges-polkadot-sdk/bridges/zombienet/run-tests.sh: line 23: warning: execute_coproc: coproc [14:COPROC] still exists -Spawned /home/nonroot/bridges-polkadot-sdk/bridges/zombienet/tests/0001-asset-transfer-works-rococo-to-westend.zndsl coprocess. StdOut + StdErr: /tmp/tmp.qEiIRbsIXw/tmp.wnkWVp4XHl/tmp.80ppV9hiNr -/home/nonroot/bridges-polkadot-sdk/bridges/zombienet/run-tests.sh: line 23: warning: execute_coproc: coproc [17:COPROC] still exists -Spawned /home/nonroot/bridges-polkadot-sdk/bridges/zombienet/tests/0001-asset-transfer-works-westend-to-rococo.zndsl coprocess. StdOut + StdErr: /tmp/tmp.qEiIRbsIXw/tmp.wnkWVp4XHl/tmp.AgcWMgcGDg -Process /home/nonroot/bridges-polkadot-sdk/bridges/zombienet/tests/0001-asset-transfer-works-rococo-to-westend.zndsl has finished with exit code: 1 -===================================================================== - -Rococo -> Westend: -Unable to map [u8; 32] to a lookup index -2023-12-18 09:54:48 API/INIT: westmint/1003000: Not decorating unknown runtime apis: 0xfbc577b9d747efd6/1 - - Error running script: ../helpers/wrapped-assets-balance.js Error: Timeout(600), "custom-js ../helpers/wrapped-assets-balance.js within 600 secs" didn't complete on time. - - -Westend -> Rococo: -Unable to map [u8; 32] to a lookup index -2023-12-18 09:52:48 API/INIT: statemine/1003000: Not decorating unknown runtime apis: 0xfbc577b9d747efd6/1 - - Error running script: ../helpers/wrapped-assets-balance.js Error: Timeout(600), "custom-js ../helpers/wrapped-assets-balance.js within 600 secs" didn't complete on time. - -[BridgeHubRococo_to_BridgeHubWestend_MessageLane_00000002] 2023-12-18 10:04:39 +00 INFO bridge Synced Some(1) of Some(1) nonces in BridgeHubWestend::ReceivingConfirmationsDelivery -> BridgeHubRococo::ReceivingConfirmationsDelivery race -[BridgeHubRococo_to_BridgeHubWestend_MessageLane_00000002] 2023-12-18 10:04:39 +00 INFO bridge Synced Some(1) of Some(1) nonces in BridgeHubRococo::MessagesDelivery -> BridgeHubWestend::MessagesDelivery race -[BridgeHubWestend_to_BridgeHubRococo_MessageLane_00000002] 2023-12-18 10:04:39 +00 INFO bridge Synced Some(1) of Some(1) nonces in BridgeHubRococo::ReceivingConfirmationsDelivery -> BridgeHubWestend::ReceivingConfirmationsDelivery race -[BridgeHubWestend_to_BridgeHubRococo_MessageLane_00000002] 2023-12-18 10:04:39 +00 INFO bridge Synced Some(1) of Some(1) nonces in BridgeHubWestend::MessagesDelivery -> BridgeHubRococo::MessagesDelivery race - -===================================================================== - -Rococo BH: -2023-12-18 09:56:00.071 DEBUG tokio-runtime-worker runtime::bridge-messages: [Parachain] Received messages: total=1, valid=1. Weight used: Weight(ref_time: 1131543667, proof_size: 8207)/Weight(ref_time: 1131543667, proof_size: 57359). -2023-12-18 09:56:00.071 TRACE tokio-runtime-worker runtime::bridge-relayers: [Parachain] Relayer can now claim reward for serving payer RewardsAccountParams { lane_id: [0, 0, 0, 2], bridged_chain_id: [98, 104, 119, 100], owner: ThisChain }: 148445654 - -Rococo AH: - -023-12-18 09:56:24.137 TRACE tokio-runtime-worker xcm::weight: [Parachain] WeightInfoBounds message: Xcm([DescendOrigin(X1(PalletInstance(51))), UniversalOrigin(GlobalConsensus(Westend)), DescendOrigin(X1(Parachain(1000))), ReserveAssetDeposited(MultiAssets([MultiAsset { id: Concrete(MultiLocation { parents: 2, interior: X1(GlobalConsensus(Westend)) }), fun: Fungible(150000000000) }])), ClearOrigin, BuyExecution { fees: MultiAsset { id: Concrete(MultiLocation { parents: 2, interior: X1(GlobalConsensus(Westend)) }), fun: Fungible(150000000000) }, weight_limit: Unlimited }, DepositAsset { assets: Wild(AllCounted(1)), beneficiary: MultiLocation { parents: 0, interior: X1(AccountId32 { network: None, id: [212, 53, 147, 199, 21, 253, 211, 28, 97, 20, 26, 189, 4, 169, 159, 214, 130, 44, 133, 88, 133, 76, 205, 227, 154, 86, 132, 231, 165, 109, 162, 125] }) } }, SetTopic([69, 190, 44, 151, 178, 35, 82, 208, 221, 233, 67, 201, 206, 212, 56, 63, 223, 119, 195, 127, 31, 87, 59, 196, 23, 20, 40, 202, 162, 213, 159, 53])]) -2023-12-18 09:56:24.137 TRACE tokio-runtime-worker xcm::execute_xcm_in_credit: [Parachain] origin: MultiLocation { parents: 1, interior: X1(Parachain(1013)) }, message: Xcm([DescendOrigin(X1(PalletInstance(51))), UniversalOrigin(GlobalConsensus(Westend)), DescendOrigin(X1(Parachain(1000))), ReserveAssetDeposited(MultiAssets([MultiAsset { id: Concrete(MultiLocation { parents: 2, interior: X1(GlobalConsensus(Westend)) }), fun: Fungible(150000000000) }])), ClearOrigin, BuyExecution { fees: MultiAsset { id: Concrete(MultiLocation { parents: 2, interior: X1(GlobalConsensus(Westend)) }), fun: Fungible(150000000000) }, weight_limit: Unlimited }, DepositAsset { assets: Wild(AllCounted(1)), beneficiary: MultiLocation { parents: 0, interior: X1(AccountId32 { network: None, id: [212, 53, 147, 199, 21, 253, 211, 28, 97, 20, 26, 189, 4, 169, 159, 214, 130, 44, 133, 88, 133, 76, 205, 227, 154, 86, 132, 231, 165, 109, 162, 125] }) } }, SetTopic([69, 190, 44, 151, 178, 35, 82, 208, 221, 233, 67, 201, 206, 212, 56, 63, 223, 119, 195, 127, 31, 87, 59, 196, 23, 20, 40, 202, 162, 213, 159, 53])]), weight_credit: Weight { ref_time: 0, proof_size: 0 } -2023-12-18 09:56:24.137 TRACE tokio-runtime-worker xcm::barriers: [Parachain] TrailingSetTopicAsId origin: MultiLocation { parents: 1, interior: X1(Parachain(1013)) }, instructions: [DescendOrigin(X1(PalletInstance(51))), UniversalOrigin(GlobalConsensus(Westend)), DescendOrigin(X1(Parachain(1000))), ReserveAssetDeposited(MultiAssets([MultiAsset { id: Concrete(MultiLocation { parents: 2, interior: X1(GlobalConsensus(Westend)) }), fun: Fungible(150000000000) }])), ClearOrigin, BuyExecution { fees: MultiAsset { id: Concrete(MultiLocation { parents: 2, interior: X1(GlobalConsensus(Westend)) }), fun: Fungible(150000000000) }, weight_limit: Unlimited }, DepositAsset { assets: Wild(AllCounted(1)), beneficiary: MultiLocation { parents: 0, interior: X1(AccountId32 { network: None, id: [212, 53, 147, 199, 21, 253, 211, 28, 97, 20, 26, 189, 4, 169, 159, 214, 130, 44, 133, 88, 133, 76, 205, 227, 154, 86, 132, 231, 165, 109, 162, 125] }) } }, SetTopic([69, 190, 44, 151, 178, 35, 82, 208, 221, 233, 67, 201, 206, 212, 56, 63, 223, 119, 195, 127, 31, 87, 59, 196, 23, 20, 40, 202, 162, 213, 159, 53])], max_weight: Weight { ref_time: 219970000, proof_size: 6571 }, properties: Properties { weight_credit: Weight { ref_time: 0, proof_size: 0 }, message_id: None } -2023-12-18 09:56:24.137 TRACE tokio-runtime-worker xcm::barriers: [Parachain] TakeWeightCredit origin: MultiLocation { parents: 1, interior: X1(Parachain(1013)) }, instructions: [DescendOrigin(X1(PalletInstance(51))), UniversalOrigin(GlobalConsensus(Westend)), DescendOrigin(X1(Parachain(1000))), ReserveAssetDeposited(MultiAssets([MultiAsset { id: Concrete(MultiLocation { parents: 2, interior: X1(GlobalConsensus(Westend)) }), fun: Fungible(150000000000) }])), ClearOrigin, BuyExecution { fees: MultiAsset { id: Concrete(MultiLocation { parents: 2, interior: X1(GlobalConsensus(Westend)) }), fun: Fungible(150000000000) }, weight_limit: Unlimited }, DepositAsset { assets: Wild(AllCounted(1)), beneficiary: MultiLocation { parents: 0, interior: X1(AccountId32 { network: None, id: [212, 53, 147, 199, 21, 253, 211, 28, 97, 20, 26, 189, 4, 169, 159, 214, 130, 44, 133, 88, 133, 76, 205, 227, 154, 86, 132, 231, 165, 109, 162, 125] }) } }], max_weight: Weight { ref_time: 219970000, proof_size: 6571 }, properties: Properties { weight_credit: Weight { ref_time: 0, proof_size: 0 }, message_id: Some([69, 190, 44, 151, 178, 35, 82, 208, 221, 233, 67, 201, 206, 212, 56, 63, 223, 119, 195, 127, 31, 87, 59, 196, 23, 20, 40, 202, 162, 213, 159, 53]) } -2023-12-18 09:56:24.137 TRACE tokio-runtime-worker xcm::barriers: [Parachain] AllowKnownQueryResponses origin: MultiLocation { parents: 1, interior: X1(Parachain(1013)) }, instructions: [DescendOrigin(X1(PalletInstance(51))), UniversalOrigin(GlobalConsensus(Westend)), DescendOrigin(X1(Parachain(1000))), ReserveAssetDeposited(MultiAssets([MultiAsset { id: Concrete(MultiLocation { parents: 2, interior: X1(GlobalConsensus(Westend)) }), fun: Fungible(150000000000) }])), ClearOrigin, BuyExecution { fees: MultiAsset { id: Concrete(MultiLocation { parents: 2, interior: X1(GlobalConsensus(Westend)) }), fun: Fungible(150000000000) }, weight_limit: Unlimited }, DepositAsset { assets: Wild(AllCounted(1)), beneficiary: MultiLocation { parents: 0, interior: X1(AccountId32 { network: None, id: [212, 53, 147, 199, 21, 253, 211, 28, 97, 20, 26, 189, 4, 169, 159, 214, 130, 44, 133, 88, 133, 76, 205, 227, 154, 86, 132, 231, 165, 109, 162, 125] }) } }], max_weight: Weight { ref_time: 219970000, proof_size: 6571 }, properties: Properties { weight_credit: Weight { ref_time: 0, proof_size: 0 }, message_id: Some([69, 190, 44, 151, 178, 35, 82, 208, 221, 233, 67, 201, 206, 212, 56, 63, 223, 119, 195, 127, 31, 87, 59, 196, 23, 20, 40, 202, 162, 213, 159, 53]) } -2023-12-18 09:56:24.137 TRACE tokio-runtime-worker xcm::barriers: [Parachain] WithComputedOrigin origin: MultiLocation { parents: 1, interior: X1(Parachain(1013)) }, instructions: [DescendOrigin(X1(PalletInstance(51))), UniversalOrigin(GlobalConsensus(Westend)), DescendOrigin(X1(Parachain(1000))), ReserveAssetDeposited(MultiAssets([MultiAsset { id: Concrete(MultiLocation { parents: 2, interior: X1(GlobalConsensus(Westend)) }), fun: Fungible(150000000000) }])), ClearOrigin, BuyExecution { fees: MultiAsset { id: Concrete(MultiLocation { parents: 2, interior: X1(GlobalConsensus(Westend)) }), fun: Fungible(150000000000) }, weight_limit: Unlimited }, DepositAsset { assets: Wild(AllCounted(1)), beneficiary: MultiLocation { parents: 0, interior: X1(AccountId32 { network: None, id: [212, 53, 147, 199, 21, 253, 211, 28, 97, 20, 26, 189, 4, 169, 159, 214, 130, 44, 133, 88, 133, 76, 205, 227, 154, 86, 132, 231, 165, 109, 162, 125] }) } }], max_weight: Weight { ref_time: 219970000, proof_size: 6571 }, properties: Properties { weight_credit: Weight { ref_time: 0, proof_size: 0 }, message_id: Some([69, 190, 44, 151, 178, 35, 82, 208, 221, 233, 67, 201, 206, 212, 56, 63, 223, 119, 195, 127, 31, 87, 59, 196, 23, 20, 40, 202, 162, 213, 159, 53]) } -2023-12-18 09:56:24.137 TRACE tokio-runtime-worker xcm::barriers: [Parachain] AllowTopLevelPaidExecutionFrom origin: MultiLocation { parents: 2, interior: X2(GlobalConsensus(Westend), Parachain(1000)) }, instructions: [ReserveAssetDeposited(MultiAssets([MultiAsset { id: Concrete(MultiLocation { parents: 2, interior: X1(GlobalConsensus(Westend)) }), fun: Fungible(150000000000) }])), ClearOrigin, BuyExecution { fees: MultiAsset { id: Concrete(MultiLocation { parents: 2, interior: X1(GlobalConsensus(Westend)) }), fun: Fungible(150000000000) }, weight_limit: Unlimited }, DepositAsset { assets: Wild(AllCounted(1)), beneficiary: MultiLocation { parents: 0, interior: X1(AccountId32 { network: None, id: [212, 53, 147, 199, 21, 253, 211, 28, 97, 20, 26, 189, 4, 169, 159, 214, 130, 44, 133, 88, 133, 76, 205, 227, 154, 86, 132, 231, 165, 109, 162, 125] }) } }], max_weight: Weight { ref_time: 219970000, proof_size: 6571 }, properties: Properties { weight_credit: Weight { ref_time: 0, proof_size: 0 }, message_id: Some([69, 190, 44, 151, 178, 35, 82, 208, 221, 233, 67, 201, 206, 212, 56, 63, 223, 119, 195, 127, 31, 87, 59, 196, 23, 20, 40, 202, 162, 213, 159, 53]) } -2023-12-18 09:56:24.137 TRACE tokio-runtime-worker xcm::process: [Parachain] origin: Some(MultiLocation { parents: 1, interior: X1(Parachain(1013)) }), total_surplus/refunded: Weight { ref_time: 0, proof_size: 0 }/Weight { ref_time: 0, proof_size: 0 }, error_handler_weight: Weight { ref_time: 0, proof_size: 0 } -2023-12-18 09:56:24.137 TRACE tokio-runtime-worker xcm::process_instruction: [Parachain] === DescendOrigin(X1(PalletInstance(51))) -2023-12-18 09:56:24.137 TRACE tokio-runtime-worker xcm::process_instruction: [Parachain] === UniversalOrigin(GlobalConsensus(Westend)) -2023-12-18 09:56:24.137 TRACE tokio-runtime-worker xcm::process_instruction: [Parachain] === DescendOrigin(X1(Parachain(1000))) -2023-12-18 09:56:24.137 TRACE tokio-runtime-worker xcm::process_instruction: [Parachain] === ReserveAssetDeposited(MultiAssets([MultiAsset { id: Concrete(MultiLocation { parents: 2, interior: X1(GlobalConsensus(Westend)) }), fun: Fungible(150000000000) }])) -2023-12-18 09:56:24.137 TRACE tokio-runtime-worker xcm::contains: [Parachain] IsTrustedBridgedReserveLocationForConcreteAsset asset: MultiAsset { id: Concrete(MultiLocation { parents: 2, interior: X1(GlobalConsensus(Westend)) }), fun: Fungible(150000000000) }, origin: MultiLocation { parents: 2, interior: X2(GlobalConsensus(Westend), Parachain(1000)) }, universal_source: X2(GlobalConsensus(Rococo), Parachain(1000)) -2023-12-18 09:56:24.137 TRACE tokio-runtime-worker xcm::contains: [Parachain] Case asset: MultiAsset { id: Concrete(MultiLocation { parents: 2, interior: X1(GlobalConsensus(Westend)) }), fun: Fungible(150000000000) }, origin: MultiLocation { parents: 2, interior: X2(GlobalConsensus(Westend), Parachain(1000)) } -2023-12-18 09:56:24.137 TRACE tokio-runtime-worker xcm::process_instruction: [Parachain] === ClearOrigin -2023-12-18 09:56:24.137 TRACE tokio-runtime-worker xcm::process_instruction: [Parachain] === BuyExecution { fees: MultiAsset { id: Concrete(MultiLocation { parents: 2, interior: X1(GlobalConsensus(Westend)) }), fun: Fungible(150000000000) }, weight_limit: Limited(Weight { ref_time: 219970000, proof_size: 6571 }) } -2023-12-18 09:56:24.137 TRACE tokio-runtime-worker xcm::weight: [Parachain] UsingComponents::buy_weight weight: Weight { ref_time: 219970000, proof_size: 6571 }, payment: , context: XcmContext { origin: None, message_id: [69, 190, 44, 151, 178, 35, 82, 208, 221, 233, 67, 201, 206, 212, 56, 63, 223, 119, 195, 127, 31, 87, 59, 196, 23, 20, 40, 202, 162, 213, 159, 53], topic: None } -2023-12-18 09:56:24.137 TRACE tokio-runtime-worker xcm::weight: [Parachain] TakeFirstAssetTrader::buy_weight weight: Weight { ref_time: 219970000, proof_size: 6571 }, payment: , context: XcmContext { origin: None, message_id: [69, 190, 44, 151, 178, 35, 82, 208, 221, 233, 67, 201, 206, 212, 56, 63, 223, 119, 195, 127, 31, 87, 59, 196, 23, 20, 40, 202, 162, 213, 159, 53], topic: None } -2023-12-18 09:56:24.137 TRACE tokio-runtime-worker xcm::weight: [Parachain] TakeFirstAssetTrader::buy_weight weight: Weight { ref_time: 219970000, proof_size: 6571 }, payment: , context: XcmContext { origin: None, message_id: [69, 190, 44, 151, 178, 35, 82, 208, 221, 233, 67, 201, 206, 212, 56, 63, 223, 119, 195, 127, 31, 87, 59, 196, 23, 20, 40, 202, 162, 213, 159, 53], topic: None } -2023-12-18 09:56:24.137 TRACE tokio-runtime-worker xcm::buy_weight: [Parachain] last_error: Some(TooExpensive), too_expensive_error_found: true -2023-12-18 09:56:24.137 TRACE tokio-runtime-worker xcm::execute: [Parachain] !!! ERROR: TooExpensive -2023-12-18 09:56:24.137 TRACE tokio-runtime-worker xcm::execute_xcm_in_credit: [Parachain] result: Err(ExecutorError { index: 5, xcm_error: TooExpensive, weight: Weight { ref_time: 146900000, proof_size: 3593 } }) From 1e2b3b6093b6fe8b5988443ca1d12c0f3b7adbe8 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Tue, 26 Dec 2023 12:51:08 +0300 Subject: [PATCH 57/86] - --- bridges/zombienet/run-tests.sh | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/bridges/zombienet/run-tests.sh b/bridges/zombienet/run-tests.sh index 3f9951c1d779..635e0c170ab3 100755 --- a/bridges/zombienet/run-tests.sh +++ b/bridges/zombienet/run-tests.sh @@ -7,10 +7,6 @@ shopt -s nullglob #trap "exit" INT TERM #trap "kill -9 0" EXIT -sudo systemctl enable apport.service || true -sudo service apport start || true -cat /var/log/apport.log - # assuming that we'll be using native provide && all processes will be executing locally # (we need absolute paths here, because they're used when scripts are called by zombienet from tmp folders) export POLKADOT_SDK_FOLDER=`realpath $(dirname "$0")/../..` @@ -130,16 +126,6 @@ do cat $file done - #cat /var/log/lastlog || true - #cat /var/log/faillog || true - #cat /var/log/syslog || true - #cat /var/log/apport.log || true - #ls /var/crash || true - #ls /var/log - #ls /usr/local/bin/ - #ls -la /home/nonroot - #ls -la /home/nonroot/bridges-polkadot-sdk/bridges/zombienet - exit 1 fi From ead14d2ed410ed0c5fd0729861f45b818bf8f36c Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Tue, 26 Dec 2023 14:17:37 +0300 Subject: [PATCH 58/86] attempt --- .gitlab/pipeline/zombienet/bridges.yml | 23 ++++++++++++----------- bridges/zombienet/run-tests.sh | 16 +++++++++++----- 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/.gitlab/pipeline/zombienet/bridges.yml b/.gitlab/pipeline/zombienet/bridges.yml index 924fc5542211..784ceb6f04b4 100644 --- a/.gitlab/pipeline/zombienet/bridges.yml +++ b/.gitlab/pipeline/zombienet/bridges.yml @@ -29,19 +29,20 @@ LOCAL_DIR: "/builds/parity/mirrors/polkadot-sdk/bridges/zombienet" FF_DISABLE_UMASK_FOR_DOCKER_EXECUTOR: 1 RUN_IN_CONTAINER: "1" -# artifacts: -# name: "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}" -# when: always -# expire_in: 2 days -# paths: -# - ./zombienet-logs + artifacts: + name: "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}_zombienet_bridge_tests" + when: always + expire_in: 2 days + paths: + - ./zombienet-logs after_script: - echo "Am I working???!!!" -# - mkdir -p ./zombienet-logs -# - cp /tmp/zombie*/logs/* ./zombienet-logs/ -# - cp -r /tmp/bridges-zombienet-tests*/* ./zombienet-logs/ -# - echo "Am I working???" -# - echo X>./zombienet-logs/xxx + - mkdir -p ./zombienet-logs + - cp /tmp/zombie*/logs/* ./zombienet-logs/ + - cp /tmp/polkadot.*/* ./zombienet-logs/ + - cp /tmp/polkadot-parachain.*/* ./zombienet-logs/ + - cp -r /tmp/bridges-zombienet-tests*/* ./zombienet-logs/ + - echo "Am I working???" # retry: 2 # tags: # - zombienet-polkadot-integration-test diff --git a/bridges/zombienet/run-tests.sh b/bridges/zombienet/run-tests.sh index 635e0c170ab3..02ec1e8b3fcc 100755 --- a/bridges/zombienet/run-tests.sh +++ b/bridges/zombienet/run-tests.sh @@ -52,7 +52,7 @@ function start_coproc() { unset RUN_IN_CONTAINER unset ZOMBIENET_IMAGE - $command >$coproc_log 2>&1 + $command >$coproc_log/log 2>&1 } TEST_COPROCS[$COPROC_PID, 0]=$name TEST_COPROCS[$COPROC_PID, 1]=$coproc_log @@ -115,15 +115,21 @@ do echo "=====================================================================" echo $coproc_stdout - for file in /tmp/zombie*/logs/* ; do - cat $file + for $file in /tmp/zombie*/logs/* ; do + echo $file + head $file + #cat $file done for file in /tmp/polkadot.*/* ; do - cat $file + echo $file + head $file + cat $file | grep -E 'ERROR|WARN|rror|arn|ail|xcm' -C10 done for file in /tmp/polkadot-parachain.*/* ; do - cat $file + echo $file + head $file + cat $file | grep -E 'ERROR|WARN|rror|arn|ail|xcm' -C10 done exit 1 From f581afad9d8878a3651f55220bf096dab12d3740 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Tue, 26 Dec 2023 15:11:03 +0300 Subject: [PATCH 59/86] fix --- bridges/zombienet/run-tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bridges/zombienet/run-tests.sh b/bridges/zombienet/run-tests.sh index 02ec1e8b3fcc..385188a945b5 100755 --- a/bridges/zombienet/run-tests.sh +++ b/bridges/zombienet/run-tests.sh @@ -115,7 +115,7 @@ do echo "=====================================================================" echo $coproc_stdout - for $file in /tmp/zombie*/logs/* ; do + for file in /tmp/zombie*/logs/* ; do echo $file head $file #cat $file From 911de8fa7cda15480e49209d66ae3c4033245602 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Tue, 26 Dec 2023 15:12:09 +0300 Subject: [PATCH 60/86] fix --- bridges/zombienet/run-tests.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/bridges/zombienet/run-tests.sh b/bridges/zombienet/run-tests.sh index 385188a945b5..6ae188e2e560 100755 --- a/bridges/zombienet/run-tests.sh +++ b/bridges/zombienet/run-tests.sh @@ -121,6 +121,16 @@ do #cat $file done + echo "===" + + for file in /tmp/zombie*/*/* ; do + echo $file + head $file + #cat $file + done + + echo "===" + for file in /tmp/polkadot.*/* ; do echo $file head $file From 34d894fa0c8339d5bf26cd2596cdad579694dfc6 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Tue, 26 Dec 2023 15:42:25 +0300 Subject: [PATCH 61/86] ++ --- bridges/zombienet/run-tests.sh | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/bridges/zombienet/run-tests.sh b/bridges/zombienet/run-tests.sh index 6ae188e2e560..f5f0057be1f1 100755 --- a/bridges/zombienet/run-tests.sh +++ b/bridges/zombienet/run-tests.sh @@ -52,7 +52,7 @@ function start_coproc() { unset RUN_IN_CONTAINER unset ZOMBIENET_IMAGE - $command >$coproc_log/log 2>&1 + $command >$coproc_log 2>&1 } TEST_COPROCS[$COPROC_PID, 0]=$name TEST_COPROCS[$COPROC_PID, 1]=$coproc_log @@ -115,10 +115,12 @@ do echo "=====================================================================" echo $coproc_stdout + echo "===" + echo $TEST_PREFIX + for file in /tmp/zombie*/logs/* ; do echo $file head $file - #cat $file done echo "===" @@ -126,11 +128,22 @@ do for file in /tmp/zombie*/*/* ; do echo $file head $file - #cat $file done echo "===" + for file in /tmp/bridges-zombie*/* ; do + echo $file + head $file + done + + echo "===" + + for file in /tmp/bridges-zombie*/* ; do + echo $file + head $file + done + for file in /tmp/polkadot.*/* ; do echo $file head $file From 2d2a616c056c9054b58e56e5c1905198cba4f893 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Thu, 28 Dec 2023 15:02:07 +0300 Subject: [PATCH 62/86] up @polkadot/api and @polkadot/util package version to latest --- .../package-lock.json | 1422 ++++++----------- .../generate_hex_encoded_call/package.json | 4 +- 2 files changed, 486 insertions(+), 940 deletions(-) diff --git a/cumulus/scripts/generate_hex_encoded_call/package-lock.json b/cumulus/scripts/generate_hex_encoded_call/package-lock.json index 3383265e7796..b2dddaa19ed1 100644 --- a/cumulus/scripts/generate_hex_encoded_call/package-lock.json +++ b/cumulus/scripts/generate_hex_encoded_call/package-lock.json @@ -9,1204 +9,750 @@ "version": "y", "license": "MIT", "dependencies": { - "@polkadot/api": "^6.5.2", - "@polkadot/util": "^7.6.1" + "@polkadot/api": "^10.11", + "@polkadot/util": "^12.6" } }, - "node_modules/@babel/runtime": { - "version": "7.20.13", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.13.tgz", - "integrity": "sha512-gt3PKXs0DBoL9xCvOIIZ2NEqAGZqHjAnmVbfQtB620V0uReIQutpel14KcneZuer7UioY8ALKZ7iocavvzTNFA==", + "node_modules/@noble/curves": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.3.0.tgz", + "integrity": "sha512-t01iSXPuN+Eqzb4eBX0S5oubSqXbK/xXa1Ne18Hj8f9pStxztHCE2gfboSp/dZRLSqfuLpRK2nDXDK+W9puocA==", "dependencies": { - "regenerator-runtime": "^0.13.11" + "@noble/hashes": "1.3.3" }, - "engines": { - "node": ">=6.9.0" + "funding": { + "url": "https://paulmillr.com/funding/" } }, "node_modules/@noble/hashes": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.0.0.tgz", - "integrity": "sha512-DZVbtY62kc3kkBtMHqwCOfXrT/hnoORy5BJ4+HU1IR59X0KWAOqsfzQPcUl/lQLlG7qXbe/fZ3r/emxtAl+sqg==" - }, - "node_modules/@noble/secp256k1": { - "version": "1.5.5", - "resolved": "https://registry.npmjs.org/@noble/secp256k1/-/secp256k1-1.5.5.tgz", - "integrity": "sha512-sZ1W6gQzYnu45wPrWx8D3kwI2/U29VYTx9OjbDAd7jwRItJ0cSTMPRL/C8AWZFn9kWFLQGqEXVEE86w4Z8LpIQ==", - "funding": [ - { - "type": "individual", - "url": "https://paulmillr.com/funding/" - } - ] - }, - "node_modules/@polkadot/api": { - "version": "6.12.1", - "resolved": "https://registry.npmjs.org/@polkadot/api/-/api-6.12.1.tgz", - "integrity": "sha512-RVdTiA2WaEvproM3i6E9TKS1bfXpPd9Ly9lUG/kVLaspjKoIot9DJUDTl97TJ+7xr8LXGbXqm448Ud0hsEBV8Q==", - "dependencies": { - "@babel/runtime": "^7.16.3", - "@polkadot/api-derive": "6.12.1", - "@polkadot/keyring": "^8.1.2", - "@polkadot/rpc-core": "6.12.1", - "@polkadot/rpc-provider": "6.12.1", - "@polkadot/types": "6.12.1", - "@polkadot/types-known": "6.12.1", - "@polkadot/util": "^8.1.2", - "@polkadot/util-crypto": "^8.1.2", - "eventemitter3": "^4.0.7", - "rxjs": "^7.4.0" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@polkadot/api-derive": { - "version": "6.12.1", - "resolved": "https://registry.npmjs.org/@polkadot/api-derive/-/api-derive-6.12.1.tgz", - "integrity": "sha512-5LOVlG5EBCT+ytY6aHmQ4RdEWZovZQqRoc6DLd5BLhkR7BFTHKSkLQW+89so8jd0zEtmSXBVPPnsrXS8joM35Q==", - "dependencies": { - "@babel/runtime": "^7.16.3", - "@polkadot/api": "6.12.1", - "@polkadot/rpc-core": "6.12.1", - "@polkadot/types": "6.12.1", - "@polkadot/util": "^8.1.2", - "@polkadot/util-crypto": "^8.1.2", - "rxjs": "^7.4.0" - }, + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.3.3.tgz", + "integrity": "sha512-V7/fPHgl+jsVPXqqeOzT8egNj2iBIVt+ECeMMG8TdcnTikP3oaBtUVqpT/gYCR68aEBJSF+XbYUxStjbFMqIIA==", "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@polkadot/api-derive/node_modules/@polkadot/util": { - "version": "8.7.1", - "resolved": "https://registry.npmjs.org/@polkadot/util/-/util-8.7.1.tgz", - "integrity": "sha512-XjY1bTo7V6OvOCe4yn8H2vifeuBciCy0gq0k5P1tlGUQLI/Yt0hvDmxcA0FEPtqg8CL+rYRG7WXGPVNjkrNvyQ==", - "dependencies": { - "@babel/runtime": "^7.17.8", - "@polkadot/x-bigint": "8.7.1", - "@polkadot/x-global": "8.7.1", - "@polkadot/x-textdecoder": "8.7.1", - "@polkadot/x-textencoder": "8.7.1", - "@types/bn.js": "^5.1.0", - "bn.js": "^5.2.0", - "ip-regex": "^4.3.0" + "node": ">= 16" }, - "engines": { - "node": ">=14.0.0" + "funding": { + "url": "https://paulmillr.com/funding/" } }, - "node_modules/@polkadot/api-derive/node_modules/@polkadot/x-textdecoder": { - "version": "8.7.1", - "resolved": "https://registry.npmjs.org/@polkadot/x-textdecoder/-/x-textdecoder-8.7.1.tgz", - "integrity": "sha512-ia0Ie2zi4VdQdNVD2GE2FZzBMfX//hEL4w546RMJfZM2LqDS674LofHmcyrsv5zscLnnRyCxZC1+J2dt+6MDIA==", + "node_modules/@polkadot/api": { + "version": "10.11.2", + "resolved": "https://registry.npmjs.org/@polkadot/api/-/api-10.11.2.tgz", + "integrity": "sha512-AorCZxCWCoTtdbl4DPUZh+ACe/pbLIS1BkdQY0AFJuZllm0x/yWzjgampcPd5jQAA/O3iKShRBkZqj6Mk9yG/A==", "dependencies": { - "@babel/runtime": "^7.17.8", - "@polkadot/x-global": "8.7.1" + "@polkadot/api-augment": "10.11.2", + "@polkadot/api-base": "10.11.2", + "@polkadot/api-derive": "10.11.2", + "@polkadot/keyring": "^12.6.2", + "@polkadot/rpc-augment": "10.11.2", + "@polkadot/rpc-core": "10.11.2", + "@polkadot/rpc-provider": "10.11.2", + "@polkadot/types": "10.11.2", + "@polkadot/types-augment": "10.11.2", + "@polkadot/types-codec": "10.11.2", + "@polkadot/types-create": "10.11.2", + "@polkadot/types-known": "10.11.2", + "@polkadot/util": "^12.6.2", + "@polkadot/util-crypto": "^12.6.2", + "eventemitter3": "^5.0.1", + "rxjs": "^7.8.1", + "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=18" } }, - "node_modules/@polkadot/api-derive/node_modules/@polkadot/x-textencoder": { - "version": "8.7.1", - "resolved": "https://registry.npmjs.org/@polkadot/x-textencoder/-/x-textencoder-8.7.1.tgz", - "integrity": "sha512-XDO0A27Xy+eJCKSxENroB8Dcnl+UclGG4ZBei+P/BqZ9rsjskUyd2Vsl6peMXAcsxwOE7g0uTvujoGM8jpKOXw==", + "node_modules/@polkadot/api-augment": { + "version": "10.11.2", + "resolved": "https://registry.npmjs.org/@polkadot/api-augment/-/api-augment-10.11.2.tgz", + "integrity": "sha512-PTpnqpezc75qBqUtgrc0GYB8h9UHjfbHSRZamAbecIVAJ2/zc6CqtnldeaBlIu1IKTgBzi3FFtTyYu+ZGbNT2Q==", "dependencies": { - "@babel/runtime": "^7.17.8", - "@polkadot/x-global": "8.7.1" + "@polkadot/api-base": "10.11.2", + "@polkadot/rpc-augment": "10.11.2", + "@polkadot/types": "10.11.2", + "@polkadot/types-augment": "10.11.2", + "@polkadot/types-codec": "10.11.2", + "@polkadot/util": "^12.6.2", + "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=18" } }, - "node_modules/@polkadot/api-derive/node_modules/@types/bn.js": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.1.tgz", - "integrity": "sha512-qNrYbZqMx0uJAfKnKclPh+dTwK33KfLHYqtyODwd5HnXOjnkhc4qgn3BrK6RWyGZm5+sIFE7Q7Vz6QQtJB7w7g==", + "node_modules/@polkadot/api-base": { + "version": "10.11.2", + "resolved": "https://registry.npmjs.org/@polkadot/api-base/-/api-base-10.11.2.tgz", + "integrity": "sha512-4LIjaUfO9nOzilxo7XqzYKCNMtmUypdk8oHPdrRnSjKEsnK7vDsNi+979z2KXNXd2KFSCFHENmI523fYnMnReg==", "dependencies": { - "@types/node": "*" - } - }, - "node_modules/@polkadot/api-derive/node_modules/bn.js": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz", - "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==" - }, - "node_modules/@polkadot/api/node_modules/@polkadot/util": { - "version": "8.7.1", - "resolved": "https://registry.npmjs.org/@polkadot/util/-/util-8.7.1.tgz", - "integrity": "sha512-XjY1bTo7V6OvOCe4yn8H2vifeuBciCy0gq0k5P1tlGUQLI/Yt0hvDmxcA0FEPtqg8CL+rYRG7WXGPVNjkrNvyQ==", - "dependencies": { - "@babel/runtime": "^7.17.8", - "@polkadot/x-bigint": "8.7.1", - "@polkadot/x-global": "8.7.1", - "@polkadot/x-textdecoder": "8.7.1", - "@polkadot/x-textencoder": "8.7.1", - "@types/bn.js": "^5.1.0", - "bn.js": "^5.2.0", - "ip-regex": "^4.3.0" + "@polkadot/rpc-core": "10.11.2", + "@polkadot/types": "10.11.2", + "@polkadot/util": "^12.6.2", + "rxjs": "^7.8.1", + "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=18" } }, - "node_modules/@polkadot/api/node_modules/@polkadot/x-textdecoder": { - "version": "8.7.1", - "resolved": "https://registry.npmjs.org/@polkadot/x-textdecoder/-/x-textdecoder-8.7.1.tgz", - "integrity": "sha512-ia0Ie2zi4VdQdNVD2GE2FZzBMfX//hEL4w546RMJfZM2LqDS674LofHmcyrsv5zscLnnRyCxZC1+J2dt+6MDIA==", - "dependencies": { - "@babel/runtime": "^7.17.8", - "@polkadot/x-global": "8.7.1" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@polkadot/api/node_modules/@polkadot/x-textencoder": { - "version": "8.7.1", - "resolved": "https://registry.npmjs.org/@polkadot/x-textencoder/-/x-textencoder-8.7.1.tgz", - "integrity": "sha512-XDO0A27Xy+eJCKSxENroB8Dcnl+UclGG4ZBei+P/BqZ9rsjskUyd2Vsl6peMXAcsxwOE7g0uTvujoGM8jpKOXw==", + "node_modules/@polkadot/api-derive": { + "version": "10.11.2", + "resolved": "https://registry.npmjs.org/@polkadot/api-derive/-/api-derive-10.11.2.tgz", + "integrity": "sha512-m3BQbPionkd1iSlknddxnL2hDtolPIsT+aRyrtn4zgMRPoLjHFmTmovvg8RaUyYofJtZeYrnjMw0mdxiSXx7eA==", "dependencies": { - "@babel/runtime": "^7.17.8", - "@polkadot/x-global": "8.7.1" + "@polkadot/api": "10.11.2", + "@polkadot/api-augment": "10.11.2", + "@polkadot/api-base": "10.11.2", + "@polkadot/rpc-core": "10.11.2", + "@polkadot/types": "10.11.2", + "@polkadot/types-codec": "10.11.2", + "@polkadot/util": "^12.6.2", + "@polkadot/util-crypto": "^12.6.2", + "rxjs": "^7.8.1", + "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=18" } }, - "node_modules/@polkadot/api/node_modules/@types/bn.js": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.1.tgz", - "integrity": "sha512-qNrYbZqMx0uJAfKnKclPh+dTwK33KfLHYqtyODwd5HnXOjnkhc4qgn3BrK6RWyGZm5+sIFE7Q7Vz6QQtJB7w7g==", - "dependencies": { - "@types/node": "*" - } - }, - "node_modules/@polkadot/api/node_modules/bn.js": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz", - "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==" - }, "node_modules/@polkadot/keyring": { - "version": "8.7.1", - "resolved": "https://registry.npmjs.org/@polkadot/keyring/-/keyring-8.7.1.tgz", - "integrity": "sha512-t6ZgQVC+nQT7XwbWtEhkDpiAzxKVJw8Xd/gWdww6xIrawHu7jo3SGB4QNdPgkf8TvDHYAAJiupzVQYAlOIq3GA==", + "version": "12.6.2", + "resolved": "https://registry.npmjs.org/@polkadot/keyring/-/keyring-12.6.2.tgz", + "integrity": "sha512-O3Q7GVmRYm8q7HuB3S0+Yf/q/EB2egKRRU3fv9b3B7V+A52tKzA+vIwEmNVaD1g5FKW9oB97rmpggs0zaKFqHw==", "dependencies": { - "@babel/runtime": "^7.17.8", - "@polkadot/util": "8.7.1", - "@polkadot/util-crypto": "8.7.1" + "@polkadot/util": "12.6.2", + "@polkadot/util-crypto": "12.6.2", + "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=18" }, "peerDependencies": { - "@polkadot/util": "8.7.1", - "@polkadot/util-crypto": "8.7.1" - } - }, - "node_modules/@polkadot/keyring/node_modules/@polkadot/util": { - "version": "8.7.1", - "resolved": "https://registry.npmjs.org/@polkadot/util/-/util-8.7.1.tgz", - "integrity": "sha512-XjY1bTo7V6OvOCe4yn8H2vifeuBciCy0gq0k5P1tlGUQLI/Yt0hvDmxcA0FEPtqg8CL+rYRG7WXGPVNjkrNvyQ==", - "dependencies": { - "@babel/runtime": "^7.17.8", - "@polkadot/x-bigint": "8.7.1", - "@polkadot/x-global": "8.7.1", - "@polkadot/x-textdecoder": "8.7.1", - "@polkadot/x-textencoder": "8.7.1", - "@types/bn.js": "^5.1.0", - "bn.js": "^5.2.0", - "ip-regex": "^4.3.0" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@polkadot/keyring/node_modules/@polkadot/x-textdecoder": { - "version": "8.7.1", - "resolved": "https://registry.npmjs.org/@polkadot/x-textdecoder/-/x-textdecoder-8.7.1.tgz", - "integrity": "sha512-ia0Ie2zi4VdQdNVD2GE2FZzBMfX//hEL4w546RMJfZM2LqDS674LofHmcyrsv5zscLnnRyCxZC1+J2dt+6MDIA==", - "dependencies": { - "@babel/runtime": "^7.17.8", - "@polkadot/x-global": "8.7.1" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@polkadot/keyring/node_modules/@polkadot/x-textencoder": { - "version": "8.7.1", - "resolved": "https://registry.npmjs.org/@polkadot/x-textencoder/-/x-textencoder-8.7.1.tgz", - "integrity": "sha512-XDO0A27Xy+eJCKSxENroB8Dcnl+UclGG4ZBei+P/BqZ9rsjskUyd2Vsl6peMXAcsxwOE7g0uTvujoGM8jpKOXw==", - "dependencies": { - "@babel/runtime": "^7.17.8", - "@polkadot/x-global": "8.7.1" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@polkadot/keyring/node_modules/@types/bn.js": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.1.tgz", - "integrity": "sha512-qNrYbZqMx0uJAfKnKclPh+dTwK33KfLHYqtyODwd5HnXOjnkhc4qgn3BrK6RWyGZm5+sIFE7Q7Vz6QQtJB7w7g==", - "dependencies": { - "@types/node": "*" + "@polkadot/util": "12.6.2", + "@polkadot/util-crypto": "12.6.2" } }, - "node_modules/@polkadot/keyring/node_modules/bn.js": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz", - "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==" - }, "node_modules/@polkadot/networks": { - "version": "8.7.1", - "resolved": "https://registry.npmjs.org/@polkadot/networks/-/networks-8.7.1.tgz", - "integrity": "sha512-8xAmhDW0ry5EKcEjp6VTuwoTm0DdDo/zHsmx88P6sVL87gupuFsL+B6TrsYLl8GcaqxujwrOlKB+CKTUg7qFKg==", + "version": "12.6.2", + "resolved": "https://registry.npmjs.org/@polkadot/networks/-/networks-12.6.2.tgz", + "integrity": "sha512-1oWtZm1IvPWqvMrldVH6NI2gBoCndl5GEwx7lAuQWGr7eNL+6Bdc5K3Z9T0MzFvDGoi2/CBqjX9dRKo39pDC/w==", "dependencies": { - "@babel/runtime": "^7.17.8", - "@polkadot/util": "8.7.1", - "@substrate/ss58-registry": "^1.17.0" + "@polkadot/util": "12.6.2", + "@substrate/ss58-registry": "^1.44.0", + "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=18" } }, - "node_modules/@polkadot/networks/node_modules/@polkadot/util": { - "version": "8.7.1", - "resolved": "https://registry.npmjs.org/@polkadot/util/-/util-8.7.1.tgz", - "integrity": "sha512-XjY1bTo7V6OvOCe4yn8H2vifeuBciCy0gq0k5P1tlGUQLI/Yt0hvDmxcA0FEPtqg8CL+rYRG7WXGPVNjkrNvyQ==", + "node_modules/@polkadot/rpc-augment": { + "version": "10.11.2", + "resolved": "https://registry.npmjs.org/@polkadot/rpc-augment/-/rpc-augment-10.11.2.tgz", + "integrity": "sha512-9AhT0WW81/8jYbRcAC6PRmuxXqNhJje8OYiulBQHbG1DTCcjAfz+6VQBke9BwTStzPq7d526+yyBKD17O3zlAA==", "dependencies": { - "@babel/runtime": "^7.17.8", - "@polkadot/x-bigint": "8.7.1", - "@polkadot/x-global": "8.7.1", - "@polkadot/x-textdecoder": "8.7.1", - "@polkadot/x-textencoder": "8.7.1", - "@types/bn.js": "^5.1.0", - "bn.js": "^5.2.0", - "ip-regex": "^4.3.0" + "@polkadot/rpc-core": "10.11.2", + "@polkadot/types": "10.11.2", + "@polkadot/types-codec": "10.11.2", + "@polkadot/util": "^12.6.2", + "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=18" } }, - "node_modules/@polkadot/networks/node_modules/@polkadot/x-textdecoder": { - "version": "8.7.1", - "resolved": "https://registry.npmjs.org/@polkadot/x-textdecoder/-/x-textdecoder-8.7.1.tgz", - "integrity": "sha512-ia0Ie2zi4VdQdNVD2GE2FZzBMfX//hEL4w546RMJfZM2LqDS674LofHmcyrsv5zscLnnRyCxZC1+J2dt+6MDIA==", - "dependencies": { - "@babel/runtime": "^7.17.8", - "@polkadot/x-global": "8.7.1" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@polkadot/networks/node_modules/@polkadot/x-textencoder": { - "version": "8.7.1", - "resolved": "https://registry.npmjs.org/@polkadot/x-textencoder/-/x-textencoder-8.7.1.tgz", - "integrity": "sha512-XDO0A27Xy+eJCKSxENroB8Dcnl+UclGG4ZBei+P/BqZ9rsjskUyd2Vsl6peMXAcsxwOE7g0uTvujoGM8jpKOXw==", - "dependencies": { - "@babel/runtime": "^7.17.8", - "@polkadot/x-global": "8.7.1" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@polkadot/networks/node_modules/@types/bn.js": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.1.tgz", - "integrity": "sha512-qNrYbZqMx0uJAfKnKclPh+dTwK33KfLHYqtyODwd5HnXOjnkhc4qgn3BrK6RWyGZm5+sIFE7Q7Vz6QQtJB7w7g==", - "dependencies": { - "@types/node": "*" - } - }, - "node_modules/@polkadot/networks/node_modules/bn.js": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz", - "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==" - }, "node_modules/@polkadot/rpc-core": { - "version": "6.12.1", - "resolved": "https://registry.npmjs.org/@polkadot/rpc-core/-/rpc-core-6.12.1.tgz", - "integrity": "sha512-Hb08D9zho3SB1UNlUCmG5q0gdgbOx25JKGLDfSYpD/wtD0Y1Sf2X5cfgtMoSYE3USWiRdCu4BxQkXTiRjPjzJg==", - "dependencies": { - "@babel/runtime": "^7.16.3", - "@polkadot/rpc-provider": "6.12.1", - "@polkadot/types": "6.12.1", - "@polkadot/util": "^8.1.2", - "rxjs": "^7.4.0" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@polkadot/rpc-core/node_modules/@polkadot/util": { - "version": "8.7.1", - "resolved": "https://registry.npmjs.org/@polkadot/util/-/util-8.7.1.tgz", - "integrity": "sha512-XjY1bTo7V6OvOCe4yn8H2vifeuBciCy0gq0k5P1tlGUQLI/Yt0hvDmxcA0FEPtqg8CL+rYRG7WXGPVNjkrNvyQ==", - "dependencies": { - "@babel/runtime": "^7.17.8", - "@polkadot/x-bigint": "8.7.1", - "@polkadot/x-global": "8.7.1", - "@polkadot/x-textdecoder": "8.7.1", - "@polkadot/x-textencoder": "8.7.1", - "@types/bn.js": "^5.1.0", - "bn.js": "^5.2.0", - "ip-regex": "^4.3.0" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@polkadot/rpc-core/node_modules/@polkadot/x-textdecoder": { - "version": "8.7.1", - "resolved": "https://registry.npmjs.org/@polkadot/x-textdecoder/-/x-textdecoder-8.7.1.tgz", - "integrity": "sha512-ia0Ie2zi4VdQdNVD2GE2FZzBMfX//hEL4w546RMJfZM2LqDS674LofHmcyrsv5zscLnnRyCxZC1+J2dt+6MDIA==", + "version": "10.11.2", + "resolved": "https://registry.npmjs.org/@polkadot/rpc-core/-/rpc-core-10.11.2.tgz", + "integrity": "sha512-Ot0CFLWx8sZhLZog20WDuniPA01Bk2StNDsdAQgcFKPwZw6ShPaZQCHuKLQK6I6DodOrem9FXX7c1hvoKJP5Ww==", "dependencies": { - "@babel/runtime": "^7.17.8", - "@polkadot/x-global": "8.7.1" + "@polkadot/rpc-augment": "10.11.2", + "@polkadot/rpc-provider": "10.11.2", + "@polkadot/types": "10.11.2", + "@polkadot/util": "^12.6.2", + "rxjs": "^7.8.1", + "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=18" } }, - "node_modules/@polkadot/rpc-core/node_modules/@polkadot/x-textencoder": { - "version": "8.7.1", - "resolved": "https://registry.npmjs.org/@polkadot/x-textencoder/-/x-textencoder-8.7.1.tgz", - "integrity": "sha512-XDO0A27Xy+eJCKSxENroB8Dcnl+UclGG4ZBei+P/BqZ9rsjskUyd2Vsl6peMXAcsxwOE7g0uTvujoGM8jpKOXw==", - "dependencies": { - "@babel/runtime": "^7.17.8", - "@polkadot/x-global": "8.7.1" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@polkadot/rpc-core/node_modules/@types/bn.js": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.1.tgz", - "integrity": "sha512-qNrYbZqMx0uJAfKnKclPh+dTwK33KfLHYqtyODwd5HnXOjnkhc4qgn3BrK6RWyGZm5+sIFE7Q7Vz6QQtJB7w7g==", - "dependencies": { - "@types/node": "*" - } - }, - "node_modules/@polkadot/rpc-core/node_modules/bn.js": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz", - "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==" - }, "node_modules/@polkadot/rpc-provider": { - "version": "6.12.1", - "resolved": "https://registry.npmjs.org/@polkadot/rpc-provider/-/rpc-provider-6.12.1.tgz", - "integrity": "sha512-uUHD3fLTOeZYWJoc6DQlhz+MJR33rVelasV+OxFY2nSD9MSNXRwQh+9UKDQBnyxw5B4BZ2QaEGfucDeavXmVDw==", - "dependencies": { - "@babel/runtime": "^7.16.3", - "@polkadot/types": "6.12.1", - "@polkadot/util": "^8.1.2", - "@polkadot/util-crypto": "^8.1.2", - "@polkadot/x-fetch": "^8.1.2", - "@polkadot/x-global": "^8.1.2", - "@polkadot/x-ws": "^8.1.2", - "eventemitter3": "^4.0.7" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@polkadot/rpc-provider/node_modules/@polkadot/util": { - "version": "8.7.1", - "resolved": "https://registry.npmjs.org/@polkadot/util/-/util-8.7.1.tgz", - "integrity": "sha512-XjY1bTo7V6OvOCe4yn8H2vifeuBciCy0gq0k5P1tlGUQLI/Yt0hvDmxcA0FEPtqg8CL+rYRG7WXGPVNjkrNvyQ==", - "dependencies": { - "@babel/runtime": "^7.17.8", - "@polkadot/x-bigint": "8.7.1", - "@polkadot/x-global": "8.7.1", - "@polkadot/x-textdecoder": "8.7.1", - "@polkadot/x-textencoder": "8.7.1", - "@types/bn.js": "^5.1.0", - "bn.js": "^5.2.0", - "ip-regex": "^4.3.0" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@polkadot/rpc-provider/node_modules/@polkadot/x-textdecoder": { - "version": "8.7.1", - "resolved": "https://registry.npmjs.org/@polkadot/x-textdecoder/-/x-textdecoder-8.7.1.tgz", - "integrity": "sha512-ia0Ie2zi4VdQdNVD2GE2FZzBMfX//hEL4w546RMJfZM2LqDS674LofHmcyrsv5zscLnnRyCxZC1+J2dt+6MDIA==", + "version": "10.11.2", + "resolved": "https://registry.npmjs.org/@polkadot/rpc-provider/-/rpc-provider-10.11.2.tgz", + "integrity": "sha512-he5jWMpDJp7e+vUzTZDzpkB7ps3H8psRally+/ZvZZScPvFEjfczT7I1WWY9h58s8+ImeVP/lkXjL9h/gUOt3Q==", "dependencies": { - "@babel/runtime": "^7.17.8", - "@polkadot/x-global": "8.7.1" + "@polkadot/keyring": "^12.6.2", + "@polkadot/types": "10.11.2", + "@polkadot/types-support": "10.11.2", + "@polkadot/util": "^12.6.2", + "@polkadot/util-crypto": "^12.6.2", + "@polkadot/x-fetch": "^12.6.2", + "@polkadot/x-global": "^12.6.2", + "@polkadot/x-ws": "^12.6.2", + "eventemitter3": "^5.0.1", + "mock-socket": "^9.3.1", + "nock": "^13.4.0", + "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@polkadot/rpc-provider/node_modules/@polkadot/x-textencoder": { - "version": "8.7.1", - "resolved": "https://registry.npmjs.org/@polkadot/x-textencoder/-/x-textencoder-8.7.1.tgz", - "integrity": "sha512-XDO0A27Xy+eJCKSxENroB8Dcnl+UclGG4ZBei+P/BqZ9rsjskUyd2Vsl6peMXAcsxwOE7g0uTvujoGM8jpKOXw==", - "dependencies": { - "@babel/runtime": "^7.17.8", - "@polkadot/x-global": "8.7.1" + "node": ">=18" }, - "engines": { - "node": ">=14.0.0" + "optionalDependencies": { + "@substrate/connect": "0.7.35" } }, - "node_modules/@polkadot/rpc-provider/node_modules/@types/bn.js": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.1.tgz", - "integrity": "sha512-qNrYbZqMx0uJAfKnKclPh+dTwK33KfLHYqtyODwd5HnXOjnkhc4qgn3BrK6RWyGZm5+sIFE7Q7Vz6QQtJB7w7g==", - "dependencies": { - "@types/node": "*" - } - }, - "node_modules/@polkadot/rpc-provider/node_modules/bn.js": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz", - "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==" - }, "node_modules/@polkadot/types": { - "version": "6.12.1", - "resolved": "https://registry.npmjs.org/@polkadot/types/-/types-6.12.1.tgz", - "integrity": "sha512-O37cAGUL0xiXTuO3ySweVh0OuFUD6asrd0TfuzGsEp3jAISWdElEHV5QDiftWq8J9Vf8BMgTcP2QLFbmSusxqA==", - "dependencies": { - "@babel/runtime": "^7.16.3", - "@polkadot/types-known": "6.12.1", - "@polkadot/util": "^8.1.2", - "@polkadot/util-crypto": "^8.1.2", - "rxjs": "^7.4.0" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@polkadot/types-known": { - "version": "6.12.1", - "resolved": "https://registry.npmjs.org/@polkadot/types-known/-/types-known-6.12.1.tgz", - "integrity": "sha512-Z8bHpPQy+mqUm0uR1tai6ra0bQIoPmgRcGFYUM+rJtW1kx/6kZLh10HAICjLpPeA1cwLRzaxHRDqH5MCU6OgXw==", + "version": "10.11.2", + "resolved": "https://registry.npmjs.org/@polkadot/types/-/types-10.11.2.tgz", + "integrity": "sha512-d52j3xXni+C8GdYZVTSfu8ROAnzXFMlyRvXtor0PudUc8UQHOaC4+mYAkTBGA2gKdmL8MHSfRSbhcxHhsikY6Q==", "dependencies": { - "@babel/runtime": "^7.16.3", - "@polkadot/networks": "^8.1.2", - "@polkadot/types": "6.12.1", - "@polkadot/util": "^8.1.2" + "@polkadot/keyring": "^12.6.2", + "@polkadot/types-augment": "10.11.2", + "@polkadot/types-codec": "10.11.2", + "@polkadot/types-create": "10.11.2", + "@polkadot/util": "^12.6.2", + "@polkadot/util-crypto": "^12.6.2", + "rxjs": "^7.8.1", + "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=18" } }, - "node_modules/@polkadot/types-known/node_modules/@polkadot/util": { - "version": "8.7.1", - "resolved": "https://registry.npmjs.org/@polkadot/util/-/util-8.7.1.tgz", - "integrity": "sha512-XjY1bTo7V6OvOCe4yn8H2vifeuBciCy0gq0k5P1tlGUQLI/Yt0hvDmxcA0FEPtqg8CL+rYRG7WXGPVNjkrNvyQ==", + "node_modules/@polkadot/types-augment": { + "version": "10.11.2", + "resolved": "https://registry.npmjs.org/@polkadot/types-augment/-/types-augment-10.11.2.tgz", + "integrity": "sha512-8eB8ew04wZiE5GnmFvEFW1euJWmF62SGxb1O+8wL3zoUtB9Xgo1vB6w6xbTrd+HLV6jNSeXXnbbF1BEUvi9cNg==", "dependencies": { - "@babel/runtime": "^7.17.8", - "@polkadot/x-bigint": "8.7.1", - "@polkadot/x-global": "8.7.1", - "@polkadot/x-textdecoder": "8.7.1", - "@polkadot/x-textencoder": "8.7.1", - "@types/bn.js": "^5.1.0", - "bn.js": "^5.2.0", - "ip-regex": "^4.3.0" + "@polkadot/types": "10.11.2", + "@polkadot/types-codec": "10.11.2", + "@polkadot/util": "^12.6.2", + "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=18" } }, - "node_modules/@polkadot/types-known/node_modules/@polkadot/x-textdecoder": { - "version": "8.7.1", - "resolved": "https://registry.npmjs.org/@polkadot/x-textdecoder/-/x-textdecoder-8.7.1.tgz", - "integrity": "sha512-ia0Ie2zi4VdQdNVD2GE2FZzBMfX//hEL4w546RMJfZM2LqDS674LofHmcyrsv5zscLnnRyCxZC1+J2dt+6MDIA==", + "node_modules/@polkadot/types-codec": { + "version": "10.11.2", + "resolved": "https://registry.npmjs.org/@polkadot/types-codec/-/types-codec-10.11.2.tgz", + "integrity": "sha512-3xjOQL+LOOMzYqlgP9ROL0FQnzU8lGflgYewzau7AsDlFziSEtb49a9BpYo6zil4koC+QB8zQ9OHGFumG08T8w==", "dependencies": { - "@babel/runtime": "^7.17.8", - "@polkadot/x-global": "8.7.1" + "@polkadot/util": "^12.6.2", + "@polkadot/x-bigint": "^12.6.2", + "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=18" } }, - "node_modules/@polkadot/types-known/node_modules/@polkadot/x-textencoder": { - "version": "8.7.1", - "resolved": "https://registry.npmjs.org/@polkadot/x-textencoder/-/x-textencoder-8.7.1.tgz", - "integrity": "sha512-XDO0A27Xy+eJCKSxENroB8Dcnl+UclGG4ZBei+P/BqZ9rsjskUyd2Vsl6peMXAcsxwOE7g0uTvujoGM8jpKOXw==", + "node_modules/@polkadot/types-create": { + "version": "10.11.2", + "resolved": "https://registry.npmjs.org/@polkadot/types-create/-/types-create-10.11.2.tgz", + "integrity": "sha512-SJt23NxYvefRxVZZm6mT9ed1pR6FDoIGQ3xUpbjhTLfU2wuhpKjekMVorYQ6z/gK2JLMu2kV92Ardsz+6GX5XQ==", "dependencies": { - "@babel/runtime": "^7.17.8", - "@polkadot/x-global": "8.7.1" + "@polkadot/types-codec": "10.11.2", + "@polkadot/util": "^12.6.2", + "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@polkadot/types-known/node_modules/@types/bn.js": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.1.tgz", - "integrity": "sha512-qNrYbZqMx0uJAfKnKclPh+dTwK33KfLHYqtyODwd5HnXOjnkhc4qgn3BrK6RWyGZm5+sIFE7Q7Vz6QQtJB7w7g==", - "dependencies": { - "@types/node": "*" + "node": ">=18" } }, - "node_modules/@polkadot/types-known/node_modules/bn.js": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz", - "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==" - }, - "node_modules/@polkadot/types/node_modules/@polkadot/util": { - "version": "8.7.1", - "resolved": "https://registry.npmjs.org/@polkadot/util/-/util-8.7.1.tgz", - "integrity": "sha512-XjY1bTo7V6OvOCe4yn8H2vifeuBciCy0gq0k5P1tlGUQLI/Yt0hvDmxcA0FEPtqg8CL+rYRG7WXGPVNjkrNvyQ==", - "dependencies": { - "@babel/runtime": "^7.17.8", - "@polkadot/x-bigint": "8.7.1", - "@polkadot/x-global": "8.7.1", - "@polkadot/x-textdecoder": "8.7.1", - "@polkadot/x-textencoder": "8.7.1", - "@types/bn.js": "^5.1.0", - "bn.js": "^5.2.0", - "ip-regex": "^4.3.0" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@polkadot/types/node_modules/@polkadot/x-textdecoder": { - "version": "8.7.1", - "resolved": "https://registry.npmjs.org/@polkadot/x-textdecoder/-/x-textdecoder-8.7.1.tgz", - "integrity": "sha512-ia0Ie2zi4VdQdNVD2GE2FZzBMfX//hEL4w546RMJfZM2LqDS674LofHmcyrsv5zscLnnRyCxZC1+J2dt+6MDIA==", + "node_modules/@polkadot/types-known": { + "version": "10.11.2", + "resolved": "https://registry.npmjs.org/@polkadot/types-known/-/types-known-10.11.2.tgz", + "integrity": "sha512-kbEIX7NUQFxpDB0FFGNyXX/odY7jbp56RGD+Z4A731fW2xh/DgAQrI994xTzuh0c0EqPE26oQm3kATSpseqo9w==", "dependencies": { - "@babel/runtime": "^7.17.8", - "@polkadot/x-global": "8.7.1" + "@polkadot/networks": "^12.6.2", + "@polkadot/types": "10.11.2", + "@polkadot/types-codec": "10.11.2", + "@polkadot/types-create": "10.11.2", + "@polkadot/util": "^12.6.2", + "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=18" } }, - "node_modules/@polkadot/types/node_modules/@polkadot/x-textencoder": { - "version": "8.7.1", - "resolved": "https://registry.npmjs.org/@polkadot/x-textencoder/-/x-textencoder-8.7.1.tgz", - "integrity": "sha512-XDO0A27Xy+eJCKSxENroB8Dcnl+UclGG4ZBei+P/BqZ9rsjskUyd2Vsl6peMXAcsxwOE7g0uTvujoGM8jpKOXw==", + "node_modules/@polkadot/types-support": { + "version": "10.11.2", + "resolved": "https://registry.npmjs.org/@polkadot/types-support/-/types-support-10.11.2.tgz", + "integrity": "sha512-X11hoykFYv/3efg4coZy2hUOUc97JhjQMJLzDhHniFwGLlYU8MeLnPdCVGkXx0xDDjTo4/ptS1XpZ5HYcg+gRw==", "dependencies": { - "@babel/runtime": "^7.17.8", - "@polkadot/x-global": "8.7.1" + "@polkadot/util": "^12.6.2", + "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=18" } }, - "node_modules/@polkadot/types/node_modules/@types/bn.js": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.1.tgz", - "integrity": "sha512-qNrYbZqMx0uJAfKnKclPh+dTwK33KfLHYqtyODwd5HnXOjnkhc4qgn3BrK6RWyGZm5+sIFE7Q7Vz6QQtJB7w7g==", - "dependencies": { - "@types/node": "*" - } - }, - "node_modules/@polkadot/types/node_modules/bn.js": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz", - "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==" - }, "node_modules/@polkadot/util": { - "version": "7.9.2", - "resolved": "https://registry.npmjs.org/@polkadot/util/-/util-7.9.2.tgz", - "integrity": "sha512-6ABY6ErgkCsM4C6+X+AJSY4pBGwbKlHZmUtHftaiTvbaj4XuA4nTo3GU28jw8wY0Jh2cJZJvt6/BJ5GVkm5tBA==", + "version": "12.6.2", + "resolved": "https://registry.npmjs.org/@polkadot/util/-/util-12.6.2.tgz", + "integrity": "sha512-l8TubR7CLEY47240uki0TQzFvtnxFIO7uI/0GoWzpYD/O62EIAMRsuY01N4DuwgKq2ZWD59WhzsLYmA5K6ksdw==", "dependencies": { - "@babel/runtime": "^7.16.3", - "@polkadot/x-textdecoder": "7.9.2", - "@polkadot/x-textencoder": "7.9.2", - "@types/bn.js": "^4.11.6", - "bn.js": "^4.12.0", - "camelcase": "^6.2.1", - "ip-regex": "^4.3.0" + "@polkadot/x-bigint": "12.6.2", + "@polkadot/x-global": "12.6.2", + "@polkadot/x-textdecoder": "12.6.2", + "@polkadot/x-textencoder": "12.6.2", + "@types/bn.js": "^5.1.5", + "bn.js": "^5.2.1", + "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=18" } }, "node_modules/@polkadot/util-crypto": { - "version": "8.7.1", - "resolved": "https://registry.npmjs.org/@polkadot/util-crypto/-/util-crypto-8.7.1.tgz", - "integrity": "sha512-TaSuJ2aNrB5sYK7YXszkEv24nYJKRFqjF2OrggoMg6uYxUAECvTkldFnhtgeizMweRMxJIBu6bMHlSIutbWgjw==", + "version": "12.6.2", + "resolved": "https://registry.npmjs.org/@polkadot/util-crypto/-/util-crypto-12.6.2.tgz", + "integrity": "sha512-FEWI/dJ7wDMNN1WOzZAjQoIcCP/3vz3wvAp5QQm+lOrzOLj0iDmaIGIcBkz8HVm3ErfSe/uKP0KS4jgV/ib+Mg==", "dependencies": { - "@babel/runtime": "^7.17.8", - "@noble/hashes": "1.0.0", - "@noble/secp256k1": "1.5.5", - "@polkadot/networks": "8.7.1", - "@polkadot/util": "8.7.1", - "@polkadot/wasm-crypto": "^5.1.1", - "@polkadot/x-bigint": "8.7.1", - "@polkadot/x-randomvalues": "8.7.1", - "@scure/base": "1.0.0", - "ed2curve": "^0.3.0", - "tweetnacl": "^1.0.3" + "@noble/curves": "^1.3.0", + "@noble/hashes": "^1.3.3", + "@polkadot/networks": "12.6.2", + "@polkadot/util": "12.6.2", + "@polkadot/wasm-crypto": "^7.3.2", + "@polkadot/wasm-util": "^7.3.2", + "@polkadot/x-bigint": "12.6.2", + "@polkadot/x-randomvalues": "12.6.2", + "@scure/base": "^1.1.5", + "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=18" }, "peerDependencies": { - "@polkadot/util": "8.7.1" + "@polkadot/util": "12.6.2" } }, - "node_modules/@polkadot/util-crypto/node_modules/@polkadot/util": { - "version": "8.7.1", - "resolved": "https://registry.npmjs.org/@polkadot/util/-/util-8.7.1.tgz", - "integrity": "sha512-XjY1bTo7V6OvOCe4yn8H2vifeuBciCy0gq0k5P1tlGUQLI/Yt0hvDmxcA0FEPtqg8CL+rYRG7WXGPVNjkrNvyQ==", + "node_modules/@polkadot/wasm-bridge": { + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/@polkadot/wasm-bridge/-/wasm-bridge-7.3.2.tgz", + "integrity": "sha512-AJEXChcf/nKXd5Q/YLEV5dXQMle3UNT7jcXYmIffZAo/KI394a+/24PaISyQjoNC0fkzS1Q8T5pnGGHmXiVz2g==", "dependencies": { - "@babel/runtime": "^7.17.8", - "@polkadot/x-bigint": "8.7.1", - "@polkadot/x-global": "8.7.1", - "@polkadot/x-textdecoder": "8.7.1", - "@polkadot/x-textencoder": "8.7.1", - "@types/bn.js": "^5.1.0", - "bn.js": "^5.2.0", - "ip-regex": "^4.3.0" + "@polkadot/wasm-util": "7.3.2", + "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=18" + }, + "peerDependencies": { + "@polkadot/util": "*", + "@polkadot/x-randomvalues": "*" } }, - "node_modules/@polkadot/util-crypto/node_modules/@polkadot/x-textdecoder": { - "version": "8.7.1", - "resolved": "https://registry.npmjs.org/@polkadot/x-textdecoder/-/x-textdecoder-8.7.1.tgz", - "integrity": "sha512-ia0Ie2zi4VdQdNVD2GE2FZzBMfX//hEL4w546RMJfZM2LqDS674LofHmcyrsv5zscLnnRyCxZC1+J2dt+6MDIA==", + "node_modules/@polkadot/wasm-crypto": { + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/@polkadot/wasm-crypto/-/wasm-crypto-7.3.2.tgz", + "integrity": "sha512-+neIDLSJ6jjVXsjyZ5oLSv16oIpwp+PxFqTUaZdZDoA2EyFRQB8pP7+qLsMNk+WJuhuJ4qXil/7XiOnZYZ+wxw==", "dependencies": { - "@babel/runtime": "^7.17.8", - "@polkadot/x-global": "8.7.1" + "@polkadot/wasm-bridge": "7.3.2", + "@polkadot/wasm-crypto-asmjs": "7.3.2", + "@polkadot/wasm-crypto-init": "7.3.2", + "@polkadot/wasm-crypto-wasm": "7.3.2", + "@polkadot/wasm-util": "7.3.2", + "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=18" + }, + "peerDependencies": { + "@polkadot/util": "*", + "@polkadot/x-randomvalues": "*" } }, - "node_modules/@polkadot/util-crypto/node_modules/@polkadot/x-textencoder": { - "version": "8.7.1", - "resolved": "https://registry.npmjs.org/@polkadot/x-textencoder/-/x-textencoder-8.7.1.tgz", - "integrity": "sha512-XDO0A27Xy+eJCKSxENroB8Dcnl+UclGG4ZBei+P/BqZ9rsjskUyd2Vsl6peMXAcsxwOE7g0uTvujoGM8jpKOXw==", + "node_modules/@polkadot/wasm-crypto-asmjs": { + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/@polkadot/wasm-crypto-asmjs/-/wasm-crypto-asmjs-7.3.2.tgz", + "integrity": "sha512-QP5eiUqUFur/2UoF2KKKYJcesc71fXhQFLT3D4ZjG28Mfk2ZPI0QNRUfpcxVQmIUpV5USHg4geCBNuCYsMm20Q==", "dependencies": { - "@babel/runtime": "^7.17.8", - "@polkadot/x-global": "8.7.1" + "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@polkadot/util-crypto/node_modules/@types/bn.js": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.1.tgz", - "integrity": "sha512-qNrYbZqMx0uJAfKnKclPh+dTwK33KfLHYqtyODwd5HnXOjnkhc4qgn3BrK6RWyGZm5+sIFE7Q7Vz6QQtJB7w7g==", - "dependencies": { - "@types/node": "*" + "node": ">=18" + }, + "peerDependencies": { + "@polkadot/util": "*" } }, - "node_modules/@polkadot/util-crypto/node_modules/bn.js": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz", - "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==" - }, - "node_modules/@polkadot/wasm-crypto": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/@polkadot/wasm-crypto/-/wasm-crypto-5.1.1.tgz", - "integrity": "sha512-JCcAVfH8DhYuEyd4oX1ouByxhou0TvpErKn8kHjtzt7+tRoFi0nzWlmK4z49vszsV3JJgXxV81i10C0BYlwTcQ==", + "node_modules/@polkadot/wasm-crypto-init": { + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/@polkadot/wasm-crypto-init/-/wasm-crypto-init-7.3.2.tgz", + "integrity": "sha512-FPq73zGmvZtnuJaFV44brze3Lkrki3b4PebxCy9Fplw8nTmisKo9Xxtfew08r0njyYh+uiJRAxPCXadkC9sc8g==", "dependencies": { - "@babel/runtime": "^7.17.8", - "@polkadot/wasm-crypto-asmjs": "^5.1.1", - "@polkadot/wasm-crypto-wasm": "^5.1.1" + "@polkadot/wasm-bridge": "7.3.2", + "@polkadot/wasm-crypto-asmjs": "7.3.2", + "@polkadot/wasm-crypto-wasm": "7.3.2", + "@polkadot/wasm-util": "7.3.2", + "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=18" }, "peerDependencies": { "@polkadot/util": "*", "@polkadot/x-randomvalues": "*" } }, - "node_modules/@polkadot/wasm-crypto-asmjs": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/@polkadot/wasm-crypto-asmjs/-/wasm-crypto-asmjs-5.1.1.tgz", - "integrity": "sha512-1WBwc2G3pZMKW1T01uXzKE30Sg22MXmF3RbbZiWWk3H2d/Er4jZQRpjumxO5YGWan+xOb7HQQdwnrUnrPgbDhg==", + "node_modules/@polkadot/wasm-crypto-wasm": { + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/@polkadot/wasm-crypto-wasm/-/wasm-crypto-wasm-7.3.2.tgz", + "integrity": "sha512-15wd0EMv9IXs5Abp1ZKpKKAVyZPhATIAHfKsyoWCEFDLSOA0/K0QGOxzrAlsrdUkiKZOq7uzSIgIDgW8okx2Mw==", "dependencies": { - "@babel/runtime": "^7.17.8" + "@polkadot/wasm-util": "7.3.2", + "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=18" }, "peerDependencies": { "@polkadot/util": "*" } }, - "node_modules/@polkadot/wasm-crypto-wasm": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/@polkadot/wasm-crypto-wasm/-/wasm-crypto-wasm-5.1.1.tgz", - "integrity": "sha512-F9PZ30J2S8vUNl2oY7Myow5Xsx5z5uNVpnNlJwlmY8IXBvyucvyQ4HSdhJsrbs4W1BfFc0mHghxgp0FbBCnf/Q==", + "node_modules/@polkadot/wasm-util": { + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/@polkadot/wasm-util/-/wasm-util-7.3.2.tgz", + "integrity": "sha512-bmD+Dxo1lTZyZNxbyPE380wd82QsX+43mgCm40boyKrRppXEyQmWT98v/Poc7chLuskYb6X8IQ6lvvK2bGR4Tg==", "dependencies": { - "@babel/runtime": "^7.17.8" + "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=18" }, "peerDependencies": { "@polkadot/util": "*" } }, "node_modules/@polkadot/x-bigint": { - "version": "8.7.1", - "resolved": "https://registry.npmjs.org/@polkadot/x-bigint/-/x-bigint-8.7.1.tgz", - "integrity": "sha512-ClkhgdB/KqcAKk3zA6Qw8wBL6Wz67pYTPkrAtImpvoPJmR+l4RARauv+MH34JXMUNlNb3aUwqN6lq2Z1zN+mJg==", + "version": "12.6.2", + "resolved": "https://registry.npmjs.org/@polkadot/x-bigint/-/x-bigint-12.6.2.tgz", + "integrity": "sha512-HSIk60uFPX4GOFZSnIF7VYJz7WZA7tpFJsne7SzxOooRwMTWEtw3fUpFy5cYYOeLh17/kHH1Y7SVcuxzVLc74Q==", "dependencies": { - "@babel/runtime": "^7.17.8", - "@polkadot/x-global": "8.7.1" + "@polkadot/x-global": "12.6.2", + "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=18" } }, "node_modules/@polkadot/x-fetch": { - "version": "8.7.1", - "resolved": "https://registry.npmjs.org/@polkadot/x-fetch/-/x-fetch-8.7.1.tgz", - "integrity": "sha512-ygNparcalYFGbspXtdtZOHvNXZBkNgmNO+um9C0JYq74K5OY9/be93uyfJKJ8JcRJtOqBfVDsJpbiRkuJ1PRfg==", + "version": "12.6.2", + "resolved": "https://registry.npmjs.org/@polkadot/x-fetch/-/x-fetch-12.6.2.tgz", + "integrity": "sha512-8wM/Z9JJPWN1pzSpU7XxTI1ldj/AfC8hKioBlUahZ8gUiJaOF7K9XEFCrCDLis/A1BoOu7Ne6WMx/vsJJIbDWw==", "dependencies": { - "@babel/runtime": "^7.17.8", - "@polkadot/x-global": "8.7.1", - "@types/node-fetch": "^2.6.1", - "node-fetch": "^2.6.7" + "@polkadot/x-global": "12.6.2", + "node-fetch": "^3.3.2", + "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=18" } }, "node_modules/@polkadot/x-global": { - "version": "8.7.1", - "resolved": "https://registry.npmjs.org/@polkadot/x-global/-/x-global-8.7.1.tgz", - "integrity": "sha512-WOgUor16IihgNVdiTVGAWksYLUAlqjmODmIK1cuWrLOZtV1VBomWcb3obkO9sh5P6iWziAvCB/i+L0vnTN9ZCA==", + "version": "12.6.2", + "resolved": "https://registry.npmjs.org/@polkadot/x-global/-/x-global-12.6.2.tgz", + "integrity": "sha512-a8d6m+PW98jmsYDtAWp88qS4dl8DyqUBsd0S+WgyfSMtpEXu6v9nXDgPZgwF5xdDvXhm+P0ZfVkVTnIGrScb5g==", "dependencies": { - "@babel/runtime": "^7.17.8" + "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=18" } }, "node_modules/@polkadot/x-randomvalues": { - "version": "8.7.1", - "resolved": "https://registry.npmjs.org/@polkadot/x-randomvalues/-/x-randomvalues-8.7.1.tgz", - "integrity": "sha512-njt17MlfN6yNyNEti7fL12lr5qM6A1aSGkWKVuqzc7XwSBesifJuW4km5u6r2gwhXjH2eHDv9SoQ7WXu8vrrkg==", + "version": "12.6.2", + "resolved": "https://registry.npmjs.org/@polkadot/x-randomvalues/-/x-randomvalues-12.6.2.tgz", + "integrity": "sha512-Vr8uG7rH2IcNJwtyf5ebdODMcr0XjoCpUbI91Zv6AlKVYOGKZlKLYJHIwpTaKKB+7KPWyQrk4Mlym/rS7v9feg==", "dependencies": { - "@babel/runtime": "^7.17.8", - "@polkadot/x-global": "8.7.1" + "@polkadot/x-global": "12.6.2", + "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=18" + }, + "peerDependencies": { + "@polkadot/util": "12.6.2", + "@polkadot/wasm-util": "*" } }, "node_modules/@polkadot/x-textdecoder": { - "version": "7.9.2", - "resolved": "https://registry.npmjs.org/@polkadot/x-textdecoder/-/x-textdecoder-7.9.2.tgz", - "integrity": "sha512-wfwbSHXPhrOAl12QvlIOGNkMH/N/h8PId2ytIjvM/8zPPFB5Il6DWSFLtVapOGEpIFjEWbd5t8Td4pHBVXIEbg==", + "version": "12.6.2", + "resolved": "https://registry.npmjs.org/@polkadot/x-textdecoder/-/x-textdecoder-12.6.2.tgz", + "integrity": "sha512-M1Bir7tYvNappfpFWXOJcnxUhBUFWkUFIdJSyH0zs5LmFtFdbKAeiDXxSp2Swp5ddOZdZgPac294/o2TnQKN1w==", "dependencies": { - "@babel/runtime": "^7.16.3", - "@polkadot/x-global": "7.9.2" + "@polkadot/x-global": "12.6.2", + "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=18" } }, - "node_modules/@polkadot/x-textdecoder/node_modules/@polkadot/x-global": { - "version": "7.9.2", - "resolved": "https://registry.npmjs.org/@polkadot/x-global/-/x-global-7.9.2.tgz", - "integrity": "sha512-JX5CrGWckHf1P9xKXq4vQCAuMUbL81l2hOWX7xeP8nv4caHEpmf5T1wD1iMdQBL5PFifo6Pg0V6/oZBB+bts7A==", + "node_modules/@polkadot/x-textencoder": { + "version": "12.6.2", + "resolved": "https://registry.npmjs.org/@polkadot/x-textencoder/-/x-textencoder-12.6.2.tgz", + "integrity": "sha512-4N+3UVCpI489tUJ6cv3uf0PjOHvgGp9Dl+SZRLgFGt9mvxnvpW/7+XBADRMtlG4xi5gaRK7bgl5bmY6OMDsNdw==", "dependencies": { - "@babel/runtime": "^7.16.3" + "@polkadot/x-global": "12.6.2", + "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=18" } }, - "node_modules/@polkadot/x-textencoder": { - "version": "7.9.2", - "resolved": "https://registry.npmjs.org/@polkadot/x-textencoder/-/x-textencoder-7.9.2.tgz", - "integrity": "sha512-A19wwYINuZwU2dUyQ/mMzB0ISjyfc4cISfL4zCMUAVgj7xVoXMYV2GfjNdMpA8Wsjch3su6pxLbtJ2wU03sRTQ==", + "node_modules/@polkadot/x-ws": { + "version": "12.6.2", + "resolved": "https://registry.npmjs.org/@polkadot/x-ws/-/x-ws-12.6.2.tgz", + "integrity": "sha512-cGZWo7K5eRRQCRl2LrcyCYsrc3lRbTlixZh3AzgU8uX4wASVGRlNWi/Hf4TtHNe1ExCDmxabJzdIsABIfrr7xw==", "dependencies": { - "@babel/runtime": "^7.16.3", - "@polkadot/x-global": "7.9.2" + "@polkadot/x-global": "12.6.2", + "tslib": "^2.6.2", + "ws": "^8.15.1" }, "engines": { - "node": ">=14.0.0" + "node": ">=18" } }, - "node_modules/@polkadot/x-textencoder/node_modules/@polkadot/x-global": { - "version": "7.9.2", - "resolved": "https://registry.npmjs.org/@polkadot/x-global/-/x-global-7.9.2.tgz", - "integrity": "sha512-JX5CrGWckHf1P9xKXq4vQCAuMUbL81l2hOWX7xeP8nv4caHEpmf5T1wD1iMdQBL5PFifo6Pg0V6/oZBB+bts7A==", - "dependencies": { - "@babel/runtime": "^7.16.3" - }, - "engines": { - "node": ">=14.0.0" + "node_modules/@scure/base": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.1.5.tgz", + "integrity": "sha512-Brj9FiG2W1MRQSTB212YVPRrcbjkv48FoZi/u4l/zds/ieRrqsh7aUf6CLwkAq61oKXr/ZlTzlY66gLIj3TFTQ==", + "funding": { + "url": "https://paulmillr.com/funding/" } }, - "node_modules/@polkadot/x-ws": { - "version": "8.7.1", - "resolved": "https://registry.npmjs.org/@polkadot/x-ws/-/x-ws-8.7.1.tgz", - "integrity": "sha512-Mt0tcNzGXyKnN3DQ06alkv+JLtTfXWu6zSypFrrKHSQe3u79xMQ1nSicmpT3gWLhIa8YF+8CYJXMrqaXgCnDhw==", + "node_modules/@substrate/connect": { + "version": "0.7.35", + "resolved": "https://registry.npmjs.org/@substrate/connect/-/connect-0.7.35.tgz", + "integrity": "sha512-Io8vkalbwaye+7yXfG1Nj52tOOoJln2bMlc7Q9Yy3vEWqZEVkgKmcPVzbwV0CWL3QD+KMPDA2Dnw/X7EdwgoLw==", + "hasInstallScript": true, + "optional": true, "dependencies": { - "@babel/runtime": "^7.17.8", - "@polkadot/x-global": "8.7.1", - "@types/websocket": "^1.0.5", - "websocket": "^1.0.34" - }, - "engines": { - "node": ">=14.0.0" + "@substrate/connect-extension-protocol": "^1.0.1", + "smoldot": "2.0.7" } }, - "node_modules/@scure/base": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.0.0.tgz", - "integrity": "sha512-gIVaYhUsy+9s58m/ETjSJVKHhKTBMmcRb9cEV5/5dwvfDlfORjKrFsDeDHWRrm6RjcPvCLZFwGJjAjLj1gg4HA==", - "funding": [ - { - "type": "individual", - "url": "https://paulmillr.com/funding/" - } - ] + "node_modules/@substrate/connect-extension-protocol": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@substrate/connect-extension-protocol/-/connect-extension-protocol-1.0.1.tgz", + "integrity": "sha512-161JhCC1csjH3GE5mPLEd7HbWtwNSPJBg3p1Ksz9SFlTzj/bgEwudiRN2y5i0MoLGCIJRYKyKGMxVnd29PzNjg==", + "optional": true }, "node_modules/@substrate/ss58-registry": { - "version": "1.38.0", - "resolved": "https://registry.npmjs.org/@substrate/ss58-registry/-/ss58-registry-1.38.0.tgz", - "integrity": "sha512-sHiVRWekGMRZAjPukN9/W166NM6D5wtHcK6RVyLy66kg3CHNZ1BXfpXcjOiXSwhbd7guQFDEwnOVaDrbk1XL1g==" + "version": "1.44.0", + "resolved": "https://registry.npmjs.org/@substrate/ss58-registry/-/ss58-registry-1.44.0.tgz", + "integrity": "sha512-7lQ/7mMCzVNSEfDS4BCqnRnKCFKpcOaPrxMeGTXHX1YQzM/m2BBHjbK2C3dJvjv7GYxMiaTq/HdWQj1xS6ss+A==" }, "node_modules/@types/bn.js": { - "version": "4.11.6", - "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-4.11.6.tgz", - "integrity": "sha512-pqr857jrp2kPuO9uRjZ3PwnJTjoQy+fcdxvBTvHm6dkmEL9q+hDD/2j/0ELOBPtPnS8LjCX0gI9nbl8lVkadpg==", + "version": "5.1.5", + "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.5.tgz", + "integrity": "sha512-V46N0zwKRF5Q00AZ6hWtN0T8gGmDUaUzLWQvHFo5yThtVwK/VCenFY3wXVbOvNfajEpsTfQM4IN9k/d6gUVX3A==", "dependencies": { "@types/node": "*" } }, "node_modules/@types/node": { - "version": "18.11.18", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.18.tgz", - "integrity": "sha512-DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA==" - }, - "node_modules/@types/node-fetch": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.6.2.tgz", - "integrity": "sha512-DHqhlq5jeESLy19TYhLakJ07kNumXWjcDdxXsLUMJZ6ue8VZJj4kLPQVE/2mdHh3xZziNF1xppu5lwmS53HR+A==", + "version": "20.10.5", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.10.5.tgz", + "integrity": "sha512-nNPsNE65wjMxEKI93yOP+NPGGBJz/PoN3kZsVLee0XMiJolxSekEVD8wRwBUBqkwc7UWop0edW50yrCQW4CyRw==", "dependencies": { - "@types/node": "*", - "form-data": "^3.0.0" - } - }, - "node_modules/@types/websocket": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/@types/websocket/-/websocket-1.0.5.tgz", - "integrity": "sha512-NbsqiNX9CnEfC1Z0Vf4mE1SgAJ07JnRYcNex7AJ9zAVzmiGHmjKFEk7O4TJIsgv2B1sLEb6owKFZrACwdYngsQ==", - "dependencies": { - "@types/node": "*" + "undici-types": "~5.26.4" } }, - "node_modules/asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" - }, "node_modules/bn.js": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", - "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz", + "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==" }, - "node_modules/bufferutil": { - "version": "4.0.7", - "resolved": "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.7.tgz", - "integrity": "sha512-kukuqc39WOHtdxtw4UScxF/WVnMFVSQVKhtx3AjZJzhd0RGZZldcrfSEbVsWWe6KNH253574cq5F+wpv0G9pJw==", - "hasInstallScript": true, - "dependencies": { - "node-gyp-build": "^4.3.0" - }, + "node_modules/data-uri-to-buffer": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz", + "integrity": "sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==", "engines": { - "node": ">=6.14.2" + "node": ">= 12" } }, - "node_modules/camelcase": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", - "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/combined-stream": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", - "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "node_modules/debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", "dependencies": { - "delayed-stream": "~1.0.0" + "ms": "2.1.2" }, "engines": { - "node": ">= 0.8" - } - }, - "node_modules/d": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz", - "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==", - "dependencies": { - "es5-ext": "^0.10.50", - "type": "^1.0.1" + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } } }, - "node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "node_modules/eventemitter3": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz", + "integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==" + }, + "node_modules/fetch-blob": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/fetch-blob/-/fetch-blob-3.2.0.tgz", + "integrity": "sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/jimmywarting" + }, + { + "type": "paypal", + "url": "https://paypal.me/jimmywarting" + } + ], "dependencies": { - "ms": "2.0.0" - } - }, - "node_modules/delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", + "node-domexception": "^1.0.0", + "web-streams-polyfill": "^3.0.3" + }, "engines": { - "node": ">=0.4.0" + "node": "^12.20 || >= 14.13" } }, - "node_modules/ed2curve": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/ed2curve/-/ed2curve-0.3.0.tgz", - "integrity": "sha512-8w2fmmq3hv9rCrcI7g9hms2pMunQr1JINfcjwR9tAyZqhtyaMN991lF/ZfHfr5tzZQ8c7y7aBgZbjfbd0fjFwQ==", + "node_modules/formdata-polyfill": { + "version": "4.0.10", + "resolved": "https://registry.npmjs.org/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz", + "integrity": "sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==", "dependencies": { - "tweetnacl": "1.x.x" - } - }, - "node_modules/es5-ext": { - "version": "0.10.62", - "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.62.tgz", - "integrity": "sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==", - "hasInstallScript": true, - "dependencies": { - "es6-iterator": "^2.0.3", - "es6-symbol": "^3.1.3", - "next-tick": "^1.1.0" + "fetch-blob": "^3.1.2" }, "engines": { - "node": ">=0.10" - } - }, - "node_modules/es6-iterator": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz", - "integrity": "sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==", - "dependencies": { - "d": "1", - "es5-ext": "^0.10.35", - "es6-symbol": "^3.1.1" + "node": ">=12.20.0" } }, - "node_modules/es6-symbol": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz", - "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==", - "dependencies": { - "d": "^1.0.1", - "ext": "^1.1.2" - } + "node_modules/json-stringify-safe": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", + "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==" }, - "node_modules/eventemitter3": { - "version": "4.0.7", - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz", - "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==" - }, - "node_modules/ext": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/ext/-/ext-1.7.0.tgz", - "integrity": "sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==", - "dependencies": { - "type": "^2.7.2" + "node_modules/mock-socket": { + "version": "9.3.1", + "resolved": "https://registry.npmjs.org/mock-socket/-/mock-socket-9.3.1.tgz", + "integrity": "sha512-qxBgB7Qa2sEQgHFjj0dSigq7fX4k6Saisd5Nelwp2q8mlbAFh5dHV9JTTlF8viYJLSSWgMCZFUom8PJcMNBoJw==", + "engines": { + "node": ">= 8" } }, - "node_modules/ext/node_modules/type": { - "version": "2.7.2", - "resolved": "https://registry.npmjs.org/type/-/type-2.7.2.tgz", - "integrity": "sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==" + "node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, - "node_modules/form-data": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz", - "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==", + "node_modules/nock": { + "version": "13.4.0", + "resolved": "https://registry.npmjs.org/nock/-/nock-13.4.0.tgz", + "integrity": "sha512-W8NVHjO/LCTNA64yxAPHV/K47LpGYcVzgKd3Q0n6owhwvD0Dgoterc25R4rnZbckJEb6Loxz1f5QMuJpJnbSyQ==", "dependencies": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.8", - "mime-types": "^2.1.12" + "debug": "^4.1.0", + "json-stringify-safe": "^5.0.1", + "propagate": "^2.0.0" }, "engines": { - "node": ">= 6" - } - }, - "node_modules/ip-regex": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-4.3.0.tgz", - "integrity": "sha512-B9ZWJxHHOHUhUjCPrMpLD4xEq35bUTClHM1S6CBU5ixQnkZmwipwgc96vAd7AAGM9TGHvJR+Uss+/Ak6UphK+Q==", - "engines": { - "node": ">=8" + "node": ">= 10.13" } }, - "node_modules/is-typedarray": { + "node_modules/node-domexception": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", - "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==" - }, - "node_modules/mime-db": { - "version": "1.52.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", - "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/mime-types": { - "version": "2.1.35", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", - "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", - "dependencies": { - "mime-db": "1.52.0" - }, + "resolved": "https://registry.npmjs.org/node-domexception/-/node-domexception-1.0.0.tgz", + "integrity": "sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/jimmywarting" + }, + { + "type": "github", + "url": "https://paypal.me/jimmywarting" + } + ], "engines": { - "node": ">= 0.6" + "node": ">=10.5.0" } }, - "node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" - }, - "node_modules/next-tick": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz", - "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==" - }, "node_modules/node-fetch": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.9.tgz", - "integrity": "sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg==", + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.2.tgz", + "integrity": "sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==", "dependencies": { - "whatwg-url": "^5.0.0" + "data-uri-to-buffer": "^4.0.0", + "fetch-blob": "^3.1.4", + "formdata-polyfill": "^4.0.10" }, "engines": { - "node": "4.x || >=6.0.0" - }, - "peerDependencies": { - "encoding": "^0.1.0" + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" }, - "peerDependenciesMeta": { - "encoding": { - "optional": true - } + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/node-fetch" } }, - "node_modules/node-gyp-build": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.6.0.tgz", - "integrity": "sha512-NTZVKn9IylLwUzaKjkas1e4u2DLNcV4rdYagA4PWdPwW87Bi7z+BznyKSRwS/761tV/lzCGXplWsiaMjLqP2zQ==", - "bin": { - "node-gyp-build": "bin.js", - "node-gyp-build-optional": "optional.js", - "node-gyp-build-test": "build-test.js" + "node_modules/propagate": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/propagate/-/propagate-2.0.1.tgz", + "integrity": "sha512-vGrhOavPSTz4QVNuBNdcNXePNdNMaO1xj9yBeH1ScQPjk/rhg9sSlCXPhMkFuaNNW/syTvYqsnbIJxMBfRbbag==", + "engines": { + "node": ">= 8" } }, - "node_modules/regenerator-runtime": { - "version": "0.13.11", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz", - "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==" - }, "node_modules/rxjs": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.0.tgz", - "integrity": "sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg==", + "version": "7.8.1", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz", + "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==", "dependencies": { "tslib": "^2.1.0" } }, - "node_modules/tr46": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" - }, - "node_modules/tslib": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz", - "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==" - }, - "node_modules/tweetnacl": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.3.tgz", - "integrity": "sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw==" - }, - "node_modules/type": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz", - "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==" - }, - "node_modules/typedarray-to-buffer": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", - "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==", + "node_modules/smoldot": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/smoldot/-/smoldot-2.0.7.tgz", + "integrity": "sha512-VAOBqEen6vises36/zgrmAT1GWk2qE3X8AGnO7lmQFdskbKx8EovnwS22rtPAG+Y1Rk23/S22kDJUdPANyPkBA==", + "optional": true, "dependencies": { - "is-typedarray": "^1.0.0" + "ws": "^8.8.1" } }, - "node_modules/utf-8-validate": { - "version": "5.0.10", - "resolved": "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.10.tgz", - "integrity": "sha512-Z6czzLq4u8fPOyx7TU6X3dvUZVvoJmxSQ+IcrlmagKhilxlhZgxPK6C5Jqbkw1IDUmFTM+cz9QDnnLTwDz/2gQ==", - "hasInstallScript": true, - "dependencies": { - "node-gyp-build": "^4.3.0" - }, - "engines": { - "node": ">=6.14.2" - } + "node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" }, - "node_modules/webidl-conversions": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" + "node_modules/undici-types": { + "version": "5.26.5", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", + "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==" }, - "node_modules/websocket": { - "version": "1.0.34", - "resolved": "https://registry.npmjs.org/websocket/-/websocket-1.0.34.tgz", - "integrity": "sha512-PRDso2sGwF6kM75QykIesBijKSVceR6jL2G8NGYyq2XrItNC2P5/qL5XeR056GhA+Ly7JMFvJb9I312mJfmqnQ==", - "dependencies": { - "bufferutil": "^4.0.1", - "debug": "^2.2.0", - "es5-ext": "^0.10.50", - "typedarray-to-buffer": "^3.1.5", - "utf-8-validate": "^5.0.2", - "yaeti": "^0.0.6" - }, + "node_modules/web-streams-polyfill": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.2.1.tgz", + "integrity": "sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q==", "engines": { - "node": ">=4.0.0" + "node": ">= 8" } }, - "node_modules/whatwg-url": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", - "dependencies": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" - } - }, - "node_modules/yaeti": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/yaeti/-/yaeti-0.0.6.tgz", - "integrity": "sha512-MvQa//+KcZCUkBTIC9blM+CU9J2GzuTytsOUwf2lidtvkx/6gnEp1QvJv34t9vdjhFmha/mUiNDbN0D0mJWdug==", + "node_modules/ws": { + "version": "8.16.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.16.0.tgz", + "integrity": "sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==", "engines": { - "node": ">=0.10.32" + "node": ">=10.0.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": ">=5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } } } } diff --git a/cumulus/scripts/generate_hex_encoded_call/package.json b/cumulus/scripts/generate_hex_encoded_call/package.json index 1c68924db244..ecf0a2483db1 100644 --- a/cumulus/scripts/generate_hex_encoded_call/package.json +++ b/cumulus/scripts/generate_hex_encoded_call/package.json @@ -5,7 +5,7 @@ "main": "index.js", "license": "MIT", "dependencies": { - "@polkadot/api": "^6.5.2", - "@polkadot/util": "^7.6.1" + "@polkadot/api": "^10.11", + "@polkadot/util": "^12.6" } } From 0a25a83da9c5e3dd4af770df68d5d58bcb3c1703 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Thu, 28 Dec 2023 15:41:43 +0300 Subject: [PATCH 63/86] remove unneeded file --- .dockerignore | 1 - 1 file changed, 1 deletion(-) delete mode 100644 .dockerignore diff --git a/.dockerignore b/.dockerignore deleted file mode 100644 index eb5a316cbd19..000000000000 --- a/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -target From d61b5bcc63a5d7946d97db66e67fee5530e3cbb1 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Thu, 28 Dec 2023 15:42:50 +0300 Subject: [PATCH 64/86] remove unneeded file --- bridges/zombienet/test.js | 30 ------------------------------ 1 file changed, 30 deletions(-) delete mode 100644 bridges/zombienet/test.js diff --git a/bridges/zombienet/test.js b/bridges/zombienet/test.js deleted file mode 100644 index be8707a60dc6..000000000000 --- a/bridges/zombienet/test.js +++ /dev/null @@ -1,30 +0,0 @@ -#!node -const { WsProvider, ApiPromise } = require("@polkadot/api"); -const util = require("@polkadot/util"); - -async function connect(endpoint, types = {}) { - const provider = new WsProvider(endpoint); - const api = await ApiPromise.create({ - provider, - types: {/* - HeaderId: { - number: "u32", - hash: "H256" - }*/ - }, - throwOnConnect: false, - }); - return api; -} - -async function test() { - const api = await connect("ws://127.0.0.1:9910"); - - const accountAddress = "5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY"; - const accountData = await api.query.system.account(accountAddress); - console.log(accountData.data['free']); - console.log(accountData.data['free'] > 0); - console.log(accountData.data['free'] < 0xFFFF); -} - -test() \ No newline at end of file From 228bc1b52252a0b96c949f5fd289c7df14cb9584 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Thu, 28 Dec 2023 15:43:04 +0300 Subject: [PATCH 65/86] uncomment test changes to publish.yml --- .gitlab/pipeline/publish.yml | 156 +++++++++++++++++------------------ 1 file changed, 78 insertions(+), 78 deletions(-) diff --git a/.gitlab/pipeline/publish.yml b/.gitlab/pipeline/publish.yml index b3123c1d50f2..a5e32bd64300 100644 --- a/.gitlab/pipeline/publish.yml +++ b/.gitlab/pipeline/publish.yml @@ -91,84 +91,84 @@ publish-rustdoc: after_script: - buildah logout --all -#build-push-image-polkadot-parachain-debug: -# stage: publish -# extends: -# - .kubernetes-env -# - .common-refs -# - .build-push-image -# needs: -# - job: build-linux-stable-cumulus -# artifacts: true -# variables: -# DOCKERFILE: "docker/dockerfiles/polkadot-parachain/polkadot-parachain-debug_unsigned_injected.Dockerfile" -# IMAGE_NAME: "docker.io/paritypr/polkadot-parachain-debug" -# -#build-push-image-test-parachain: -# stage: publish -# extends: -# - .kubernetes-env -# - .common-refs -# - .build-push-image -# needs: -# - job: build-test-parachain -# artifacts: true -# variables: -# DOCKERFILE: "docker/dockerfiles/test-parachain_injected.Dockerfile" -# IMAGE_NAME: "docker.io/paritypr/test-parachain" -# -#build-push-image-polkadot-debug: -# stage: publish -# extends: -# - .kubernetes-env -# - .common-refs -# - .build-push-image -# needs: -# - job: build-linux-stable -# artifacts: true -# variables: -# DOCKERFILE: "docker/dockerfiles/polkadot/polkadot_injected_debug.Dockerfile" -# IMAGE_NAME: "docker.io/paritypr/polkadot-debug" -# -#build-push-image-colander: -# stage: publish -# extends: -# - .kubernetes-env -# - .common-refs -# - .build-push-image -# needs: -# - job: build-test-collators -# artifacts: true -# variables: -# DOCKERFILE: "docker/dockerfiles/collator_injected.Dockerfile" -# IMAGE_NAME: "docker.io/paritypr/colander" -# -#build-push-image-malus: -# stage: publish -# extends: -# - .kubernetes-env -# - .common-refs -# - .build-push-image -# needs: -# - job: build-malus -# artifacts: true -# variables: -# DOCKERFILE: "docker/dockerfiles/malus_injected.Dockerfile" -# IMAGE_NAME: "docker.io/paritypr/malus" -# -#build-push-image-substrate-pr: -# stage: publish -# extends: -# - .kubernetes-env -# - .common-refs -# - .build-push-image -# needs: -# - job: build-linux-substrate -# artifacts: true -# variables: -# DOCKERFILE: "docker/dockerfiles/substrate_injected.Dockerfile" -# IMAGE_NAME: "docker.io/paritypr/substrate" -# +build-push-image-polkadot-parachain-debug: + stage: publish + extends: + - .kubernetes-env + - .common-refs + - .build-push-image + needs: + - job: build-linux-stable-cumulus + artifacts: true + variables: + DOCKERFILE: "docker/dockerfiles/polkadot-parachain/polkadot-parachain-debug_unsigned_injected.Dockerfile" + IMAGE_NAME: "docker.io/paritypr/polkadot-parachain-debug" + +build-push-image-test-parachain: + stage: publish + extends: + - .kubernetes-env + - .common-refs + - .build-push-image + needs: + - job: build-test-parachain + artifacts: true + variables: + DOCKERFILE: "docker/dockerfiles/test-parachain_injected.Dockerfile" + IMAGE_NAME: "docker.io/paritypr/test-parachain" + +build-push-image-polkadot-debug: + stage: publish + extends: + - .kubernetes-env + - .common-refs + - .build-push-image + needs: + - job: build-linux-stable + artifacts: true + variables: + DOCKERFILE: "docker/dockerfiles/polkadot/polkadot_injected_debug.Dockerfile" + IMAGE_NAME: "docker.io/paritypr/polkadot-debug" + +build-push-image-colander: + stage: publish + extends: + - .kubernetes-env + - .common-refs + - .build-push-image + needs: + - job: build-test-collators + artifacts: true + variables: + DOCKERFILE: "docker/dockerfiles/collator_injected.Dockerfile" + IMAGE_NAME: "docker.io/paritypr/colander" + +build-push-image-malus: + stage: publish + extends: + - .kubernetes-env + - .common-refs + - .build-push-image + needs: + - job: build-malus + artifacts: true + variables: + DOCKERFILE: "docker/dockerfiles/malus_injected.Dockerfile" + IMAGE_NAME: "docker.io/paritypr/malus" + +build-push-image-substrate-pr: + stage: publish + extends: + - .kubernetes-env + - .common-refs + - .build-push-image + needs: + - job: build-linux-substrate + artifacts: true + variables: + DOCKERFILE: "docker/dockerfiles/substrate_injected.Dockerfile" + IMAGE_NAME: "docker.io/paritypr/substrate" + build-push-image-bridges-zombienet-tests: stage: publish extends: From cbe832d0d1da12b8a3056bb33109e608d55b6ea2 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Thu, 28 Dec 2023 15:43:49 +0300 Subject: [PATCH 66/86] remove unneeded files --- bridges/zombienet/Dockerfile | 60 ------------------------------- bridges/zombienet/build-docker.sh | 5 --- 2 files changed, 65 deletions(-) delete mode 100644 bridges/zombienet/Dockerfile delete mode 100755 bridges/zombienet/build-docker.sh diff --git a/bridges/zombienet/Dockerfile b/bridges/zombienet/Dockerfile deleted file mode 100644 index 78e3a8b96a48..000000000000 --- a/bridges/zombienet/Dockerfile +++ /dev/null @@ -1,60 +0,0 @@ -# build me from the project root using -# docker build -f bridges/zombienet/Dockerfile ./target/release - -ARG DEBIAN_CODENAME=bullseye - -FROM paritytech/substrate-relay:v2023-11-07-rococo-westend-initial-relayer as relay -FROM paritypr/polkadot-debug:4ccd3fae58c406c2698198075d5e3c65d95708ee as polkadot -FROM paritypr/polkadot-parachain-debug:07127dea7fc0dcceca0c14e2f7081625eb24333b as polkadot-parachain - -FROM docker.io/paritytech/zombienet:v1.3.79 - -USER root -WORKDIR /home/root - -# install tools and dependencies -RUN set -eux; \ - apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 15CF4D18AF4F7421; \ - apt-get -y update; \ - apt-get install -y --no-install-recommends \ - libssl-dev make cmake graphviz \ - git pkg-config curl time rhash ca-certificates jq \ - python3 python3-pip lsof ruby ruby-bundler git-restore-mtime xz-utils zstd unzip gnupg protobuf-compiler && \ -# add clang 14 repo - echo "deb http://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-14 main" >> /etc/apt/sources.list.d/llvm-toolchain-bullseye-14.list; \ - echo "deb-src http://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-14 main" >> /etc/apt/sources.list.d/llvm-toolchain-bullseye-14.list; \ - apt-get -y update; \ - apt-get install -y --no-install-recommends \ - clang-14 lldb-14 lld-14 libclang-14-dev - - -COPY --from=relay /home/user/substrate-relay /home/nonroot/local_bridge_testing/bin/substrate-relay -COPY --from=polkadot /usr/local/bin/polkadot /home/nonroot/polkadot-sdk/target/release/polkadot -COPY --from=polkadot /usr/local/bin/polkadot-execute-worker /home/nonroot/polkadot-sdk/target/release/polkadot-execute-worker -COPY --from=polkadot /usr/local/bin/polkadot-prepare-worker /home/nonroot/polkadot-sdk/target/release/polkadot-prepare-worker -COPY --from=polkadot-parachain /usr/local/bin/polkadot-parachain /home/nonroot/polkadot-sdk/target/release/polkadot-parachain - -#COPY artifacts/polkadot-parachain /home/nonroot/polkadot-sdk/target/release/polkadot-parachain -#COPY artifacts/polkadot /home/nonroot/polkadot-sdk/target/release/polkadot - -COPY cumulus/scripts /home/nonroot/polkadot-sdk/cumulus/scripts -COPY cumulus/zombienet /home/nonroot/polkadot-sdk/cumulus/zombienet - -COPY helpers /home/nonroot/polkadot-sdk/bridges/zombienet/helpers -COPY scripts /home/nonroot/polkadot-sdk/bridges/zombienet/scripts -COPY tests /home/nonroot/polkadot-sdk/bridges/zombienet/tests -COPY run-tests.sh /home/nonroot/polkadot-sdk/bridges/zombienet - -RUN set -eux; \ - pushd /home/nonroot/polkadot-sdk/cumulus/scripts/generate_hex_encoded_call; \ - npm install; \ - popd - -# https://polkadot.js.org/apps/?rpc=ws://127.0.0.1:{PORT}#/explorer -EXPOSE 9942 9910 8943 9945 9010 8945 - -USER nonroot - -#ENTRYPOINT ["/home/nonroot/polkadot-sdk/target/release/polkadot"] -#ENTRYPOINT ["ls", "-la", "/usr/local/bin/"] -ENTRYPOINT ["/home/nonroot/polkadot-sdk/bridges/zombienet/run-tests.sh"] diff --git a/bridges/zombienet/build-docker.sh b/bridges/zombienet/build-docker.sh deleted file mode 100755 index 9fcf476055a0..000000000000 --- a/bridges/zombienet/build-docker.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -set -eux -CONTEXT=`dirname "$0"` -docker build -f $CONTEXT/Dockerfile $CONTEXT -t bzn -docker run -it -p 9942:9942 -p 9910:9910 -p 8943:8943 -p 9945:9945 -p 9010:9010 -p 8945:8945 bzn From 7cb918909398072d5fcadeb5c6720305888a926f Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Thu, 28 Dec 2023 16:18:28 +0300 Subject: [PATCH 67/86] revert commented lines from zombienet.yml --- .gitlab/pipeline/zombienet.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab/pipeline/zombienet.yml b/.gitlab/pipeline/zombienet.yml index 2ead38afa7b6..50a15f026c86 100644 --- a/.gitlab/pipeline/zombienet.yml +++ b/.gitlab/pipeline/zombienet.yml @@ -4,11 +4,11 @@ ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.3.86" include: -# # substrate tests -# - .gitlab/pipeline/zombienet/substrate.yml -# # cumulus tests -# - .gitlab/pipeline/zombienet/cumulus.yml -# # polkadot tests -# - .gitlab/pipeline/zombienet/polkadot.yml + # substrate tests + - .gitlab/pipeline/zombienet/substrate.yml + # cumulus tests + - .gitlab/pipeline/zombienet/cumulus.yml + # polkadot tests + - .gitlab/pipeline/zombienet/polkadot.yml # bridges tests - .gitlab/pipeline/zombienet/bridges.yml \ No newline at end of file From c1743e889b58f5a394409e4d131043df84614ed2 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Fri, 29 Dec 2023 11:56:44 +0300 Subject: [PATCH 68/86] revert unneeded change --- bridges/zombienet/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bridges/zombienet/README.md b/bridges/zombienet/README.md index 8b037d47d15b..b601154b624c 100644 --- a/bridges/zombienet/README.md +++ b/bridges/zombienet/README.md @@ -21,7 +21,7 @@ To start those tests, you need to: - build Substrate relay by running `cargo build -p substrate-relay --release` command in the [`parity-bridges-common`](https://github.com/paritytech/parity-bridges-common) repository clone. -- copy fresh `substrate-relay` binary, built in previous point, to the `/usr/local/bin/substrate-relay`; +- copy fresh `substrate-relay` binary, built in previous point, to the `~/local_bridge_testing/bin/substrate-relay`; - change the `POLKADOT_SDK_FOLDER` and `ZOMBIENET_BINARY_PATH` (and ensure that the nearby variables have correct values) in the `./run-tests.sh`. From 1ce62ecf057591123df3f59fb12253136b8c52c0 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Fri, 29 Dec 2023 11:56:52 +0300 Subject: [PATCH 69/86] revert unneeded logs --- bridges/zombienet/run-tests.sh | 40 ---------------------------------- 1 file changed, 40 deletions(-) diff --git a/bridges/zombienet/run-tests.sh b/bridges/zombienet/run-tests.sh index f5f0057be1f1..e464ae12dd74 100755 --- a/bridges/zombienet/run-tests.sh +++ b/bridges/zombienet/run-tests.sh @@ -115,46 +115,6 @@ do echo "=====================================================================" echo $coproc_stdout - echo "===" - echo $TEST_PREFIX - - for file in /tmp/zombie*/logs/* ; do - echo $file - head $file - done - - echo "===" - - for file in /tmp/zombie*/*/* ; do - echo $file - head $file - done - - echo "===" - - for file in /tmp/bridges-zombie*/* ; do - echo $file - head $file - done - - echo "===" - - for file in /tmp/bridges-zombie*/* ; do - echo $file - head $file - done - - for file in /tmp/polkadot.*/* ; do - echo $file - head $file - cat $file | grep -E 'ERROR|WARN|rror|arn|ail|xcm' -C10 - done - for file in /tmp/polkadot-parachain.*/* ; do - echo $file - head $file - cat $file | grep -E 'ERROR|WARN|rror|arn|ail|xcm' -C10 - done - exit 1 fi From ab42c1d0660f0743af866908a1ca0c48dfb4130e Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Fri, 29 Dec 2023 11:57:32 +0300 Subject: [PATCH 70/86] revert on_exit changes --- bridges/zombienet/run-tests.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/bridges/zombienet/run-tests.sh b/bridges/zombienet/run-tests.sh index e464ae12dd74..6119a5983d1a 100755 --- a/bridges/zombienet/run-tests.sh +++ b/bridges/zombienet/run-tests.sh @@ -3,9 +3,7 @@ set -x shopt -s nullglob -#trap "trap - SIGINT SIGTERM EXIT && kill -- -$$" SIGINT SIGTERM EXIT -#trap "exit" INT TERM -#trap "kill -9 0" EXIT +trap "trap - SIGINT SIGTERM EXIT && kill -- -$$" SIGINT SIGTERM EXIT # assuming that we'll be using native provide && all processes will be executing locally # (we need absolute paths here, because they're used when scripts are called by zombienet from tmp folders) From 523c0a4a280632222a49d148124f8f0d5e11e666 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Fri, 29 Dec 2023 12:45:10 +0300 Subject: [PATCH 71/86] --zombienet flag --- .gitlab/pipeline/zombienet/bridges.yml | 2 +- bridges/zombienet/run-tests.sh | 57 ++++++++++++++++++-------- 2 files changed, 40 insertions(+), 19 deletions(-) diff --git a/.gitlab/pipeline/zombienet/bridges.yml b/.gitlab/pipeline/zombienet/bridges.yml index 784ceb6f04b4..887c1486f8af 100644 --- a/.gitlab/pipeline/zombienet/bridges.yml +++ b/.gitlab/pipeline/zombienet/bridges.yml @@ -51,5 +51,5 @@ run-zombienet-bridges-tests: extends: - .zombienet-bridges-common script: - - /home/nonroot/bridges-polkadot-sdk/bridges/zombienet/run-tests.sh + - /home/nonroot/bridges-polkadot-sdk/bridges/zombienet/run-tests.sh --zombienet - echo "Done" diff --git a/bridges/zombienet/run-tests.sh b/bridges/zombienet/run-tests.sh index 6119a5983d1a..3188c33694bb 100755 --- a/bridges/zombienet/run-tests.sh +++ b/bridges/zombienet/run-tests.sh @@ -5,29 +5,50 @@ shopt -s nullglob trap "trap - SIGINT SIGTERM EXIT && kill -- -$$" SIGINT SIGTERM EXIT +# whether to use paths for zombienet+bridges tests container or for local testing +ZOMBIENET_DOCKER_PATHS=0 +while [ $# -ne 0 ] +do + arg="$1" + case "$arg" in + --zombienet) + ZOMBIENET_DOCKER_PATHS=1 + ;; + esac + shift +done + # assuming that we'll be using native provide && all processes will be executing locally # (we need absolute paths here, because they're used when scripts are called by zombienet from tmp folders) export POLKADOT_SDK_FOLDER=`realpath $(dirname "$0")/../..` export BRIDGE_TESTS_FOLDER=$POLKADOT_SDK_FOLDER/bridges/zombienet/tests -# for CI: -export POLKADOT_BINARY_PATH=/usr/local/bin/polkadot -export POLKADOT_PARACHAIN_BINARY_PATH=/usr/local/bin/polkadot-parachain -export POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_ROCOCO=/usr/local/bin/polkadot-parachain -export POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_WESTEND=/usr/local/bin/polkadot-parachain -export ZOMBIENET_BINARY_PATH=/usr/local/bin/zombie - -export POLKADOT_BINARY_PATH=/home/nonroot/bridges-polkadot-sdk/bridges/zombienet/scripts/polkadot-x.sh -export POLKADOT_PARACHAIN_BINARY_PATH=/home/nonroot/bridges-polkadot-sdk/bridges/zombienet/scripts/polkadot-parachain-x.sh -export POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_ROCOCO=/home/nonroot/bridges-polkadot-sdk/bridges/zombienet/scripts/polkadot-parachain-x.sh -export POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_WESTEND=/home/nonroot/bridges-polkadot-sdk/bridges/zombienet/scripts/polkadot-parachain-x.sh - -# for local tests: -#export POLKADOT_BINARY_PATH=$POLKADOT_SDK_FOLDER/target/release/polkadot -#export POLKADOT_PARACHAIN_BINARY_PATH=$POLKADOT_SDK_FOLDER/target/release/polkadot-parachain -#export POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_ROCOCO=$POLKADOT_PARACHAIN_BINARY_PATH -#export POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_WESTEND=$POLKADOT_PARACHAIN_BINARY_PATH -#export ZOMBIENET_BINARY_PATH=~/local_bridge_testing/bin/zombienet-linux +# set pathc to binaries +if [ "$ZOMBIENET_DOCKER_PATHS" -eq 1 ]; then + # normally we would use this: + # + #export POLKADOT_BINARY_PATH=/usr/local/bin/polkadot + #export POLKADOT_PARACHAIN_BINARY_PATH=/usr/local/bin/polkadot-parachain + #export POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_ROCOCO=/usr/local/bin/polkadot-parachain + #export POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_WESTEND=/usr/local/bin/polkadot-parachain + # + # but then tests fail in 90% of starts at CI with "At least one of the nodes fails to start". + # When using a dummy script that just passes all its arguments to the binary, everything is ok. So: + # + export POLKADOT_BINARY_PATH=/home/nonroot/bridges-polkadot-sdk/bridges/zombienet/scripts/polkadot-x.sh + export POLKADOT_PARACHAIN_BINARY_PATH=/home/nonroot/bridges-polkadot-sdk/bridges/zombienet/scripts/polkadot-parachain-x.sh + export POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_ROCOCO=/home/nonroot/bridges-polkadot-sdk/bridges/zombienet/scripts/polkadot-parachain-x.sh + export POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_WESTEND=/home/nonroot/bridges-polkadot-sdk/bridges/zombienet/scripts/polkadot-parachain-x.sh + + export ZOMBIENET_BINARY_PATH=/usr/local/bin/zombie +else + export POLKADOT_BINARY_PATH=$POLKADOT_SDK_FOLDER/target/release/polkadot + export POLKADOT_PARACHAIN_BINARY_PATH=$POLKADOT_SDK_FOLDER/target/release/polkadot-parachain + export POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_ROCOCO=$POLKADOT_PARACHAIN_BINARY_PATH + export POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_WESTEND=$POLKADOT_PARACHAIN_BINARY_PATH + + export ZOMBIENET_BINARY_PATH=~/local_bridge_testing/bin/zombienet-linux +fi # check if `wait` supports -p flag if [ `printf "$BASH_VERSION\n5.1" | sort -V | head -n 1` = "5.1" ]; then IS_BASH_5_1=1; else IS_BASH_5_1=0; fi From 96111d05a71f98814bbc496ae85e5de16dcb345b Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Fri, 29 Dec 2023 12:48:23 +0300 Subject: [PATCH 72/86] some strange change --- .gitlab/pipeline/zombienet/substrate.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab/pipeline/zombienet/substrate.yml b/.gitlab/pipeline/zombienet/substrate.yml index b1dd55462cde..b687576267de 100644 --- a/.gitlab/pipeline/zombienet/substrate.yml +++ b/.gitlab/pipeline/zombienet/substrate.yml @@ -33,7 +33,6 @@ expire_in: 2 days paths: - ./zombienet-logs - allow_failure: true after_script: - mkdir -p ./zombienet-logs - cp /tmp/zombie*/logs/* ./zombienet-logs/ From 558a9ee85342d4c4caadac61442bd3374cce4cf4 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Fri, 29 Dec 2023 14:23:19 +0300 Subject: [PATCH 73/86] customizable relay path --- bridges/zombienet/run-tests.sh | 2 ++ .../parachains/runtimes/bridge-hubs/README.md | 2 +- cumulus/scripts/bridges_common.sh | 24 +++++++------------ cumulus/scripts/bridges_rococo_westend.sh | 12 +++++----- 4 files changed, 18 insertions(+), 22 deletions(-) diff --git a/bridges/zombienet/run-tests.sh b/bridges/zombienet/run-tests.sh index 3188c33694bb..f2372fd8af0a 100755 --- a/bridges/zombienet/run-tests.sh +++ b/bridges/zombienet/run-tests.sh @@ -40,6 +40,7 @@ if [ "$ZOMBIENET_DOCKER_PATHS" -eq 1 ]; then export POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_ROCOCO=/home/nonroot/bridges-polkadot-sdk/bridges/zombienet/scripts/polkadot-parachain-x.sh export POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_WESTEND=/home/nonroot/bridges-polkadot-sdk/bridges/zombienet/scripts/polkadot-parachain-x.sh + export SUBSTRATE_RELAY_PATH=/usr/local/bin/substrate-relay export ZOMBIENET_BINARY_PATH=/usr/local/bin/zombie else export POLKADOT_BINARY_PATH=$POLKADOT_SDK_FOLDER/target/release/polkadot @@ -47,6 +48,7 @@ else export POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_ROCOCO=$POLKADOT_PARACHAIN_BINARY_PATH export POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_WESTEND=$POLKADOT_PARACHAIN_BINARY_PATH + export SUBSTRATE_RELAY_PATH=~/local_bridge_testing/bin/substrate-relay export ZOMBIENET_BINARY_PATH=~/local_bridge_testing/bin/zombienet-linux fi diff --git a/cumulus/parachains/runtimes/bridge-hubs/README.md b/cumulus/parachains/runtimes/bridge-hubs/README.md index c45322cfd2ed..cf617db730dd 100644 --- a/cumulus/parachains/runtimes/bridge-hubs/README.md +++ b/cumulus/parachains/runtimes/bridge-hubs/README.md @@ -69,7 +69,7 @@ cd parity-bridges-common git checkout -b polkadot-staging --track origin/polkadot-staging cargo build --release -p substrate-relay -cp target/release/substrate-relay /usr/local/bin/substrate-relay +cp target/release/substrate-relay ~/local_bridge_testing/bin/substrate-relay --- diff --git a/cumulus/scripts/bridges_common.sh b/cumulus/scripts/bridges_common.sh index 76f32a3db9c6..389aef77e66f 100755 --- a/cumulus/scripts/bridges_common.sh +++ b/cumulus/scripts/bridges_common.sh @@ -1,27 +1,21 @@ #!/bin/bash -function ensure_binaries() { - if [[ ! -f ~/local_bridge_testing/bin/polkadot ]]; then - echo " Required polkadot binary '~/local_bridge_testing/bin/polkadot' does not exist!" - echo " You need to build it and copy to this location!" - echo " Please, check ./parachains/runtimes/bridge-hubs/README.md (Prepare/Build/Deploy)" - exit 1 - fi - if [[ ! -f ~/local_bridge_testing/bin/polkadot-parachain ]]; then - echo " Required polkadot-parachain binary '~/local_bridge_testing/bin/polkadot-parachain' does not exist!" - echo " You need to build it and copy to this location!" - echo " Please, check ./parachains/runtimes/bridge-hubs/README.md (Prepare/Build/Deploy)" - exit 1 - fi +function relayer_path() { + local default_path="~/local_bridge_testing/bin/substrate-relay" + local path="${SUBSTRATE_RELAY_PATH:-$default_path}" + echo "$path" } function ensure_relayer() { - if [[ ! -f /usr/local/bin/substrate-relay ]]; then - echo " Required substrate-relay binary '/usr/local/bin/substrate-relay' does not exist!" + local path=$(relayer_path) + if [[ ! -f "$path" ]]; then + echo " Required substrate-relay binary '$path' does not exist!" echo " You need to build it and copy to this location!" echo " Please, check ./parachains/runtimes/bridge-hubs/README.md (Prepare/Build/Deploy)" exit 1 fi + + return $path } function ensure_polkadot_js_api() { diff --git a/cumulus/scripts/bridges_rococo_westend.sh b/cumulus/scripts/bridges_rococo_westend.sh index eda3ee3a16e8..597b2e3cbeea 100755 --- a/cumulus/scripts/bridges_rococo_westend.sh +++ b/cumulus/scripts/bridges_rococo_westend.sh @@ -132,10 +132,10 @@ LANE_ID="00000002" XCM_VERSION=3 function init_ro_wnd() { - ensure_relayer + local $relay_path=$(ensure_relayer) RUST_LOG=runtime=trace,rpc=trace,bridge=trace \ - /usr/local/bin/substrate-relay init-bridge rococo-to-bridge-hub-westend \ + $relay_path init-bridge rococo-to-bridge-hub-westend \ --source-host localhost \ --source-port 9942 \ --source-version-mode Auto \ @@ -146,10 +146,10 @@ function init_ro_wnd() { } function init_wnd_ro() { - ensure_relayer + local $relay_path=$(ensure_relayer) RUST_LOG=runtime=trace,rpc=trace,bridge=trace \ - /usr/local/bin/substrate-relay init-bridge westend-to-bridge-hub-rococo \ + $relay_path init-bridge westend-to-bridge-hub-rococo \ --source-host localhost \ --source-port 9945 \ --source-version-mode Auto \ @@ -160,10 +160,10 @@ function init_wnd_ro() { } function run_relay() { - ensure_relayer + local $relay_path=$(ensure_relayer) RUST_LOG=runtime=trace,rpc=trace,bridge=trace \ - /usr/local/bin/substrate-relay relay-headers-and-messages bridge-hub-rococo-bridge-hub-westend \ + $relay_path relay-headers-and-messages bridge-hub-rococo-bridge-hub-westend \ --rococo-host localhost \ --rococo-port 9942 \ --rococo-version-mode Auto \ From c12391c44b1b7730b4854c045e08b6cfb6ecec05 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Thu, 11 Jan 2024 12:59:29 +0300 Subject: [PATCH 74/86] fix paths --- cumulus/scripts/bridges_common.sh | 4 ++-- cumulus/scripts/bridges_rococo_westend.sh | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cumulus/scripts/bridges_common.sh b/cumulus/scripts/bridges_common.sh index 389aef77e66f..5d5b7b7a482a 100755 --- a/cumulus/scripts/bridges_common.sh +++ b/cumulus/scripts/bridges_common.sh @@ -1,7 +1,7 @@ #!/bin/bash function relayer_path() { - local default_path="~/local_bridge_testing/bin/substrate-relay" + local default_path=~/local_bridge_testing/bin/substrate-relay local path="${SUBSTRATE_RELAY_PATH:-$default_path}" echo "$path" } @@ -15,7 +15,7 @@ function ensure_relayer() { exit 1 fi - return $path + echo $path } function ensure_polkadot_js_api() { diff --git a/cumulus/scripts/bridges_rococo_westend.sh b/cumulus/scripts/bridges_rococo_westend.sh index 597b2e3cbeea..556ea46234e0 100755 --- a/cumulus/scripts/bridges_rococo_westend.sh +++ b/cumulus/scripts/bridges_rococo_westend.sh @@ -132,7 +132,7 @@ LANE_ID="00000002" XCM_VERSION=3 function init_ro_wnd() { - local $relay_path=$(ensure_relayer) + local relay_path=$(ensure_relayer) RUST_LOG=runtime=trace,rpc=trace,bridge=trace \ $relay_path init-bridge rococo-to-bridge-hub-westend \ @@ -146,7 +146,7 @@ function init_ro_wnd() { } function init_wnd_ro() { - local $relay_path=$(ensure_relayer) + local relay_path=$(ensure_relayer) RUST_LOG=runtime=trace,rpc=trace,bridge=trace \ $relay_path init-bridge westend-to-bridge-hub-rococo \ @@ -160,7 +160,7 @@ function init_wnd_ro() { } function run_relay() { - local $relay_path=$(ensure_relayer) + local relay_path=$(ensure_relayer) RUST_LOG=runtime=trace,rpc=trace,bridge=trace \ $relay_path relay-headers-and-messages bridge-hub-rococo-bridge-hub-westend \ From db93f6b2fbbf4a5bff3bb2f781028fefe512a7a2 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Thu, 11 Jan 2024 13:50:58 +0300 Subject: [PATCH 75/86] some fixes + polishing --- .gitlab/pipeline/publish.yml | 3 ++- .gitlab/pipeline/zombienet.yml | 2 +- .gitlab/pipeline/zombienet/bridges.yml | 2 +- bridges/zombienet/run-tests.sh | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitlab/pipeline/publish.yml b/.gitlab/pipeline/publish.yml index a5e32bd64300..137c893c477c 100644 --- a/.gitlab/pipeline/publish.yml +++ b/.gitlab/pipeline/publish.yml @@ -75,7 +75,6 @@ publish-rustdoc: # Dockertag should differ in a merge queue # TODO: test this # - if [[ $CI_COMMIT_REF_NAME == *"gh-readonly-queue"* ]]; export DOCKER_IMAGES_VERSION="${CI_COMMIT_SHORT_SHA}"; fi - - echo "${ZOMBIENET_IMAGE}" - $BUILDAH_COMMAND build --format=docker --build-arg VCS_REF="${CI_COMMIT_SHA}" @@ -169,6 +168,8 @@ build-push-image-substrate-pr: DOCKERFILE: "docker/dockerfiles/substrate_injected.Dockerfile" IMAGE_NAME: "docker.io/paritypr/substrate" +# unlike other images, bridges+zombienet image is based on Zombienet image that pulls required binaries +# from other fresh images (polkadot and cumulus) build-push-image-bridges-zombienet-tests: stage: publish extends: diff --git a/.gitlab/pipeline/zombienet.yml b/.gitlab/pipeline/zombienet.yml index 50a15f026c86..4b95c86c3c41 100644 --- a/.gitlab/pipeline/zombienet.yml +++ b/.gitlab/pipeline/zombienet.yml @@ -11,4 +11,4 @@ include: # polkadot tests - .gitlab/pipeline/zombienet/polkadot.yml # bridges tests - - .gitlab/pipeline/zombienet/bridges.yml \ No newline at end of file + - .gitlab/pipeline/zombienet/bridges.yml diff --git a/.gitlab/pipeline/zombienet/bridges.yml b/.gitlab/pipeline/zombienet/bridges.yml index 887c1486f8af..93372a8b8716 100644 --- a/.gitlab/pipeline/zombienet/bridges.yml +++ b/.gitlab/pipeline/zombienet/bridges.yml @@ -51,5 +51,5 @@ run-zombienet-bridges-tests: extends: - .zombienet-bridges-common script: - - /home/nonroot/bridges-polkadot-sdk/bridges/zombienet/run-tests.sh --zombienet + - /home/nonroot/bridges-polkadot-sdk/bridges/zombienet/run-tests.sh --docker - echo "Done" diff --git a/bridges/zombienet/run-tests.sh b/bridges/zombienet/run-tests.sh index f2372fd8af0a..482d5342905a 100755 --- a/bridges/zombienet/run-tests.sh +++ b/bridges/zombienet/run-tests.sh @@ -11,7 +11,7 @@ while [ $# -ne 0 ] do arg="$1" case "$arg" in - --zombienet) + --docker) ZOMBIENET_DOCKER_PATHS=1 ;; esac From 99e05195fc7033487d7645b2c29341176c0ef21d Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Thu, 11 Jan 2024 13:58:09 +0300 Subject: [PATCH 76/86] print /tmp --- .gitlab/pipeline/zombienet/bridges.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab/pipeline/zombienet/bridges.yml b/.gitlab/pipeline/zombienet/bridges.yml index 93372a8b8716..df10037e2c0f 100644 --- a/.gitlab/pipeline/zombienet/bridges.yml +++ b/.gitlab/pipeline/zombienet/bridges.yml @@ -37,6 +37,7 @@ - ./zombienet-logs after_script: - echo "Am I working???!!!" + - ls -R /tmp - mkdir -p ./zombienet-logs - cp /tmp/zombie*/logs/* ./zombienet-logs/ - cp /tmp/polkadot.*/* ./zombienet-logs/ From 811afb3b63bf59fb867a7f837264407f68a0b46f Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Thu, 11 Jan 2024 14:40:38 +0300 Subject: [PATCH 77/86] also play with after_script --- .gitlab/pipeline/zombienet/bridges.yml | 16 ++++++++++------ .../zombienet/scripts/polkadot-parachain-x.sh | 8 ++++---- bridges/zombienet/scripts/polkadot-x.sh | 8 ++++---- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/.gitlab/pipeline/zombienet/bridges.yml b/.gitlab/pipeline/zombienet/bridges.yml index df10037e2c0f..0d6e981a298e 100644 --- a/.gitlab/pipeline/zombienet/bridges.yml +++ b/.gitlab/pipeline/zombienet/bridges.yml @@ -36,14 +36,18 @@ paths: - ./zombienet-logs after_script: - - echo "Am I working???!!!" - - ls -R /tmp + - echo "Collecting logs" - mkdir -p ./zombienet-logs + # copy logs of tests runner (run-tests.sh) + - cp -r /tmp/bridges-zombienet-tests.*/tmp.*/tmp.* ./zombienet-logs/ + # copy logs of all nodes - cp /tmp/zombie*/logs/* ./zombienet-logs/ - - cp /tmp/polkadot.*/* ./zombienet-logs/ - - cp /tmp/polkadot-parachain.*/* ./zombienet-logs/ - - cp -r /tmp/bridges-zombienet-tests*/* ./zombienet-logs/ - - echo "Am I working???" + # copy logs of our polkadot binary wrapper (polkadot-x.sh) + - cp /tmp/polkadot.* ./zombienet-logs/ + # copy logs of our polkadot-parachain binary wrapper (polkadot-parachain-x.sh) + - cp /tmp/polkadot-parachain.* ./zombienet-logs/ + - echo "Collected logs" + - ls -R /tmp # retry: 2 # tags: # - zombienet-polkadot-integration-test diff --git a/bridges/zombienet/scripts/polkadot-parachain-x.sh b/bridges/zombienet/scripts/polkadot-parachain-x.sh index 729c215cd35b..156d53634812 100755 --- a/bridges/zombienet/scripts/polkadot-parachain-x.sh +++ b/bridges/zombienet/scripts/polkadot-parachain-x.sh @@ -1,7 +1,7 @@ #!/bin/bash ARGS="$@" -LOG_FILE=`mktemp -d /tmp/polkadot-parachain.XXXXX` +LOG_FILE=`mktemp /tmp/polkadot-parachain.XXXXX` BUILD_SPEC=0 while test $# -gt 0 do @@ -16,9 +16,9 @@ done if [ $BUILD_SPEC -eq 1 ]; then /usr/local/bin/polkadot-parachain $ARGS else - echo "Starting polkadot-parachain with arguments: $ARGS. Log: $LOG_FILE" >$LOG_FILE/log - /usr/local/bin/polkadot-parachain $ARGS 2>&1 | tee -a $LOG_FILE/log - echo "Stopping polkadot-parachain with arguments: $ARGS" >>$LOG_FILE/log + echo "Starting polkadot-parachain with arguments: $ARGS. Log: $LOG_FILE" >$LOG_FILE + /usr/local/bin/polkadot-parachain $ARGS 2>&1 | tee -a $LOG_FILE + echo "Stopping polkadot-parachain with arguments: $ARGS" >>$LOG_FILE fi diff --git a/bridges/zombienet/scripts/polkadot-x.sh b/bridges/zombienet/scripts/polkadot-x.sh index ecefd3043d87..d3002d5e0446 100755 --- a/bridges/zombienet/scripts/polkadot-x.sh +++ b/bridges/zombienet/scripts/polkadot-x.sh @@ -1,7 +1,7 @@ #!/bin/bash ARGS="$@" -LOG_FILE=`mktemp -d /tmp/polkadot.XXXXX` +LOG_FILE=`mktemp /tmp/polkadot.XXXXX` BUILD_SPEC=0 while test $# -gt 0 do @@ -16,7 +16,7 @@ done if [ $BUILD_SPEC -eq 1 ]; then /usr/local/bin/polkadot $ARGS else - echo "Starting polkadot with arguments: $ARGS. Log: $LOG_FILE" >$LOG_FILE/log - /usr/local/bin/polkadot $ARGS 2>&1 | tee -a $LOG_FILE/log - echo "Stopping polkadot with arguments: $ARGS" >>$LOG_FILE/log + echo "Starting polkadot with arguments: $ARGS. Log: $LOG_FILE" >$LOG_FILE + /usr/local/bin/polkadot $ARGS 2>&1 | tee -a $LOG_FILE + echo "Stopping polkadot with arguments: $ARGS" >>$LOG_FILE fi From 43c7c045a49b5a5997daabdae6878dd10ac80c3f Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Thu, 11 Jan 2024 15:22:53 +0300 Subject: [PATCH 78/86] revert commented code --- .gitlab/pipeline/zombienet/bridges.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab/pipeline/zombienet/bridges.yml b/.gitlab/pipeline/zombienet/bridges.yml index 0d6e981a298e..a662de1e5fab 100644 --- a/.gitlab/pipeline/zombienet/bridges.yml +++ b/.gitlab/pipeline/zombienet/bridges.yml @@ -48,9 +48,9 @@ - cp /tmp/polkadot-parachain.* ./zombienet-logs/ - echo "Collected logs" - ls -R /tmp -# retry: 2 -# tags: -# - zombienet-polkadot-integration-test + retry: 2 + tags: + - zombienet-polkadot-integration-test run-zombienet-bridges-tests: extends: From d57e18315b091b7e2e49bdca91fe05a22574408a Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Thu, 11 Jan 2024 15:26:14 +0300 Subject: [PATCH 79/86] also removed unneeded comments --- .gitlab/pipeline/zombienet/bridges.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitlab/pipeline/zombienet/bridges.yml b/.gitlab/pipeline/zombienet/bridges.yml index a662de1e5fab..422de8ccd50f 100644 --- a/.gitlab/pipeline/zombienet/bridges.yml +++ b/.gitlab/pipeline/zombienet/bridges.yml @@ -36,7 +36,6 @@ paths: - ./zombienet-logs after_script: - - echo "Collecting logs" - mkdir -p ./zombienet-logs # copy logs of tests runner (run-tests.sh) - cp -r /tmp/bridges-zombienet-tests.*/tmp.*/tmp.* ./zombienet-logs/ @@ -46,8 +45,6 @@ - cp /tmp/polkadot.* ./zombienet-logs/ # copy logs of our polkadot-parachain binary wrapper (polkadot-parachain-x.sh) - cp /tmp/polkadot-parachain.* ./zombienet-logs/ - - echo "Collected logs" - - ls -R /tmp retry: 2 tags: - zombienet-polkadot-integration-test From 3aafccb6226a13be05caf98af94d9bfffd4b46d2 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Thu, 11 Jan 2024 16:49:59 +0300 Subject: [PATCH 80/86] Revert "revert commented code" This reverts commit 43c7c045a49b5a5997daabdae6878dd10ac80c3f. --- .gitlab/pipeline/zombienet/bridges.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab/pipeline/zombienet/bridges.yml b/.gitlab/pipeline/zombienet/bridges.yml index 422de8ccd50f..b9ff586310fe 100644 --- a/.gitlab/pipeline/zombienet/bridges.yml +++ b/.gitlab/pipeline/zombienet/bridges.yml @@ -45,9 +45,9 @@ - cp /tmp/polkadot.* ./zombienet-logs/ # copy logs of our polkadot-parachain binary wrapper (polkadot-parachain-x.sh) - cp /tmp/polkadot-parachain.* ./zombienet-logs/ - retry: 2 - tags: - - zombienet-polkadot-integration-test +# retry: 2 +# tags: +# - zombienet-polkadot-integration-test run-zombienet-bridges-tests: extends: From 370b4ceb6947dc4a0f7934dda40c01fd79339108 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Thu, 11 Jan 2024 17:44:09 +0300 Subject: [PATCH 81/86] trigger CI --- bridges/zombienet/scripts/polkadot-x.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/bridges/zombienet/scripts/polkadot-x.sh b/bridges/zombienet/scripts/polkadot-x.sh index d3002d5e0446..5fb9b32842ca 100755 --- a/bridges/zombienet/scripts/polkadot-x.sh +++ b/bridges/zombienet/scripts/polkadot-x.sh @@ -20,3 +20,4 @@ else /usr/local/bin/polkadot $ARGS 2>&1 | tee -a $LOG_FILE echo "Stopping polkadot with arguments: $ARGS" >>$LOG_FILE fi + From 86906f20cde44f651b4284479588bd84df582bd3 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Fri, 12 Jan 2024 11:36:48 +0300 Subject: [PATCH 82/86] try to use regular binaries now? --- bridges/zombienet/run-tests.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/bridges/zombienet/run-tests.sh b/bridges/zombienet/run-tests.sh index 482d5342905a..a875bf1994b0 100755 --- a/bridges/zombienet/run-tests.sh +++ b/bridges/zombienet/run-tests.sh @@ -27,18 +27,18 @@ export BRIDGE_TESTS_FOLDER=$POLKADOT_SDK_FOLDER/bridges/zombienet/tests if [ "$ZOMBIENET_DOCKER_PATHS" -eq 1 ]; then # normally we would use this: # - #export POLKADOT_BINARY_PATH=/usr/local/bin/polkadot - #export POLKADOT_PARACHAIN_BINARY_PATH=/usr/local/bin/polkadot-parachain - #export POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_ROCOCO=/usr/local/bin/polkadot-parachain - #export POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_WESTEND=/usr/local/bin/polkadot-parachain + export POLKADOT_BINARY_PATH=/usr/local/bin/polkadot + export POLKADOT_PARACHAIN_BINARY_PATH=/usr/local/bin/polkadot-parachain + export POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_ROCOCO=/usr/local/bin/polkadot-parachain + export POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_WESTEND=/usr/local/bin/polkadot-parachain # # but then tests fail in 90% of starts at CI with "At least one of the nodes fails to start". # When using a dummy script that just passes all its arguments to the binary, everything is ok. So: # - export POLKADOT_BINARY_PATH=/home/nonroot/bridges-polkadot-sdk/bridges/zombienet/scripts/polkadot-x.sh - export POLKADOT_PARACHAIN_BINARY_PATH=/home/nonroot/bridges-polkadot-sdk/bridges/zombienet/scripts/polkadot-parachain-x.sh - export POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_ROCOCO=/home/nonroot/bridges-polkadot-sdk/bridges/zombienet/scripts/polkadot-parachain-x.sh - export POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_WESTEND=/home/nonroot/bridges-polkadot-sdk/bridges/zombienet/scripts/polkadot-parachain-x.sh + #export POLKADOT_BINARY_PATH=/home/nonroot/bridges-polkadot-sdk/bridges/zombienet/scripts/polkadot-x.sh + #export POLKADOT_PARACHAIN_BINARY_PATH=/home/nonroot/bridges-polkadot-sdk/bridges/zombienet/scripts/polkadot-parachain-x.sh + #export POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_ROCOCO=/home/nonroot/bridges-polkadot-sdk/bridges/zombienet/scripts/polkadot-parachain-x.sh + #export POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_WESTEND=/home/nonroot/bridges-polkadot-sdk/bridges/zombienet/scripts/polkadot-parachain-x.sh export SUBSTRATE_RELAY_PATH=/usr/local/bin/substrate-relay export ZOMBIENET_BINARY_PATH=/usr/local/bin/zombie From c4ba86f47ec3fd732447dc066fc420eb92726027 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Fri, 12 Jan 2024 12:11:06 +0300 Subject: [PATCH 83/86] ok, found the bad guy --- bridges/zombienet/run-tests.sh | 10 -------- .../zombienet/scripts/polkadot-parachain-x.sh | 25 ------------------- bridges/zombienet/scripts/polkadot-x.sh | 23 ----------------- 3 files changed, 58 deletions(-) delete mode 100755 bridges/zombienet/scripts/polkadot-parachain-x.sh delete mode 100755 bridges/zombienet/scripts/polkadot-x.sh diff --git a/bridges/zombienet/run-tests.sh b/bridges/zombienet/run-tests.sh index a875bf1994b0..34487e13261f 100755 --- a/bridges/zombienet/run-tests.sh +++ b/bridges/zombienet/run-tests.sh @@ -25,20 +25,10 @@ export BRIDGE_TESTS_FOLDER=$POLKADOT_SDK_FOLDER/bridges/zombienet/tests # set pathc to binaries if [ "$ZOMBIENET_DOCKER_PATHS" -eq 1 ]; then - # normally we would use this: - # export POLKADOT_BINARY_PATH=/usr/local/bin/polkadot export POLKADOT_PARACHAIN_BINARY_PATH=/usr/local/bin/polkadot-parachain export POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_ROCOCO=/usr/local/bin/polkadot-parachain export POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_WESTEND=/usr/local/bin/polkadot-parachain - # - # but then tests fail in 90% of starts at CI with "At least one of the nodes fails to start". - # When using a dummy script that just passes all its arguments to the binary, everything is ok. So: - # - #export POLKADOT_BINARY_PATH=/home/nonroot/bridges-polkadot-sdk/bridges/zombienet/scripts/polkadot-x.sh - #export POLKADOT_PARACHAIN_BINARY_PATH=/home/nonroot/bridges-polkadot-sdk/bridges/zombienet/scripts/polkadot-parachain-x.sh - #export POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_ROCOCO=/home/nonroot/bridges-polkadot-sdk/bridges/zombienet/scripts/polkadot-parachain-x.sh - #export POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_WESTEND=/home/nonroot/bridges-polkadot-sdk/bridges/zombienet/scripts/polkadot-parachain-x.sh export SUBSTRATE_RELAY_PATH=/usr/local/bin/substrate-relay export ZOMBIENET_BINARY_PATH=/usr/local/bin/zombie diff --git a/bridges/zombienet/scripts/polkadot-parachain-x.sh b/bridges/zombienet/scripts/polkadot-parachain-x.sh deleted file mode 100755 index 156d53634812..000000000000 --- a/bridges/zombienet/scripts/polkadot-parachain-x.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash - -ARGS="$@" -LOG_FILE=`mktemp /tmp/polkadot-parachain.XXXXX` -BUILD_SPEC=0 -while test $# -gt 0 -do - case "$1" in - build-spec) - BUILD_SPEC=1 - ;; - esac - shift -done - -if [ $BUILD_SPEC -eq 1 ]; then - /usr/local/bin/polkadot-parachain $ARGS -else - echo "Starting polkadot-parachain with arguments: $ARGS. Log: $LOG_FILE" >$LOG_FILE - /usr/local/bin/polkadot-parachain $ARGS 2>&1 | tee -a $LOG_FILE - echo "Stopping polkadot-parachain with arguments: $ARGS" >>$LOG_FILE -fi - - - diff --git a/bridges/zombienet/scripts/polkadot-x.sh b/bridges/zombienet/scripts/polkadot-x.sh deleted file mode 100755 index 5fb9b32842ca..000000000000 --- a/bridges/zombienet/scripts/polkadot-x.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash - -ARGS="$@" -LOG_FILE=`mktemp /tmp/polkadot.XXXXX` -BUILD_SPEC=0 -while test $# -gt 0 -do - case "$1" in - build-spec) - BUILD_SPEC=1 - ;; - esac - shift -done - -if [ $BUILD_SPEC -eq 1 ]; then - /usr/local/bin/polkadot $ARGS -else - echo "Starting polkadot with arguments: $ARGS. Log: $LOG_FILE" >$LOG_FILE - /usr/local/bin/polkadot $ARGS 2>&1 | tee -a $LOG_FILE - echo "Stopping polkadot with arguments: $ARGS" >>$LOG_FILE -fi - From 9b36e5c09be49695809d6686e876b50279e09ebb Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Fri, 12 Jan 2024 12:54:32 +0300 Subject: [PATCH 84/86] leave comment + rename job --- .gitlab/pipeline/zombienet/bridges.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab/pipeline/zombienet/bridges.yml b/.gitlab/pipeline/zombienet/bridges.yml index b9ff586310fe..8a5d9cfebf33 100644 --- a/.gitlab/pipeline/zombienet/bridges.yml +++ b/.gitlab/pipeline/zombienet/bridges.yml @@ -45,11 +45,12 @@ - cp /tmp/polkadot.* ./zombienet-logs/ # copy logs of our polkadot-parachain binary wrapper (polkadot-parachain-x.sh) - cp /tmp/polkadot-parachain.* ./zombienet-logs/ +# following lines are causing spurious test failures ("At least one of the nodes fails to start") # retry: 2 # tags: # - zombienet-polkadot-integration-test -run-zombienet-bridges-tests: +zombienet-bridges-0001-asset-transfer-works: extends: - .zombienet-bridges-common script: From 327ad7c2a440ad37ed71ce06a6031a5d8a836807 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Fri, 12 Jan 2024 15:18:43 +0300 Subject: [PATCH 85/86] relay_path -> relayer_path --- cumulus/scripts/bridges_rococo_westend.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cumulus/scripts/bridges_rococo_westend.sh b/cumulus/scripts/bridges_rococo_westend.sh index 556ea46234e0..3b6f8e892858 100755 --- a/cumulus/scripts/bridges_rococo_westend.sh +++ b/cumulus/scripts/bridges_rococo_westend.sh @@ -132,10 +132,10 @@ LANE_ID="00000002" XCM_VERSION=3 function init_ro_wnd() { - local relay_path=$(ensure_relayer) + local relayer_path=$(ensure_relayer) RUST_LOG=runtime=trace,rpc=trace,bridge=trace \ - $relay_path init-bridge rococo-to-bridge-hub-westend \ + $relayer_path init-bridge rococo-to-bridge-hub-westend \ --source-host localhost \ --source-port 9942 \ --source-version-mode Auto \ @@ -146,10 +146,10 @@ function init_ro_wnd() { } function init_wnd_ro() { - local relay_path=$(ensure_relayer) + local relayer_path=$(ensure_relayer) RUST_LOG=runtime=trace,rpc=trace,bridge=trace \ - $relay_path init-bridge westend-to-bridge-hub-rococo \ + $relayer_path init-bridge westend-to-bridge-hub-rococo \ --source-host localhost \ --source-port 9945 \ --source-version-mode Auto \ @@ -160,10 +160,10 @@ function init_wnd_ro() { } function run_relay() { - local relay_path=$(ensure_relayer) + local relayer_path=$(ensure_relayer) RUST_LOG=runtime=trace,rpc=trace,bridge=trace \ - $relay_path relay-headers-and-messages bridge-hub-rococo-bridge-hub-westend \ + $relayer_path relay-headers-and-messages bridge-hub-rococo-bridge-hub-westend \ --rococo-host localhost \ --rococo-port 9942 \ --rococo-version-mode Auto \ From 78bbc7098a8d00499766cde65111318e6158a313 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Fri, 12 Jan 2024 15:21:04 +0300 Subject: [PATCH 86/86] removed copying of obsolete logs --- .gitlab/pipeline/zombienet/bridges.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.gitlab/pipeline/zombienet/bridges.yml b/.gitlab/pipeline/zombienet/bridges.yml index 8a5d9cfebf33..9414207a3bbf 100644 --- a/.gitlab/pipeline/zombienet/bridges.yml +++ b/.gitlab/pipeline/zombienet/bridges.yml @@ -41,10 +41,6 @@ - cp -r /tmp/bridges-zombienet-tests.*/tmp.*/tmp.* ./zombienet-logs/ # copy logs of all nodes - cp /tmp/zombie*/logs/* ./zombienet-logs/ - # copy logs of our polkadot binary wrapper (polkadot-x.sh) - - cp /tmp/polkadot.* ./zombienet-logs/ - # copy logs of our polkadot-parachain binary wrapper (polkadot-parachain-x.sh) - - cp /tmp/polkadot-parachain.* ./zombienet-logs/ # following lines are causing spurious test failures ("At least one of the nodes fails to start") # retry: 2 # tags: