Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

unfilter XTokens on Manta #1320

Merged
merged 8 commits into from
Mar 15, 2024
Merged

unfilter XTokens on Manta #1320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6fdb7f8
unfilter all xtokens
ferrell-code Mar 4, 2024
39b6076
update ci
ferrell-code Mar 4, 2024
5f86d7c
ci not downloading polkadot binary
ferrell-code Mar 5, 2024
5c0e0d3
update zombienet version
ferrell-code Mar 5, 2024
6ddea4a
zombienet vesrion
ferrell-code Mar 5, 2024
5ad2302
add worker binaries to ci
ferrell-code Mar 11, 2024
04de0fd
same fixes to calamari integration test
ferrell-code Mar 11, 2024
827e922
Merge branch 'manta' into fer-unfilter-xtoken
ferrell-code Mar 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions .github/workflows/integration_test_calamari.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down Expand Up @@ -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: |
Expand Down Expand Up @@ -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
Expand Down
16 changes: 10 additions & 6 deletions .github/workflows/integration_test_manta.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions runtime/manta/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(_)
Expand Down
Loading