Merge branch 'master' into test/beefy

qdrvm · Mar 7, 2024 · ed515bc · ed515bc
2 parents 1bb6537 + 43b35f9
commit ed515bc
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 6 deletions.
diff --git a/.github/workflows/zombie-tests.yaml b/.github/workflows/zombie-tests.yaml
@@ -0,0 +1,54 @@
+name: Zombie-Tests
+
+on:
+  push:
+    branches:
+      - "feature/zobbie-tests-python-fix"
+  workflow_dispatch: 
+
+jobs:
+  zombie-tests:
+    strategy:
+      fail-fast: false
+      matrix:
+        options:
+          - name: "Parachains smoke test"
+            test: "test0001"
+          - name: "Parachains smoke test kagome"
+            test: "test0001_kagome"
+          - name: "Parachains upgrade smoke test"
+            test: "test0002"
+          - name: "Parachains upgrade smoke test kagome"
+            test: "test0002_kagome"
+          - name: "Parachains smoke test cumulus"
+            test: "test0003"
+          - name: "Parachains smoke test cumulus kagome"
+            test: "test0003_kagome"
+          - name: "Runtime upgrade"
+            test: "test0004"
+          - name: "Runtime upgrade kagome"
+            test: "test0004_kagome"
+          - name: "Dispute valid block"
+            test: "test0005"
+          - name: "Parachains disputes"
+            test: "test0006"
+          - name: "Deregister register validator smoke"
+            test: "test0008"
+          - name: "Basic warp sync"
+            test: "test0009"
+          - name: "Validators warp sync"
+            test: "test0010"
+          - name: "Block building warp sync"
+            test: "test0011"
+    runs-on: [ self-hosted ]
+    if: ${{ github.event_name == 'workflow_dispatch' }}
+    steps:
+      - name: Set owner of working dir recurively
+        run: sudo chown -R $(whoami) .
+      - uses: actions/checkout@dc323e67f16fb5f7663d20ff7941f27f5809e9b6
+      - name: build zombie-tester
+        working-directory: ./zombienet/docker
+        run: make tester
+      - name: Run test
+        working-directory: ./zombienet/docker
+        run: make ${{ matrix.options.test }}
diff --git a/core/primitives/transaction_validity.cpp b/core/primitives/transaction_validity.cpp
@@ -21,8 +21,7 @@ OUTCOME_CPP_DEFINE_CATEGORY(kagome::primitives, InvalidTransaction::Kind, e) {
       return "General error to do with the transaction being outdated (e.g. "
              "nonce too low)";
     case E::BadProof:
-      return "General error to do with the transaction's proofs (e.g. "
-             "signature)";
+      return "InvalidTransaction::BadProof. General error to do with the transaction's proofs (e.g. signature). May happen if finality lags behind best block (breaks transaction mortality encoding).";
     case E::AncientBirthBlock:
       return "The transaction birth block is ancient";
     case E::ExhaustsResources:

diff --git a/core/runtime/wasm_edge/module_factory_impl.cpp b/core/runtime/wasm_edge/module_factory_impl.cpp
@@ -115,7 +115,7 @@ namespace kagome::runtime::wasm_edge {
           host_instance_{host_instance},
           executor_{executor},
           env_{std::move(env)},
-          code_hash_{} {
+          code_hash_{code_hash} {
       BOOST_ASSERT(module_ != nullptr);
       BOOST_ASSERT(instance_ != nullptr);
       BOOST_ASSERT(host_instance_ != nullptr);
@@ -298,8 +298,7 @@ namespace kagome::runtime::wasm_edge {
 
       InstanceEnvironment env = env_factory_->make(memory_provider);
 
-      register_host_api(
-          *env.host_api, module_.raw(), host_instance->raw());
+      register_host_api(*env.host_api, module_.raw(), host_instance->raw());
       WasmEdge_UNWRAP(WasmEdge_ExecutorRegisterImport(
           executor_->raw(), store.raw(), host_instance->raw()));
 

diff --git a/zombienet/docker/Makefile b/zombienet/docker/Makefile
@@ -32,7 +32,7 @@ builder:
 	DOCKER_BUILDKIT=0 docker build -t qdrvm/zombie-builder:latest -f builder.Dockerfile --build-arg CUMULUS_RELEASE=v0.9.420 --build-arg POLKADOT_RELEASE=v0.9.42 --build-arg POLKADOT_RELEASE_GLOBAL=v0.9.42 .
 
 tester:
-	python version.py https://github.com/paritytech/polkadot-sdk && \
+	python3 version.py https://github.com/paritytech/polkadot-sdk && \
 	if [ -f polkadot-sdk-versions.txt ]; then \
 		POLKADOT_SDK_RELEASE=$$(grep 'polkadot_format_version:' polkadot-sdk-versions.txt | cut -d ' ' -f 2); \
 		DOCKER_BUILDKIT=0 docker build --no-cache -t qdrvm/zombie-tester:latest -f tester.Dockerfile \

diff --git a/zombienet/docker/builder.Dockerfile b/zombienet/docker/builder.Dockerfile
@@ -47,6 +47,8 @@ COPY --from=zombie-builder-polkadot-sdk-bin /home/nonroot/polkadot-sdk/target/te
 COPY --from=zombie-builder-polkadot-sdk-bin /home/nonroot/polkadot-sdk/target/testnet/adder-collator /home/nonroot/bin
 COPY --from=zombie-builder-polkadot-sdk-bin /home/nonroot/polkadot-sdk/target/testnet/undying-collator /home/nonroot/bin
 COPY --from=polkadot /usr/bin/polkadot /home/nonroot/bin
+COPY --from=polkadot /usr/lib/polkadot/polkadot-execute-worker /home/nonroot/bin
+COPY --from=polkadot /usr/lib/polkadot/polkadot-prepare-worker /home/nonroot/bin
 COPY --from=polkadot-parachain /usr/local/bin/polkadot-parachain /home/nonroot/bin
 COPY polkadot-sdk-versions.txt /home/nonroot/polkadot-sdk-versions.txt
 COPY zombienet-versions.txt /home/nonroot/zombienet-versions.txt