--- a/node/cli/Cargo.toml +++ b/node/cli/Cargo.toml @@ -3,7 +3,7 @@ [build-dependencies.substrate-build-script-utils] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' ################################################################################ @@ -17,185 +17,185 @@ [dependencies.frame-benchmarking] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' [dependencies.frame-benchmarking-cli] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' [dependencies.pallet-transaction-payment-rpc] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' [dependencies.substrate-prometheus-endpoint] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '0.9.0' [dependencies.sc-basic-authorship] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '0.9.0' [dependencies.sc-chain-spec] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' [dependencies.sc-cli] features = ['wasmtime'] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '0.9.0' [dependencies.sc-client-api] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' [dependencies.sc-consensus] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '0.9.0' [dependencies.sc-consensus-aura] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '0.9.0' [dependencies.sc-executor] features = ['wasmtime'] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '0.9.0' [dependencies.sc-finality-grandpa] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '0.9.0' [dependencies.sc-keystore] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' [dependencies.sc-rpc] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' [dependencies.sc-rpc-api] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '0.9.0' [dependencies.sc-service] features = ['wasmtime'] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '0.9.0' [dependencies.sc-telemetry] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' [dependencies.sc-transaction-pool] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' [dependencies.sc-tracing] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' [dependencies.sp-block-builder] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' [dependencies.sp-api] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' [dependencies.sp-blockchain] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' [dependencies.sp-consensus] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '0.9.0' [dependencies.sp-consensus-aura] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '0.9.0' [dependencies.sp-core] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' [dependencies.sp-finality-grandpa] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' [dependencies.sp-inherents] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' [dependencies.sp-keystore] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '0.9.0' [dependencies.sp-offchain] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' [dependencies.sp-runtime] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' [dependencies.sp-session] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' [dependencies.sp-timestamp] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' [dependencies.sp-transaction-pool] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' [dependencies.sp-trie] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' [dependencies.substrate-frame-rpc-system] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' [dependencies.sc-network] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '0.9.0' [dependencies.serde] @@ -211,58 +211,58 @@ [dependencies.cumulus-client-consensus-aura] git = 'https://github.com/paritytech/cumulus.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' [dependencies.cumulus-client-consensus-common] git = 'https://github.com/paritytech/cumulus.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' [dependencies.cumulus-client-collator] git = 'https://github.com/paritytech/cumulus.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' [dependencies.cumulus-client-cli] git = 'https://github.com/paritytech/cumulus.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' [dependencies.cumulus-client-network] git = 'https://github.com/paritytech/cumulus.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' [dependencies.cumulus-primitives-core] git = 'https://github.com/paritytech/cumulus.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' [dependencies.cumulus-primitives-parachain-inherent] git = 'https://github.com/paritytech/cumulus.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' [dependencies.cumulus-client-service] git = 'https://github.com/paritytech/cumulus.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' ################################################################################ # Polkadot dependencies [dependencies.polkadot-primitives] git = "https://github.com/paritytech/polkadot" -branch = 'release-v0.9.7' +branch = 'release-v0.9.8' [dependencies.polkadot-service] git = "https://github.com/paritytech/polkadot" -branch = 'release-v0.9.7' +branch = 'release-v0.9.8' [dependencies.polkadot-cli] git = "https://github.com/paritytech/polkadot" -branch = 'release-v0.9.7' +branch = 'release-v0.9.8' [dependencies.polkadot-test-service] git = "https://github.com/paritytech/polkadot" -branch = 'release-v0.9.7' +branch = 'release-v0.9.8' [dependencies.polkadot-parachain] git = "https://github.com/paritytech/polkadot" -branch = 'release-v0.9.7' +branch = 'release-v0.9.8' ################################################################################ --- a/node/cli/src/service.rs +++ b/node/cli/src/service.rs @@ -486,6 +486,7 @@ // We got around 500ms for proposing block_proposal_slot_portion: SlotProportion::new(1f32 / 24f32), telemetry, + max_block_proposal_slot_portion: None, })) }, ) --- a/node/rpc/Cargo.toml +++ b/node/rpc/Cargo.toml @@ -13,33 +13,33 @@ futures = { version = "0.3.1", features = ["compat"] } jsonrpc-core = "15.0.0" jsonrpc-pubsub = "15.0.0" -# pallet-contracts-rpc = { version = "3.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.7' } -pallet-transaction-payment-rpc = { version = "3.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.7' } -pallet-transaction-payment-rpc-runtime-api = { version = "3.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.7' } -sc-client-api = { version = "3.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.7' } -sc-consensus-aura = { version = "0.9", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.7' } -sc-consensus-epochs = { version = "0.9", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.7' } -sc-finality-grandpa = { version = "0.9", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.7' } -sc-finality-grandpa-rpc = { version = "0.9", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.7' } -sc-keystore = { version = "3.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.7' } -sc-network = { version = "0.9", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.7' } -sc-rpc-api = { version = "0.9", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.7' } -sc-rpc = { version = "3.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.7' } -sc-service = { version = "0.9", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.7' } -sp-api = { version = "3.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.7' } -sp-block-builder = { version = "3.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.7' } -sp-blockchain = { version = "3.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.7' } -sp-consensus = { version = "0.9", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.7' } -sp-consensus-aura = { version = "0.9", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.7' } -sp-core = { version = "3.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.7' } -sp-offchain = { version = "3.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.7' } -sp-runtime = { version = "3.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.7' } -sp-storage = { version = "3.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.7' } -sp-session = { version = "3.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.7' } -sp-transaction-pool = { version = "3.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.7' } -sc-transaction-pool = { version = "3.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.7' } -sc-transaction-graph = { version = "3.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.7' } -substrate-frame-rpc-system = { version = "3.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.7' } +# pallet-contracts-rpc = { version = "3.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' } +pallet-transaction-payment-rpc = { version = "3.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' } +pallet-transaction-payment-rpc-runtime-api = { version = "3.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' } +sc-client-api = { version = "3.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' } +sc-consensus-aura = { version = "0.9", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' } +sc-consensus-epochs = { version = "0.9", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' } +sc-finality-grandpa = { version = "0.9", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' } +sc-finality-grandpa-rpc = { version = "0.9", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' } +sc-keystore = { version = "3.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' } +sc-network = { version = "0.9", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' } +sc-rpc-api = { version = "0.9", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' } +sc-rpc = { version = "3.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' } +sc-service = { version = "0.9", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' } +sp-api = { version = "3.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' } +sp-block-builder = { version = "3.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' } +sp-blockchain = { version = "3.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' } +sp-consensus = { version = "0.9", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' } +sp-consensus-aura = { version = "0.9", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' } +sp-core = { version = "3.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' } +sp-offchain = { version = "3.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' } +sp-runtime = { version = "3.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' } +sp-storage = { version = "3.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' } +sp-session = { version = "3.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' } +sp-transaction-pool = { version = "3.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' } +sc-transaction-pool = { version = "3.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' } +sc-transaction-graph = { version = "3.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' } +substrate-frame-rpc-system = { version = "3.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' } tokio = { version = "0.2.13", features = ["macros", "sync"] } pallet-ethereum = { git = "https://github.com/usetech-llc/frontier.git", branch = "injected-transactions-parachain" } --- a/pallets/contract-helpers/Cargo.toml +++ b/pallets/contract-helpers/Cargo.toml @@ -15,11 +15,11 @@ version = '0.1.0' [dependencies] -frame-support = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.7' } -frame-system = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.7' } -pallet-contracts = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.7' } -sp-runtime = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.7' } -sp-std = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.7' } +frame-support = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' } +frame-system = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' } +pallet-contracts = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' } +sp-runtime = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' } +sp-std = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' } [features] default = ["std"] @@ -29,4 +29,4 @@ "pallet-contracts/std", "sp-runtime/std", "sp-std/std", -] \ No newline at end of file +] --- a/pallets/inflation/Cargo.toml +++ b/pallets/inflation/Cargo.toml @@ -43,43 +43,43 @@ default-features = false optional = true git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' [dependencies.frame-support] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' [dependencies.frame-system] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' [dependencies.pallet-balances] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' [dependencies.pallet-timestamp] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' [dependencies.pallet-randomness-collective-flip] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' [dependencies.sp-std] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' [dependencies.serde] @@ -90,18 +90,18 @@ [dependencies.sp-runtime] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' [dependencies.sp-core] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' [dependencies.sp-io] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' --- a/pallets/nft-charge-transaction/Cargo.toml +++ b/pallets/nft-charge-transaction/Cargo.toml @@ -20,15 +20,15 @@ [dependencies] serde = { version = "1.0.119", default-features = false } -frame-support = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.7' } -frame-system = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.7' } -pallet-balances = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.7' } -pallet-transaction-payment = { default-features = false, version = "3.0.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.7' } -sp-std = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.7' } -frame-benchmarking = { default-features = false, version = "3.0.0", optional = true, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.7' } -sp-core = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.7' } -sp-io = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.7' } -sp-runtime = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.7' } +frame-support = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' } +frame-system = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' } +pallet-balances = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' } +pallet-transaction-payment = { default-features = false, version = "3.0.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' } +sp-std = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' } +frame-benchmarking = { default-features = false, version = "3.0.0", optional = true, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' } +sp-core = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' } +sp-io = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' } +sp-runtime = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' } pallet-nft-transaction-payment = { default-features = false, path="../nft-transaction-payment" } --- a/pallets/nft-charge-transaction/src/lib.rs +++ b/pallets/nft-charge-transaction/src/lib.rs @@ -76,7 +76,7 @@ where T::Call: Dispatchable, { - >::compute_fee(len as u32, info, tip) + >::compute_fee(len as u32, info, tip) } fn get_priority( --- a/pallets/nft-transaction-payment/Cargo.toml +++ b/pallets/nft-transaction-payment/Cargo.toml @@ -20,14 +20,14 @@ [dependencies] serde = { version = "1.0.119", default-features = false } -frame-support = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.7' } -frame-system = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.7' } -pallet-transaction-payment = { default-features = false, version = "3.0.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.7' } -sp-std = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.7' } -frame-benchmarking = { default-features = false, version = "3.0.0", optional = true, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.7' } -sp-core = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.7' } -sp-io = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.7' } -sp-runtime = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.7' } +frame-support = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' } +frame-system = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' } +pallet-transaction-payment = { default-features = false, version = "3.0.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' } +sp-std = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' } +frame-benchmarking = { default-features = false, version = "3.0.0", optional = true, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' } +sp-core = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' } +sp-io = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' } +sp-runtime = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' } up-sponsorship = { default-features = false, path = "../../primitives/sponsorship", version = "0.1.0" } --- a/pallets/nft/Cargo.toml +++ b/pallets/nft/Cargo.toml @@ -55,49 +55,49 @@ default-features = false optional = true git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' [dependencies.frame-support] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' [dependencies.frame-system] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' [dependencies.pallet-balances] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' [dependencies.pallet-timestamp] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' [dependencies.pallet-randomness-collective-flip] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' [dependencies.sp-std] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' [dependencies.pallet-transaction-payment] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' [dependencies.serde] @@ -108,19 +108,19 @@ [dependencies.sp-runtime] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' [dependencies.sp-core] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' [dependencies.sp-io] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' @@ -139,10 +139,9 @@ [dependencies] -ethereum-tx-sign = { version = "3.0.4", optional = true } ethereum = { default-features = false, version = "0.7.1" } rlp = { default-features = false, version = "0.5.0" } -sp-api = { default-features = false, version = '3.0.0', git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.7" } +sp-api = { default-features = false, version = '3.0.0', git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.8" } evm-coder = { default-features = false, path = "../../crates/evm-coder" } primitive-types = { version = "0.9.0", default-features = false, features = ["serde_no_std"] } --- a/pallets/scheduler/Cargo.toml +++ b/pallets/scheduler/Cargo.toml @@ -12,19 +12,19 @@ [dependencies] serde = { version = "1.0.119", default-features = false } codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false } -frame-support = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.7' } -frame-system = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.7' } -sp-runtime = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.7' } -sp-std = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.7' } -sp-io = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.7' } -frame-benchmarking = { default-features = false, version = '3.0.0', optional = true, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.7' } +frame-support = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' } +frame-system = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' } +sp-runtime = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' } +sp-std = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' } +sp-io = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' } +frame-benchmarking = { default-features = false, version = '3.0.0', optional = true, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' } up-sponsorship = { default-features = false, path = "../../primitives/sponsorship", version = "0.1.0" } log = { version = "0.4.14", default-features = false } [dev-dependencies] -sp-core = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.7' } -substrate-test-utils = { version = "3.0.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.7' } +sp-core = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' } +substrate-test-utils = { version = "3.0.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' } [features] default = ["std"] --- a/primitives/nft/Cargo.toml +++ b/primitives/nft/Cargo.toml @@ -11,10 +11,10 @@ [dependencies] codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ['derive'] } serde = { version = "1.0.119", features = ['derive'], default-features = false } -frame-support = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.7' } -frame-system = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.7' } -sp-core = { version = "3.0.0", default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.7' } -sp-runtime = { version = "3.0.0", default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.7' } +frame-support = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' } +frame-system = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' } +sp-core = { version = "3.0.0", default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' } +sp-runtime = { version = "3.0.0", default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' } [features] default = ["std"] --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -95,38 +95,38 @@ default-features = false git = 'https://github.com/paritytech/substrate.git' optional = true -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' [dependencies.frame-executive] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' [dependencies.frame-support] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' [dependencies.frame-system] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' [dependencies.frame-system-benchmarking] default-features = false git = 'https://github.com/paritytech/substrate.git' optional = true -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' [dependencies.frame-system-rpc-runtime-api] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' [dependencies.hex-literal] @@ -142,152 +142,152 @@ [dependencies.pallet-aura] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' [dependencies.pallet-balances] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' # Contracts specific packages # [dependencies.pallet-contracts] # git = 'https://github.com/paritytech/substrate.git' # default-features = false -# branch = 'polkadot-v0.9.7' +# branch = 'polkadot-v0.9.8' # version = '3.0.0' # [dependencies.pallet-contracts-primitives] # git = 'https://github.com/paritytech/substrate.git' # default-features = false -# branch = 'polkadot-v0.9.7' +# branch = 'polkadot-v0.9.8' # version = '3.0.0' # [dependencies.pallet-contracts-rpc-runtime-api] # git = 'https://github.com/paritytech/substrate.git' # default-features = false -# branch = 'polkadot-v0.9.7' +# branch = 'polkadot-v0.9.8' # version = '3.0.0' [dependencies.pallet-randomness-collective-flip] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' [dependencies.pallet-sudo] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' [dependencies.pallet-timestamp] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' [dependencies.pallet-transaction-payment] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' [dependencies.pallet-transaction-payment-rpc-runtime-api] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' [dependencies.pallet-treasury] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' [dependencies.pallet-vesting] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' [dependencies.sp-arithmetic] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' [dependencies.sp-api] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' [dependencies.sp-block-builder] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' [dependencies.sp-core] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' [dependencies.sp-consensus-aura] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '0.9.0' [dependencies.sp-inherents] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' [dependencies.sp-io] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' [dependencies.sp-offchain] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' [dependencies.sp-runtime] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' [dependencies.sp-session] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' [dependencies.sp-std] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' [dependencies.sp-transaction-pool] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' [dependencies.sp-version] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '3.0.0' [dependencies.smallvec] @@ -299,47 +299,47 @@ [dependencies.parachain-info] default-features = false git = 'https://github.com/paritytech/cumulus.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' version = '0.1.0' [dependencies.cumulus-pallet-aura-ext] git = 'https://github.com/paritytech/cumulus.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' default-features = false [dependencies.cumulus-pallet-parachain-system] git = 'https://github.com/paritytech/cumulus.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' default-features = false [dependencies.cumulus-primitives-core] git = 'https://github.com/paritytech/cumulus.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' default-features = false [dependencies.cumulus-pallet-xcm] git = 'https://github.com/paritytech/cumulus.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' default-features = false [dependencies.cumulus-pallet-dmp-queue] git = 'https://github.com/paritytech/cumulus.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' default-features = false [dependencies.cumulus-pallet-xcmp-queue] git = 'https://github.com/paritytech/cumulus.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' default-features = false [dependencies.cumulus-primitives-utility] git = 'https://github.com/paritytech/cumulus.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' default-features = false [dependencies.cumulus-primitives-timestamp] git = 'https://github.com/paritytech/cumulus.git' -branch = 'polkadot-v0.9.7' +branch = 'polkadot-v0.9.8' default-features = false ################################################################################ @@ -347,27 +347,27 @@ [dependencies.polkadot-parachain] git = 'https://github.com/paritytech/polkadot' -branch = 'release-v0.9.7' +branch = 'release-v0.9.8' default-features = false [dependencies.xcm] git = 'https://github.com/paritytech/polkadot' -branch = 'release-v0.9.7' +branch = 'release-v0.9.8' default-features = false [dependencies.xcm-builder] git = 'https://github.com/paritytech/polkadot' -branch = 'release-v0.9.7' +branch = 'release-v0.9.8' default-features = false [dependencies.xcm-executor] git = 'https://github.com/paritytech/polkadot' -branch = 'release-v0.9.7' +branch = 'release-v0.9.8' default-features = false [dependencies.pallet-xcm] git = 'https://github.com/paritytech/polkadot' -branch = 'release-v0.9.7' +branch = 'release-v0.9.8' default-features = false --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -252,6 +252,7 @@ type ChainId = ChainId; type Runner = pallet_evm::runner::stack::Runner; type OnChargeTransaction = (); + type FindAuthor = EthereumFindAuthor; } pub struct EthereumFindAuthor(core::marker::PhantomData); @@ -274,7 +275,6 @@ impl pallet_ethereum::Config for Runtime { type Event = Event; - type FindAuthor = EthereumFindAuthor; type StateRoot = pallet_ethereum::IntermediateStateRoot; type EvmSubmitLog = pallet_evm::Pallet; } @@ -687,9 +687,6 @@ type Currency = Balances; type CollectionCreationPrice = CollectionCreationPrice; type TreasuryAccountId = TreasuryAccountId; - - type EthereumChainId = ChainId; - type EthereumTransactionSender = pallet_ethereum::Module; } parameter_types! { @@ -753,7 +750,7 @@ { Balances: pallet_balances::{Pallet, Call, Storage, Config, Event} = 30, // Contracts: pallet_contracts::{Pallet, Call, Storage, Event}, - RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Pallet, Call, Storage}, + RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Pallet, Storage}, Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent}, TransactionPayment: pallet_transaction_payment::{Pallet, Storage}, Treasury: pallet_treasury::{Pallet, Call, Storage, Config, Event}, @@ -761,7 +758,7 @@ System: system::{Pallet, Call, Storage, Config, Event}, Vesting: pallet_vesting::{Pallet, Call, Config, Storage, Event}, - ParachainSystem: cumulus_pallet_parachain_system::{Pallet, Call, Storage, Inherent, Event, ValidateUnsigned} = 20, + ParachainSystem: cumulus_pallet_parachain_system::{Pallet, Call, Storage, Inherent, Event} = 20, ParachainInfo: parachain_info::{Pallet, Storage, Config} = 21, Aura: pallet_aura::{Pallet, Config}, @@ -910,8 +907,9 @@ fn validate_transaction( source: TransactionSource, tx: ::Extrinsic, + hash: ::Hash, ) -> TransactionValidity { - Executive::validate_transaction(source, tx) + Executive::validate_transaction(source, tx, hash) } } @@ -939,7 +937,7 @@ } fn author() -> H160 { - >::find_author() + >::find_author() } fn storage_at(address: H160, index: U256) -> H256 { @@ -1029,6 +1027,13 @@ Ethereum::current_transaction_statuses() ) } + + fn extrinsic_filter(xts: Vec<::Extrinsic>) -> Vec { + xts.into_iter().filter_map(|xt| match xt.function { + Call::Ethereum(pallet_ethereum::Call::transact(t)) => Some(t), + _ => None + }).collect() + } } impl sp_session::SessionKeys for Runtime {