diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index e555a9934..a121afc13 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -14,7 +14,7 @@ on: - '**/README.md' env: - TARPAULIN_VERSION: 0.32.7 + TARPAULIN_VERSION: 0.33.0 concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -37,9 +37,7 @@ jobs: tar -zxvf cargo-tarpaulin-x86_64-unknown-linux-musl.tar.gz -C $HOME/.cargo/bin make Cargo.toml cargo update - cargo update base64ct --precise 1.6.0 # 1.8.0 requires the Cargo feature called `edition2024` - cargo update pallet-revive-proc-macro --precise 0.3.0 # TODO: https://github.com/paritytech/polkadot-sdk/issues/9425 - cargo tarpaulin --verbose --no-fail-fast --workspace --timeout 300 --out Xml + cargo tarpaulin --engine llvm --no-fail-fast --workspace --timeout 300 --out Xml - name: Upload to codecov.io uses: codecov/codecov-action@v5 with: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 446b26e78..ab491d6f2 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -33,10 +33,17 @@ jobs: run: make dev-format-check - name: Install clippy run: rustup component add clippy + - name: Install solc and resolc + run: | + mkdir -p $HOME/.local/bin + curl -sL https://github.com/argotorg/solidity/releases/download/v0.8.30/solc-static-linux -o $HOME/.local/bin/solc + chmod 755 $HOME/.local/bin/solc + curl -sL https://github.com/paritytech/revive/releases/download/v0.4.1/resolc-x86_64-unknown-linux-musl -o $HOME/.local/bin/resolc + chmod 755 $HOME/.local/bin/resolc + echo "PATH=$PATH:$HOME/.local/bin" >> $GITHUB_ENV - name: Update run: | cargo update - cargo update pallet-revive-proc-macro --precise 0.3.0 # TODO: https://github.com/paritytech/polkadot-sdk/issues/9425 - name: Run clippy run: cargo clippy -- -D warnings - name: Check for Wasm diff --git a/.github/workflows/zepter.yml b/.github/workflows/zepter.yml index d8ba28eac..f52d9d195 100644 --- a/.github/workflows/zepter.yml +++ b/.github/workflows/zepter.yml @@ -30,6 +30,5 @@ jobs: - run: | make Cargo.toml cargo update - cargo update base64ct --precise 1.6.0 # 1.8.0 requires the Cargo feature called `edition2024` - name: Check Rust features run: make dev-features-check diff --git a/Cargo.dev.toml b/Cargo.dev.toml index 8c6d93fd7..0af4efc36 100644 --- a/Cargo.dev.toml +++ b/Cargo.dev.toml @@ -36,36 +36,36 @@ scale-info = { version = "2.10.0", default-features = false, features = ["derive serde = { version = "1.0.214" } parity-scale-codec = { version = "3.6.12", default-features = false, features = ["max-encoded-len"] } -cumulus-pallet-xcm = { version = "0.20.0", default-features = false } -cumulus-primitives-core = { version = "0.19.0", default-features = false } -frame-benchmarking = { version = "41.0.0", default-features = false } -frame-support = { version = "41.0.0", default-features = false } -frame-system = { version = "41.0.0", default-features = false } -parachains-common = { version = "22.0.0", default-features = false } -pallet-balances = { version = "42.0.0", default-features = false } -pallet-elections-phragmen = { version = "42.0.0", default-features = false } -pallet-message-queue = { version = "44.0.0", default-features = false } -pallet-preimage = { version = "41.0.0", default-features = false } -pallet-root-testing = { version = "17.0.0", default-features = false } -pallet-scheduler = { version = "42.0.0", default-features = false } -pallet-timestamp = { version = "40.0.0", default-features = false } -pallet-treasury = { version = "40.0.0", default-features = false } -pallet-xcm = { version = "20.1.0", default-features = false } -polkadot-parachain-primitives = { version = "17.0.0", default-features = false } -polkadot-runtime-common = { version = "20.0.0", default-features = false } -polkadot-runtime-parachains = { version = "20.0.1", default-features = false } -sp-api = { version = "37.0.0", default-features = false } -sp-application-crypto = { version = "41.0.0", default-features = false } -sp-arithmetic = { version = "27.0.0", default-features = false } -sp-core = { version = "37.0.0", default-features = false } -sp-io = { version = "41.0.1", default-features = false } -sp-runtime = { version = "42.0.0", default-features = false } -sp-runtime-interface = { version = "30.0.0", default-features = false } -sp-staking = { version = "39.0.0", default-features = false } +cumulus-pallet-xcm = { version = "0.22.0", default-features = false } +cumulus-primitives-core = { version = "0.21.0", default-features = false } +frame-benchmarking = { version = "43.0.0", default-features = false } +frame-support = { version = "43.0.0", default-features = false } +frame-system = { version = "43.0.0", default-features = false } +parachains-common = { version = "25.0.0", default-features = false } +pallet-balances = { version = "44.0.0", default-features = false } +pallet-elections-phragmen = { version = "44.0.0", default-features = false } +pallet-message-queue = { version = "46.0.0", default-features = false } +pallet-preimage = { version = "43.0.0", default-features = false } +pallet-root-testing = { version = "19.0.0", default-features = false } +pallet-scheduler = { version = "44.0.0", default-features = false } +pallet-timestamp = { version = "42.0.0", default-features = false } +pallet-treasury = { version = "42.0.0", default-features = false } +pallet-xcm = { version = "23.0.0", default-features = false } +polkadot-parachain-primitives = { version = "19.0.0", default-features = false } +polkadot-runtime-common = { version = "22.0.0", default-features = false } +polkadot-runtime-parachains = { version = "22.0.0", default-features = false } +sp-api = { version = "39.0.0", default-features = false } +sp-application-crypto = { version = "43.0.0", default-features = false } +sp-arithmetic = { version = "28.0.0", default-features = false } +sp-core = { version = "38.1.0", default-features = false } +sp-io = { version = "43.0.0", default-features = false } +sp-runtime = { version = "44.0.0", default-features = false } +sp-runtime-interface = { version = "32.0.0", default-features = false } +sp-staking = { version = "41.0.0", default-features = false } sp-std = { version = "14.0.0", default-features = false } sp-storage = { version = "22.0.0", default-features = false } -xcm = { version = "17.0.0", package = "staging-xcm", default-features = false } -xcm-builder = { version = "21.0.0", package = "staging-xcm-builder", default-features = false } -xcm-executor = { version = "20.0.0", package = "staging-xcm-executor", default-features = false } +xcm = { version = "19.0.0", package = "staging-xcm", default-features = false } +xcm-builder = { version = "23.0.0", package = "staging-xcm-builder", default-features = false } +xcm-executor = { version = "22.0.0", package = "staging-xcm-executor", default-features = false } -xcm-simulator = { version = "21.0.0" } +xcm-simulator = { version = "23.0.0" } diff --git a/benchmarking/Cargo.toml b/benchmarking/Cargo.toml index 0f68cb7ea..f41006021 100644 --- a/benchmarking/Cargo.toml +++ b/benchmarking/Cargo.toml @@ -25,7 +25,7 @@ sp-std = { workspace = true } sp-storage = { workspace = true } [dev-dependencies] -hex-literal = "0.4.1" +hex-literal = "1.0.0" frame-system = { workspace = true, features = ["std"] } diff --git a/xtokens/Cargo.toml b/xtokens/Cargo.toml index b88683721..3d024bfb7 100644 --- a/xtokens/Cargo.toml +++ b/xtokens/Cargo.toml @@ -21,6 +21,7 @@ sp-runtime = { workspace = true } sp-std = { workspace = true } # polkadot +parachains-common = { workspace = true, optional = true } pallet-xcm = { workspace = true } xcm = { workspace = true } xcm-executor = { workspace = true } @@ -38,7 +39,6 @@ pallet-message-queue = { workspace = true, features = ["std"] } # cumulus cumulus-pallet-xcm = { workspace = true, features = ["std"] } cumulus-primitives-core = { workspace = true, features = ["std"] } -parachains-common = { workspace = true, features = ["std"] } # polkadot polkadot-parachain-primitives = { workspace = true, features = ["std"] } @@ -62,6 +62,7 @@ std = [ "orml-traits/std", "orml-xcm-support/std", "pallet-xcm/std", + "parachains-common/std", "parity-scale-codec/std", "scale-info/std", "serde", @@ -75,6 +76,7 @@ runtime-benchmarks = [ "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", "pallet-xcm/runtime-benchmarks", + "parachains-common/runtime-benchmarks", "sp-runtime/runtime-benchmarks", "xcm-executor/runtime-benchmarks", "xcm/runtime-benchmarks", @@ -83,5 +85,6 @@ try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", "pallet-xcm/try-runtime", + "parachains-common/try-runtime", "sp-runtime/try-runtime", ]