From f8c4898c698e72fc5c971f1f296311a3d45867fe Mon Sep 17 00:00:00 2001 From: Bryan Chen Date: Thu, 1 Aug 2024 12:12:20 +1200 Subject: [PATCH 1/5] update to stable2407 --- Cargo.dev.toml | 52 ++++++++++++++++++++--------------------- benchmarking/src/lib.rs | 2 ++ 2 files changed, 28 insertions(+), 26 deletions(-) diff --git a/Cargo.dev.toml b/Cargo.dev.toml index ca796dad0..3111011e6 100644 --- a/Cargo.dev.toml +++ b/Cargo.dev.toml @@ -37,35 +37,35 @@ scale-info = { version = "2.10.0", default-features = false, features = ["derive serde = { version = "1.0.189" } parity-scale-codec = { version = "3.6.5", default-features = false, features = ["max-encoded-len"] } -cumulus-pallet-xcm = { version = "0.14.0", default-features = false } -cumulus-primitives-core = { version = "0.14.0", default-features = false } -frame-benchmarking = { version = "35.0.0", default-features = false } -frame-support = { version = "35.0.0", default-features = false } -frame-system = { version = "35.0.0", default-features = false } -pallet-balances = { version = "36.0.0", default-features = false } -pallet-elections-phragmen = { version = "36.0.0", default-features = false } -pallet-message-queue = { version = "38.0.0", default-features = false } -pallet-preimage = { version = "35.0.0", default-features = false } -pallet-root-testing = { version = "11.0.0", default-features = false } -pallet-scheduler = { version = "36.0.0", default-features = false } -pallet-timestamp = { version = "34.0.0", default-features = false } -pallet-treasury = { version = "34.0.0", default-features = false } -pallet-xcm = { version = "14.0.0", default-features = false } -polkadot-parachain-primitives = { version = "13.0.0", default-features = false } -polkadot-runtime-common = { version = "14.0.0", default-features = false } -polkadot-runtime-parachains = { version = "14.0.0", default-features = false } -sp-api = { version = "33.0.0", default-features = false } -sp-application-crypto = { version = "37.0.0", default-features = false } +cumulus-pallet-xcm = { version = "0.16.0", default-features = false } +cumulus-primitives-core = { version = "0.15.0", default-features = false } +frame-benchmarking = { version = "37.0.0", default-features = false } +frame-support = { version = "37.0.0", default-features = false } +frame-system = { version = "37.0.0", default-features = false } +pallet-balances = { version = "38.0.0", default-features = false } +pallet-elections-phragmen = { version = "38.0.0", default-features = false } +pallet-message-queue = { version = "40.0.0", default-features = false } +pallet-preimage = { version = "37.0.0", default-features = false } +pallet-root-testing = { version = "13.0.0", default-features = false } +pallet-scheduler = { version = "38.0.0", default-features = false } +pallet-timestamp = { version = "36.0.0", default-features = false } +pallet-treasury = { version = "36.0.0", default-features = false } +pallet-xcm = { version = "16.0.0", default-features = false } +polkadot-parachain-primitives = { version = "14.0.0", default-features = false } +polkadot-runtime-common = { version = "16.0.0", default-features = false } +polkadot-runtime-parachains = { version = "16.0.0", default-features = false } +sp-api = { version = "34.0.0", default-features = false } +sp-application-crypto = { version = "38.0.0", default-features = false } sp-arithmetic = { version = "26.0.0", default-features = false } sp-core = { version = "34.0.0", default-features = false } -sp-io = { version = "37.0.0", default-features = false } -sp-runtime = { version = "38.0.0", default-features = false } +sp-io = { version = "38.0.0", default-features = false } +sp-runtime = { version = "39.0.0", default-features = false } sp-runtime-interface = { version = "28.0.0", default-features = false } -sp-staking = { version = "33.0.0", default-features = false } +sp-staking = { version = "34.0.0", default-features = false } sp-std = { version = "14.0.0", default-features = false } sp-storage = { version = "21.0.0", default-features = false } -xcm = { version = "14.0.0", package = "staging-xcm", default-features = false } -xcm-builder = { version = "14.0.0", package = "staging-xcm-builder", default-features = false } -xcm-executor = { version = "14.0.0", package = "staging-xcm-executor", default-features = false } +xcm = { version = "14.1.0", package = "staging-xcm", default-features = false } +xcm-builder = { version = "16.0.0", package = "staging-xcm-builder", default-features = false } +xcm-executor = { version = "16.0.0", package = "staging-xcm-executor", default-features = false } -xcm-simulator = { version = "14.0.0" } +xcm-simulator = { version = "16.0.0" } diff --git a/benchmarking/src/lib.rs b/benchmarking/src/lib.rs index fd375120e..2942d683e 100644 --- a/benchmarking/src/lib.rs +++ b/benchmarking/src/lib.rs @@ -11,6 +11,8 @@ pub use frame_benchmarking::{ Recording, }; +#[cfg(not(feature = "std"))] +extern crate alloc; #[cfg(feature = "std")] pub use frame_benchmarking::{Analysis, BenchmarkSelector}; #[doc(hidden)] From 26401d0b19c214bcf839676b7a7dc570daf809b1 Mon Sep 17 00:00:00 2001 From: Bryan Chen Date: Thu, 1 Aug 2024 12:16:36 +1200 Subject: [PATCH 2/5] update tarpaulin version --- .github/workflows/coverage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index d6676a045..5a6abdae5 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -14,7 +14,7 @@ on: - '**/README.md' env: - TARPAULIN_VERSION: 0.19.1 + TARPAULIN_VERSION: 0.31.0 concurrency: group: ${{ github.workflow }}-${{ github.ref }} From b1b0cd7a488809e4c5a954a7bc1b86106d692dcf Mon Sep 17 00:00:00 2001 From: Bryan Chen Date: Thu, 1 Aug 2024 12:19:20 +1200 Subject: [PATCH 3/5] fix tarpaulin --- .github/workflows/coverage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 5a6abdae5..f9cf0af79 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -33,7 +33,7 @@ jobs: uses: dtolnay/rust-toolchain@nightly - name: Generate code coverage run: | - wget https://github.com/xd009642/tarpaulin/releases/download/${{ env.TARPAULIN_VERSION }}/cargo-tarpaulin-${{ env.TARPAULIN_VERSION }}-travis.tar.gz + wget https://github.com/xd009642/tarpaulin/releases/download/${{ env.TARPAULIN_VERSION }}/cargo-tarpaulin-x86_64-unknown-linux-musl.tar.gz tar -zxvf cargo-tarpaulin-${{ env.TARPAULIN_VERSION }}-travis.tar.gz -C $HOME/.cargo/bin make Cargo.toml cargo tarpaulin --verbose --no-fail-fast --workspace --timeout 300 --out Xml From be1cfb2dd30434a95a69bcc879dc05612eaff402 Mon Sep 17 00:00:00 2001 From: Bryan Chen Date: Thu, 1 Aug 2024 13:18:55 +1200 Subject: [PATCH 4/5] fix --- .github/workflows/coverage.yml | 2 +- tokens/src/mock.rs | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index f9cf0af79..9c7caedc1 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -34,7 +34,7 @@ jobs: - name: Generate code coverage run: | wget https://github.com/xd009642/tarpaulin/releases/download/${{ env.TARPAULIN_VERSION }}/cargo-tarpaulin-x86_64-unknown-linux-musl.tar.gz - tar -zxvf cargo-tarpaulin-${{ env.TARPAULIN_VERSION }}-travis.tar.gz -C $HOME/.cargo/bin + tar -zxvf cargo-tarpaulin-x86_64-unknown-linux-musl.tar.gz make Cargo.toml cargo tarpaulin --verbose --no-fail-fast --workspace --timeout 300 --out Xml - name: Upload to codecov.io diff --git a/tokens/src/mock.rs b/tokens/src/mock.rs index 1f190df00..ad9afb909 100644 --- a/tokens/src/mock.rs +++ b/tokens/src/mock.rs @@ -92,13 +92,8 @@ pub type MockCurrencyAdapter = CurrencyAdapter; impl pallet_treasury::Config for Runtime { type PalletId = TreasuryPalletId; type Currency = MockCurrencyAdapter; - type ApproveOrigin = frame_system::EnsureRoot; type RejectOrigin = frame_system::EnsureRoot; type RuntimeEvent = RuntimeEvent; - type OnSlash = (); - type ProposalBond = ProposalBond; - type ProposalBondMinimum = ConstU64<1>; - type ProposalBondMaximum = (); type SpendPeriod = ConstU64<2>; type Burn = Burn; type BurnDestination = (); // Just gets burned. From 59a146f57aaca4d0c0fa783ac94ab733f6cd0075 Mon Sep 17 00:00:00 2001 From: Bryan Chen Date: Thu, 1 Aug 2024 13:25:45 +1200 Subject: [PATCH 5/5] fix --- .github/workflows/coverage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 9c7caedc1..0cb2e0558 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -34,7 +34,7 @@ jobs: - name: Generate code coverage run: | wget https://github.com/xd009642/tarpaulin/releases/download/${{ env.TARPAULIN_VERSION }}/cargo-tarpaulin-x86_64-unknown-linux-musl.tar.gz - tar -zxvf cargo-tarpaulin-x86_64-unknown-linux-musl.tar.gz + tar -zxvf cargo-tarpaulin-x86_64-unknown-linux-musl.tar.gz -C $HOME/.cargo/bin make Cargo.toml cargo tarpaulin --verbose --no-fail-fast --workspace --timeout 300 --out Xml - name: Upload to codecov.io