unfilter XTokens on Manta (#1320)

* unfilter all xtokens Signed-off-by: Charles Ferrell <charlie@manta.network> * update ci Signed-off-by: Charles Ferrell <charlie@manta.network> * ci not downloading polkadot binary Signed-off-by: Charles Ferrell <charlie@manta.network> * update zombienet version Signed-off-by: Charles Ferrell <charlie@manta.network> * zombienet vesrion Signed-off-by: Charles Ferrell <charlie@manta.network> * add worker binaries to ci Signed-off-by: Charles Ferrell <charlie@manta.network> * same fixes to calamari integration test Signed-off-by: Charles Ferrell <charlie@manta.network> --------- Signed-off-by: Charles Ferrell <charlie@manta.network>
Manta-Network · Mar 15, 2024 · 2d081b6 · 2d081b6
1 parent ebe14e8
commit 2d081b6
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 15 deletions.
diff --git a/.github/workflows/integration_test_calamari.yml b/.github/workflows/integration_test_calamari.yml
@@ -10,7 +10,9 @@ concurrency:
   cancel-in-progress: true
 env:
   DEBIAN_FRONTEND: noninteractive
-  POLKADOT_BINARY: https://github.com/paritytech/polkadot/releases/download/v1.3.0/polkadot
+  POLKADOT_BINARY: https://github.com/paritytech/polkadot-sdk/releases/download/polkadot-v1.7.0/polkadot
+  POLKADOT_EXECUTE: https://github.com/paritytech/polkadot-sdk/releases/download/polkadot-v1.7.0/polkadot-execute-worker
+  POLKADOT_PREPARE: https://github.com/paritytech/polkadot-sdk/releases/download/polkadot-v1.7.0/polkadot-prepare-worker
 jobs:
   print-rust-versions:
     if: contains(github.event.pull_request.labels.*.name, 'A-calamari')
@@ -133,10 +135,12 @@ jobs:
         shell: bash
         run: |
           apt update && apt install -y curl jq wget git
-          if [[ ! -f "$HOME/.local/bin/polkadot" ]]; then
-            curl -L -o $HOME/.local/bin/polkadot ${{ env.POLKADOT_BINARY }}
-            chmod +x $HOME/.local/bin/polkadot
-          fi
+          curl -L -o $HOME/.local/bin/polkadot ${{ env.POLKADOT_BINARY }}
+          curl -L -o $HOME/.local/bin/polkadot-execute-worker ${{ env.POLKADOT_EXECUTE }}
+          curl -L -o $HOME/.local/bin/polkadot-prepare-worker ${{ env.POLKADOT_PREPARE }}
+          chmod +x $HOME/.local/bin/polkadot
+          chmod +x $HOME/.local/bin/polkadot-execute-worker
+          chmod +x $HOME/.local/bin/polkadot-prepare-worker
           ls -ahl $HOME/.local/bin/
       - name: Install dasel cli
         run: |
@@ -217,7 +221,7 @@ jobs:
         shell: bash
         run: |
           cd $GITHUB_WORKSPACE/zombienet-tool
-          git pull && git checkout v1.3.89
+          git pull && git checkout v1.3.92
           cd $GITHUB_WORKSPACE/zombienet-tool/javascript
           yarn
           npm run build

diff --git a/.github/workflows/integration_test_manta.yml b/.github/workflows/integration_test_manta.yml
@@ -10,7 +10,9 @@ concurrency:
   cancel-in-progress: true
 env:
   DEBIAN_FRONTEND: noninteractive
-  POLKADOT_BINARY: https://github.com/paritytech/polkadot/releases/download/v1.3.0/polkadot
+  POLKADOT_BINARY: https://github.com/paritytech/polkadot-sdk/releases/download/polkadot-v1.7.0/polkadot
+  POLKADOT_EXECUTE: https://github.com/paritytech/polkadot-sdk/releases/download/polkadot-v1.7.0/polkadot-execute-worker
+  POLKADOT_PREPARE: https://github.com/paritytech/polkadot-sdk/releases/download/polkadot-v1.7.0/polkadot-prepare-worker
 jobs:
   print-rust-versions:
     if: contains(github.event.pull_request.labels.*.name, 'A-manta')
@@ -129,10 +131,12 @@ jobs:
         shell: bash
         run: |
           apt update && apt install -y curl jq wget git
-          if [[ ! -f "$HOME/.local/bin/polkadot" ]]; then
-            curl -L -o $HOME/.local/bin/polkadot ${{ env.POLKADOT_BINARY }}
-            chmod +x $HOME/.local/bin/polkadot
-          fi
+          curl -L -o $HOME/.local/bin/polkadot ${{ env.POLKADOT_BINARY }}
+          curl -L -o $HOME/.local/bin/polkadot-execute-worker ${{ env.POLKADOT_EXECUTE }}
+          curl -L -o $HOME/.local/bin/polkadot-prepare-worker ${{ env.POLKADOT_PREPARE }}
+          chmod +x $HOME/.local/bin/polkadot
+          chmod +x $HOME/.local/bin/polkadot-execute-worker
+          chmod +x $HOME/.local/bin/polkadot-prepare-worker
           ls -ahl $HOME/.local/bin/
       - name: Install dasel cli
         shell: bash
@@ -232,7 +236,7 @@ jobs:
         shell: bash
         run: |
           cd $GITHUB_WORKSPACE/zombienet-tool
-          git pull && git checkout v1.3.89
+          git pull && git checkout v1.3.92
           cd $GITHUB_WORKSPACE/zombienet-tool/javascript
           yarn
           npm run build

diff --git a/runtime/manta/src/lib.rs b/runtime/manta/src/lib.rs
@@ -269,9 +269,7 @@ impl Contains<RuntimeCall> for MantaFilter {
                 | pallet_parachain_staking::Call::schedule_delegator_bond_less{..}
                 | pallet_parachain_staking::Call::execute_delegation_request{..}
                 | pallet_parachain_staking::Call::cancel_delegation_request{..})
-            | RuntimeCall::XTokens(orml_xtokens::Call::transfer {..}
-                | orml_xtokens::Call::transfer_multiassets {..}
-                | orml_xtokens::Call::transfer_multiasset_with_fee {..})
+            | RuntimeCall::XTokens(_)
             | RuntimeCall::Balances(_)
             | RuntimeCall::Preimage(_)
             | RuntimeCall::MantaSbt(_)