diff --git a/Cargo.lock b/Cargo.lock index 51eb289b3e..697bd4551d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2241,7 +2241,7 @@ version = "0.1.0" source = "git+https://github.com/paritytech//cumulus?rev=0d17cf6bef320f156f2859d6d2b0abd4154ae1d5#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" dependencies = [ "async-trait", - "cumulus-client-pov-recovery 0.1.0 (git+https://github.com/paritytech//cumulus?rev=0d17cf6bef320f156f2859d6d2b0abd4154ae1d5)", + "cumulus-client-pov-recovery", "cumulus-primitives-core", "cumulus-relay-chain-interface", "dyn-clone", @@ -2325,30 +2325,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "cumulus-client-pov-recovery" -version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#a188eb95c522f3ca4c43ef7fed19a6107224217c" -dependencies = [ - "async-trait", - "cumulus-primitives-core", - "cumulus-relay-chain-interface", - "futures 0.3.28", - "futures-timer", - "parity-scale-codec", - "polkadot-node-primitives", - "polkadot-node-subsystem", - "polkadot-overseer", - "polkadot-primitives", - "rand 0.8.5", - "sc-client-api", - "sc-consensus", - "sp-consensus", - "sp-maybe-compressed-blob", - "sp-runtime", - "tracing", -] - [[package]] name = "cumulus-client-pov-recovery" version = "0.1.0" @@ -2382,7 +2358,7 @@ dependencies = [ "cumulus-client-collator", "cumulus-client-consensus-common", "cumulus-client-network", - "cumulus-client-pov-recovery 0.1.0 (git+https://github.com/paritytech//cumulus?rev=0d17cf6bef320f156f2859d6d2b0abd4154ae1d5)", + "cumulus-client-pov-recovery", "cumulus-primitives-core", "cumulus-relay-chain-inprocess-interface", "cumulus-relay-chain-interface", @@ -2793,7 +2769,7 @@ dependencies = [ "cumulus-client-cli", "cumulus-client-consensus-common", "cumulus-client-consensus-relay-chain", - "cumulus-client-pov-recovery 0.1.0 (git+https://github.com/paritytech//cumulus?rev=0d17cf6bef320f156f2859d6d2b0abd4154ae1d5)", + "cumulus-client-pov-recovery", "cumulus-client-service", "cumulus-pallet-parachain-system", "cumulus-primitives-core", @@ -8312,7 +8288,7 @@ dependencies = [ [[package]] name = "pallet-asset-conversion" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#b8d485fd4942539c438bf25a7823e410360fa053" +source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-support", @@ -8804,7 +8780,7 @@ dependencies = [ [[package]] name = "pallet-message-queue" version = "7.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#b8d485fd4942539c438bf25a7823e410360fa053" +source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-support", @@ -8856,7 +8832,7 @@ dependencies = [ [[package]] name = "pallet-nft-fractionalization" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#b8d485fd4942539c438bf25a7823e410360fa053" +source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-support", @@ -15217,7 +15193,7 @@ dependencies = [ "cumulus-client-consensus-common", "cumulus-client-consensus-relay-chain", "cumulus-client-network", - "cumulus-client-pov-recovery 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0)", + "cumulus-client-pov-recovery", "cumulus-client-service", "cumulus-primitives-core", "cumulus-primitives-parachain-inherent", diff --git a/Cargo.toml b/Cargo.toml index 41742ac4a9..fdcacd7a6d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -136,6 +136,7 @@ frame-system-rpc-runtime-api = { git = "https://github.com/paritytech//substrate frame-try-runtime = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } mmr-gadget = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } mmr-rpc = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } +pallet-asset-conversion = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } pallet-asset-tx-payment = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } pallet-assets = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } pallet-aura = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } @@ -155,13 +156,16 @@ pallet-election-provider-multi-phase = { git = "https://github.com/paritytech//s pallet-election-provider-support-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } pallet-elections-phragmen = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } pallet-fast-unstake = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } +pallet-glutton = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } pallet-grandpa = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } pallet-identity = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } pallet-im-online = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } pallet-indices = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } pallet-membership = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } +pallet-message-queue = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } pallet-mmr = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } pallet-multisig = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } +pallet-nft-fractionalization = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } pallet-nfts = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } pallet-nfts-runtime-api = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } pallet-nis = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } @@ -208,6 +212,7 @@ sc-consensus-aura = { git = "https://github.com/paritytech//substrate", rev = "9 sc-consensus-babe = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } sc-consensus-babe-rpc = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } sc-consensus-beefy = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } +sc-consensus-beefy-rpc = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } sc-consensus-epochs = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } sc-consensus-grandpa = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } sc-consensus-grandpa-rpc = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } @@ -242,7 +247,6 @@ sp-application-crypto = { git = "https://github.com/paritytech//substrate", rev sp-arithmetic = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } sp-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } sp-block-builder = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sc-consensus-beefy-rpc = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } sp-blockchain = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } sp-consensus = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } sp-consensus-aura = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } @@ -286,7 +290,6 @@ substrate-test-utils = { git = "https://github.com/paritytech//substrate", rev = substrate-test-utils-derive = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } substrate-wasm-builder = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } try-runtime-cli = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -pallet-glutton = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } [patch."https://github.com/paritytech/polkadot"] kusama-runtime = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" } @@ -329,11 +332,14 @@ polkadot-collator-protocol = { git = "https://github.com/paritytech//polkadot", polkadot-availability-recovery = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" } [patch."https://github.com/paritytech/cumulus"] +asset-hub-kusama-runtime = { git = "https://github.com/paritytech//cumulus", rev = "0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" } +asset-hub-polkadot-runtime = { git = "https://github.com/paritytech//cumulus", rev = "0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" } cumulus-client-cli = { git = "https://github.com/paritytech//cumulus", rev = "0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" } cumulus-client-consensus-aura = { git = "https://github.com/paritytech//cumulus", rev = "0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" } cumulus-client-consensus-common = { git = "https://github.com/paritytech//cumulus", rev = "0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" } cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech//cumulus", rev = "0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" } cumulus-client-network = { git = "https://github.com/paritytech//cumulus", rev = "0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" } +cumulus-client-pov-recovery = { git = "https://github.com/paritytech//cumulus", rev = "0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" } cumulus-client-service = { git = "https://github.com/paritytech//cumulus", rev = "0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" } cumulus-pallet-aura-ext = { git = "https://github.com/paritytech//cumulus", rev = "0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" } cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" } @@ -352,6 +358,4 @@ cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech//cumu cumulus-test-relay-validation-worker-provider = { git = "https://github.com/paritytech//cumulus", rev = "0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" } parachain-info = { git = "https://github.com/paritytech//cumulus", rev = "0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" } parachains-common = { git = "https://github.com/paritytech//cumulus", rev = "0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" } -asset-hub-kusama-runtime = { git = "https://github.com/paritytech//cumulus", rev = "0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" } -asset-hub-polkadot-runtime = { git = "https://github.com/paritytech//cumulus", rev = "0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" } xcm-emulator = { git = "https://github.com/paritytech//cumulus", rev = "0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" } diff --git a/Makefile b/Makefile index 80ac7dbdcf..d5f089082b 100644 --- a/Makefile +++ b/Makefile @@ -249,19 +249,19 @@ endif ifeq ($(words $(pallet_folder)), 0) $(error pallet_folder not defined) endif - cargo run $(options) --release --bin=acala --features=runtime-benchmarks --features=with-mandala-runtime -- benchmark pallet --chain=dev --steps=50 --repeat=20 --pallet=$(pallet) --extrinsic="*" --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./modules/$(pallet_folder)/src/weights.rs --template=./templates/module-weight-template.hbs + cargo run $(options) --release --bin=acala --features=runtime-benchmarks --features=with-mandala-runtime -- benchmark pallet --chain=dev --steps=50 --repeat=20 --pallet=$(pallet) --extrinsic="*" --wasm-execution=compiled --heap-pages=4096 --output=./modules/$(pallet_folder)/src/weights.rs --template=./templates/module-weight-template.hbs .PHONY: benchmark-mandala benchmark-mandala: - cargo run $(options) --profile production --features=runtime-benchmarks --features=with-mandala-runtime -- benchmark pallet --chain=dev --steps=50 --repeat=20 '--pallet=$(or $(pallet),*)' '--extrinsic=*' --execution=wasm --wasm-execution=compiled --heap-pages=4096 --template=./templates/runtime-weight-template.hbs --output=./runtime/mandala/src/weights/ + cargo run $(options) --profile production --features=runtime-benchmarks --features=with-mandala-runtime -- benchmark pallet --chain=dev --steps=50 --repeat=20 '--pallet=$(or $(pallet),*)' '--extrinsic=*' --wasm-execution=compiled --heap-pages=4096 --template=./templates/runtime-weight-template.hbs --output=./runtime/mandala/src/weights/ .PHONY: benchmark-karura benchmark-karura: - cargo run $(options) --profile production --features=runtime-benchmarks --features=with-karura-runtime -- benchmark pallet --chain=karura-dev --steps=50 --repeat=20 '--pallet=$(or $(pallet),*)' '--extrinsic=*' --execution=wasm --wasm-execution=compiled --heap-pages=4096 --template=./templates/runtime-weight-template.hbs --output=./runtime/karura/src/weights/ + cargo run $(options) --profile production --features=runtime-benchmarks --features=with-karura-runtime -- benchmark pallet --chain=karura-dev --steps=50 --repeat=20 '--pallet=$(or $(pallet),*)' '--extrinsic=*' --wasm-execution=compiled --heap-pages=4096 --template=./templates/runtime-weight-template.hbs --output=./runtime/karura/src/weights/ .PHONY: benchmark-acala benchmark-acala: - cargo run $(options) --profile production --features=runtime-benchmarks --features=with-acala-runtime -- benchmark pallet --chain=acala-dev --steps=50 --repeat=20 '--pallet=$(or $(pallet),*)' '--extrinsic=*' --execution=wasm --wasm-execution=compiled --heap-pages=4096 --template=./templates/runtime-weight-template.hbs --output=./runtime/acala/src/weights/ + cargo run $(options) --profile production --features=runtime-benchmarks --features=with-acala-runtime -- benchmark pallet --chain=acala-dev --steps=50 --repeat=20 '--pallet=$(or $(pallet),*)' '--extrinsic=*' --wasm-execution=compiled --heap-pages=4096 --template=./templates/runtime-weight-template.hbs --output=./runtime/acala/src/weights/ .PHONY: benchmark-machine benchmark-machine: diff --git a/launch/config.yml b/launch/config.yml index b7825bf4b5..efee3c6c1f 100644 --- a/launch/config.yml +++ b/launch/config.yml @@ -11,7 +11,6 @@ relaychain: flags: - --rpc-methods=unsafe - --wasm-execution=compiled - - --execution=wasm nodes: - name: alice - name: bob @@ -32,10 +31,8 @@ parachains: - --rpc-methods=unsafe - --force-authoring - --wasm-execution=compiled - - --execution=wasm relaychainFlags: - --wasm-execution=compiled - - --execution=wasm env: RUST_LOG: sc_basic_authorship=trace,cumulus-consensus=trace,cumulus-collator=trace,collator_protocol=trace,collation_generation=trace,aura=debug volumePath: /acala/data diff --git a/launch/karura-bifrost.yml b/launch/karura-bifrost.yml index 7b7c55366d..349b342267 100644 --- a/launch/karura-bifrost.yml +++ b/launch/karura-bifrost.yml @@ -22,7 +22,6 @@ relaychain: flags: - --rpc-methods=unsafe - --wasm-execution=compiled - - --execution=wasm nodes: - name: alice - name: bob @@ -43,10 +42,8 @@ parachains: - --rpc-methods=unsafe - --force-authoring - --wasm-execution=compiled - - --execution=wasm relaychainFlags: - --wasm-execution=compiled - - --execution=wasm env: RUST_LOG: sc_basic_authorship=trace,cumulus-consensus=trace,cumulus-collator=trace,collator_protocol=trace,collation_generation=trace,aura=debug volumePath: /acala/data @@ -67,10 +64,8 @@ parachains: - --rpc-methods=unsafe - --force-authoring - --wasm-execution=compiled - - --execution=wasm relaychainFlags: - --wasm-execution=compiled - - --execution=wasm env: RUST_LOG: sc_basic_authorship=trace,cumulus-consensus=trace,cumulus-collator=trace,collator_protocol=trace,collation_generation=trace,aura=debug volumePath: /data diff --git a/orml b/orml index f7c8b38cdc..22ae492498 160000 --- a/orml +++ b/orml @@ -1 +1 @@ -Subproject commit f7c8b38cdc0fa6dddf915a20d2ccf6ae4ad5cac5 +Subproject commit 22ae49249854b058043665f6642ac4ecad5b78da diff --git a/ts-tests/tests/util.ts b/ts-tests/tests/util.ts index 7678fc87de..b29f2e8a11 100644 --- a/ts-tests/tests/util.ts +++ b/ts-tests/tests/util.ts @@ -31,7 +31,6 @@ export async function startAcalaNode(autoClaim = true): Promise<{ binary: ChildP `-lruntime=debug`, `-levm=debug`, `--instant-sealing`, - `--execution=native`, // Faster execution using native `--no-telemetry`, `--no-prometheus`, `--port=${P2P_PORT}`,