diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 20a965b751..a496d01aff 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -24,7 +24,7 @@ jobs: target: wasm32-unknown-unknown default: true - name: Generate WeightInfo Files - run: make generate-all-weights + run: make generate-bifrost-weights - name: Commit Automatically uses: stefanzweifel/git-auto-commit-action@v4 with: diff --git a/Cargo.lock b/Cargo.lock index 055eaab825..ad5f7ef2fa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5197,7 +5197,7 @@ dependencies = [ [[package]] name = "node-cli" -version = "0.9.22" +version = "0.9.23" dependencies = [ "cumulus-client-cli", "cumulus-client-service", diff --git a/node/cli/Cargo.toml b/node/cli/Cargo.toml index dd7e3ed320..95336dd95e 100644 --- a/node/cli/Cargo.toml +++ b/node/cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "node-cli" -version = "0.9.22" +version = "0.9.23" authors = ["Liebi Technologies "] description = "Bifrost Parachain Node" build = "build.rs" diff --git a/pallets/salp/Cargo.toml b/pallets/salp/Cargo.toml index 79337ed82b..dcfc1e1e17 100644 --- a/pallets/salp/Cargo.toml +++ b/pallets/salp/Cargo.toml @@ -19,10 +19,11 @@ sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "pol xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13", default-features = false } xcm-support = { path = "../../xcm-support", default-features = false } orml-traits = { version = "0.4.1-dev", default-features = false } +xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13",default-features = false } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13",default-features = false } +pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13",default-features = false } [dev-dependencies] -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13" } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13" } pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13"} smallvec = "1.6.1" sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13" } @@ -31,7 +32,6 @@ sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkad orml-tokens = "0.4.1-dev" orml-currencies = "0.4.1-dev" pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13" } -pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13" } bifrost-bancor = { path = "../../pallets/bancor" } bifrost-runtime-common = { path = "../../runtime/common" } @@ -50,6 +50,9 @@ std = [ "sp-arithmetic/std", "orml-traits/std", "xcm/std", + "xcm-builder/std", + "pallet-xcm/std", + "pallet-collective/std", "xcm-support/std", ] diff --git a/runtime/bifrost-kusama/Cargo.toml b/runtime/bifrost-kusama/Cargo.toml index 1ee0ae3171..8afe231cc1 100644 --- a/runtime/bifrost-kusama/Cargo.toml +++ b/runtime/bifrost-kusama/Cargo.toml @@ -43,7 +43,7 @@ pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polka pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } -pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } +pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13",default-features = false } pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } pallet-identity = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } @@ -73,11 +73,11 @@ pallet-collator-selection = { git = "https://github.com/paritytech/cumulus", bra parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.13", default-features = false } # Polkadot dependencies -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13", default-features = false } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13",default-features = false} polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13", default-features = false } polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13", default-features = false } xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13", default-features = false } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13", default-features = false } +xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13",default-features = false} xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13", default-features = false } # Bifrost diff --git a/runtime/bifrost-kusama/src/lib.rs b/runtime/bifrost-kusama/src/lib.rs index 05e02d6229..fbc147ec3f 100644 --- a/runtime/bifrost-kusama/src/lib.rs +++ b/runtime/bifrost-kusama/src/lib.rs @@ -136,7 +136,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("bifrost"), impl_name: create_runtime_str!("bifrost"), authoring_version: 1, - spec_version: 922, + spec_version: 923, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 1, @@ -2024,50 +2024,6 @@ impl_runtime_apis! { } } -pub struct LatestRuntimeUpgrade; -impl OnRuntimeUpgrade for LatestRuntimeUpgrade { - fn on_runtime_upgrade() -> Weight { - let w_ksm = bifrost_liquidity_mining::migration::v2::Upgrade::< - Runtime, - bifrost_liquidity_mining::Instance1, - >::on_runtime_upgrade(); - let w_dot = bifrost_liquidity_mining::migration::v2::Upgrade::< - Runtime, - bifrost_liquidity_mining::Instance2, - >::on_runtime_upgrade(); - - w_ksm + w_dot - } - - #[cfg(feature = "try-runtime")] - fn pre_upgrade() -> Result<(), &'static str> { - bifrost_liquidity_mining::migration::v2::Upgrade::< - Runtime, - bifrost_liquidity_mining::Instance1, - >::pre_upgrade()?; - bifrost_liquidity_mining::migration::v2::Upgrade::< - Runtime, - bifrost_liquidity_mining::Instance2, - >::pre_upgrade()?; - - Ok(()) - } - - #[cfg(feature = "try-runtime")] - fn post_upgrade() -> Result<(), &'static str> { - bifrost_liquidity_mining::migration::v2::Upgrade::< - Runtime, - bifrost_liquidity_mining::Instance1, - >::post_upgrade()?; - bifrost_liquidity_mining::migration::v2::Upgrade::< - Runtime, - bifrost_liquidity_mining::Instance2, - >::post_upgrade()?; - - Ok(()) - } -} - struct CheckInherents; impl cumulus_pallet_parachain_system::CheckInherents for CheckInherents { diff --git a/scripts/generate-weights.sh b/scripts/generate-weights.sh index 90e8d0d19d..05722ed884 100644 --- a/scripts/generate-weights.sh +++ b/scripts/generate-weights.sh @@ -10,7 +10,7 @@ # sh ./script/generate-weights.sh asgard bifrost # 1. Build all-release which is added with "runtime-benchmarks" feature; -make "build-all-release-with-bench" +make build-bifrost-release-with-bench # 2. Filter the pallets of ${runtime} that should be executed benchmark; IFS=', ' read -r -a runtimes <<< $@; for runtime in "${runtimes[@]}" @@ -31,6 +31,6 @@ do --wasm-execution=compiled \ --heap-pages=4096 \ --header=./HEADER-GPL3 \ - --output="./runtime/${runtime}/src/weights/${pallet}.rs"; + --output="./runtime/${runtime}-kusama/src/weights/${pallet}.rs"; done done \ No newline at end of file