Skip to content

Commit 23b4f57

Browse files
zjb0807zjb0807
authored
update polkadot-stable2509 (#1034)
* update polkadot-stable2509 * update * fix tarpaulin * update tarpaulin * fix * fix
1 parent 0069a63 commit 23b4f57

File tree

6 files changed

+45
-38
lines changed

6 files changed

+45
-38
lines changed

‎.github/workflows/coverage.yml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414
- '**/README.md'
1515

1616
env:
17-
TARPAULIN_VERSION: 0.32.7
17+
TARPAULIN_VERSION: 0.33.0
1818

1919
concurrency:
2020
group: ${{ github.workflow }}-${{ github.ref }}
@@ -37,9 +37,7 @@ jobs:
3737
tar -zxvf cargo-tarpaulin-x86_64-unknown-linux-musl.tar.gz -C $HOME/.cargo/bin
3838
make Cargo.toml
3939
cargo update
40-
cargo update base64ct --precise 1.6.0 # 1.8.0 requires the Cargo feature called `edition2024`
41-
cargo update pallet-revive-proc-macro --precise 0.3.0 # TODO: https://github.com/paritytech/polkadot-sdk/issues/9425
42-
cargo tarpaulin --verbose --no-fail-fast --workspace --timeout 300 --out Xml
40+
cargo tarpaulin --engine llvm --no-fail-fast --workspace --timeout 300 --out Xml
4341
- name: Upload to codecov.io
4442
uses: codecov/codecov-action@v5
4543
with:

‎.github/workflows/test.yml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,17 @@ jobs:
3333
run: make dev-format-check
3434
- name: Install clippy
3535
run: rustup component add clippy
36+
- name: Install solc and resolc
37+
run: |
38+
mkdir -p $HOME/.local/bin
39+
curl -sL https://github.com/argotorg/solidity/releases/download/v0.8.30/solc-static-linux -o $HOME/.local/bin/solc
40+
chmod 755 $HOME/.local/bin/solc
41+
curl -sL https://github.com/paritytech/revive/releases/download/v0.4.1/resolc-x86_64-unknown-linux-musl -o $HOME/.local/bin/resolc
42+
chmod 755 $HOME/.local/bin/resolc
43+
echo "PATH=$PATH:$HOME/.local/bin" >> $GITHUB_ENV
3644
- name: Update
3745
run: |
3846
cargo update
39-
cargo update pallet-revive-proc-macro --precise 0.3.0 # TODO: https://github.com/paritytech/polkadot-sdk/issues/9425
4047
- name: Run clippy
4148
run: cargo clippy -- -D warnings
4249
- name: Check for Wasm

‎.github/workflows/zepter.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,5 @@ jobs:
3030
- run: |
3131
make Cargo.toml
3232
cargo update
33-
cargo update base64ct --precise 1.6.0 # 1.8.0 requires the Cargo feature called `edition2024`
3433
- name: Check Rust features
3534
run: make dev-features-check

‎Cargo.dev.toml‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -36,36 +36,36 @@ scale-info = { version = "2.10.0", default-features = false, features = ["derive
3636
serde = { version = "1.0.214" }
3737
parity-scale-codec = { version = "3.6.12", default-features = false, features = ["max-encoded-len"] }
3838

39-
cumulus-pallet-xcm = { version = "0.20.0", default-features = false }
40-
cumulus-primitives-core = { version = "0.19.0", default-features = false }
41-
frame-benchmarking = { version = "41.0.0", default-features = false }
42-
frame-support = { version = "41.0.0", default-features = false }
43-
frame-system = { version = "41.0.0", default-features = false }
44-
parachains-common = { version = "22.0.0", default-features = false }
45-
pallet-balances = { version = "42.0.0", default-features = false }
46-
pallet-elections-phragmen = { version = "42.0.0", default-features = false }
47-
pallet-message-queue = { version = "44.0.0", default-features = false }
48-
pallet-preimage = { version = "41.0.0", default-features = false }
49-
pallet-root-testing = { version = "17.0.0", default-features = false }
50-
pallet-scheduler = { version = "42.0.0", default-features = false }
51-
pallet-timestamp = { version = "40.0.0", default-features = false }
52-
pallet-treasury = { version = "40.0.0", default-features = false }
53-
pallet-xcm = { version = "20.1.0", default-features = false }
54-
polkadot-parachain-primitives = { version = "17.0.0", default-features = false }
55-
polkadot-runtime-common = { version = "20.0.0", default-features = false }
56-
polkadot-runtime-parachains = { version = "20.0.1", default-features = false }
57-
sp-api = { version = "37.0.0", default-features = false }
58-
sp-application-crypto = { version = "41.0.0", default-features = false }
59-
sp-arithmetic = { version = "27.0.0", default-features = false }
60-
sp-core = { version = "37.0.0", default-features = false }
61-
sp-io = { version = "41.0.1", default-features = false }
62-
sp-runtime = { version = "42.0.0", default-features = false }
63-
sp-runtime-interface = { version = "30.0.0", default-features = false }
64-
sp-staking = { version = "39.0.0", default-features = false }
39+
cumulus-pallet-xcm = { version = "0.22.0", default-features = false }
40+
cumulus-primitives-core = { version = "0.21.0", default-features = false }
41+
frame-benchmarking = { version = "43.0.0", default-features = false }
42+
frame-support = { version = "43.0.0", default-features = false }
43+
frame-system = { version = "43.0.0", default-features = false }
44+
parachains-common = { version = "25.0.0", default-features = false }
45+
pallet-balances = { version = "44.0.0", default-features = false }
46+
pallet-elections-phragmen = { version = "44.0.0", default-features = false }
47+
pallet-message-queue = { version = "46.0.0", default-features = false }
48+
pallet-preimage = { version = "43.0.0", default-features = false }
49+
pallet-root-testing = { version = "19.0.0", default-features = false }
50+
pallet-scheduler = { version = "44.0.0", default-features = false }
51+
pallet-timestamp = { version = "42.0.0", default-features = false }
52+
pallet-treasury = { version = "42.0.0", default-features = false }
53+
pallet-xcm = { version = "23.0.0", default-features = false }
54+
polkadot-parachain-primitives = { version = "19.0.0", default-features = false }
55+
polkadot-runtime-common = { version = "22.0.0", default-features = false }
56+
polkadot-runtime-parachains = { version = "22.0.0", default-features = false }
57+
sp-api = { version = "39.0.0", default-features = false }
58+
sp-application-crypto = { version = "43.0.0", default-features = false }
59+
sp-arithmetic = { version = "28.0.0", default-features = false }
60+
sp-core = { version = "38.1.0", default-features = false }
61+
sp-io = { version = "43.0.0", default-features = false }
62+
sp-runtime = { version = "44.0.0", default-features = false }
63+
sp-runtime-interface = { version = "32.0.0", default-features = false }
64+
sp-staking = { version = "41.0.0", default-features = false }
6565
sp-std = { version = "14.0.0", default-features = false }
6666
sp-storage = { version = "22.0.0", default-features = false }
67-
xcm = { version = "17.0.0", package = "staging-xcm", default-features = false }
68-
xcm-builder = { version = "21.0.0", package = "staging-xcm-builder", default-features = false }
69-
xcm-executor = { version = "20.0.0", package = "staging-xcm-executor", default-features = false }
67+
xcm = { version = "19.0.0", package = "staging-xcm", default-features = false }
68+
xcm-builder = { version = "23.0.0", package = "staging-xcm-builder", default-features = false }
69+
xcm-executor = { version = "22.0.0", package = "staging-xcm-executor", default-features = false }
7070

71-
xcm-simulator = { version = "21.0.0" }
71+
xcm-simulator = { version = "23.0.0" }

‎benchmarking/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ sp-std = { workspace = true }
2525
sp-storage = { workspace = true }
2626

2727
[dev-dependencies]
28-
hex-literal = "0.4.1"
28+
hex-literal = "1.0.0"
2929

3030
frame-system = { workspace = true, features = ["std"] }
3131

‎xtokens/Cargo.toml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ sp-runtime = { workspace = true }
2121
sp-std = { workspace = true }
2222

2323
# polkadot
24+
parachains-common = { workspace = true, optional = true }
2425
pallet-xcm = { workspace = true }
2526
xcm = { workspace = true }
2627
xcm-executor = { workspace = true }
@@ -38,7 +39,6 @@ pallet-message-queue = { workspace = true, features = ["std"] }
3839
# cumulus
3940
cumulus-pallet-xcm = { workspace = true, features = ["std"] }
4041
cumulus-primitives-core = { workspace = true, features = ["std"] }
41-
parachains-common = { workspace = true, features = ["std"] }
4242

4343
# polkadot
4444
polkadot-parachain-primitives = { workspace = true, features = ["std"] }
@@ -62,6 +62,7 @@ std = [
6262
"orml-traits/std",
6363
"orml-xcm-support/std",
6464
"pallet-xcm/std",
65+
"parachains-common/std",
6566
"parity-scale-codec/std",
6667
"scale-info/std",
6768
"serde",
@@ -75,6 +76,7 @@ runtime-benchmarks = [
7576
"frame-support/runtime-benchmarks",
7677
"frame-system/runtime-benchmarks",
7778
"pallet-xcm/runtime-benchmarks",
79+
"parachains-common/runtime-benchmarks",
7880
"sp-runtime/runtime-benchmarks",
7981
"xcm-executor/runtime-benchmarks",
8082
"xcm/runtime-benchmarks",
@@ -83,5 +85,6 @@ try-runtime = [
8385
"frame-support/try-runtime",
8486
"frame-system/try-runtime",
8587
"pallet-xcm/try-runtime",
88+
"parachains-common/try-runtime",
8689
"sp-runtime/try-runtime",
8790
]

0 commit comments

Comments
 (0)