difftreelog
build upgrade to polkadot-v0.9.8
in: master
13 files changed
node/cli/Cargo.tomldiffbeforeafterboth--- 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'
################################################################################
node/cli/src/service.rsdiffbeforeafterboth--- 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,
}))
},
)
node/rpc/Cargo.tomldiffbeforeafterboth--- 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" }
pallets/contract-helpers/Cargo.tomldiffbeforeafterboth--- 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
+]
pallets/inflation/Cargo.tomldiffbeforeafterboth--- 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'
pallets/nft-charge-transaction/Cargo.tomldiffbeforeafterboth--- 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" }
pallets/nft-charge-transaction/src/lib.rsdiffbeforeafterboth--- a/pallets/nft-charge-transaction/src/lib.rs
+++ b/pallets/nft-charge-transaction/src/lib.rs
@@ -76,7 +76,7 @@
where
T::Call: Dispatchable<Info = DispatchInfo>,
{
- <pallet_transaction_payment::Module<T>>::compute_fee(len as u32, info, tip)
+ <pallet_transaction_payment::Pallet<T>>::compute_fee(len as u32, info, tip)
}
fn get_priority(
pallets/nft-transaction-payment/Cargo.tomldiffbeforeafterboth--- 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" }
pallets/nft/Cargo.tomldiffbeforeafterboth--- 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"] }
pallets/scheduler/Cargo.tomldiffbeforeafterboth--- 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"]
primitives/nft/Cargo.tomldiffbeforeafterboth--- 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"]
runtime/Cargo.tomldiffbeforeafterboth1################################################################################2# Package 34[package]5authors = ['Unique Network <support@uniquenetwork.io>']6build = 'build.rs'7description = 'Substrate node nft'8edition = '2018'9homepage = 'https://unique.network'10license = 'All Rights Reserved'11name = 'nft-runtime'12repository = 'https://github.com/usetech-llc/nft_private/'13version = '3.0.0'1415[package.metadata.docs.rs]16targets = ['x86_64-unknown-linux-gnu']1718[features]19default = ['std']20runtime-benchmarks = [21 'hex-literal',22 'frame-benchmarking',23 'frame-support/runtime-benchmarks',24 'frame-system-benchmarking',25 'frame-system/runtime-benchmarks',26 'pallet-balances/runtime-benchmarks',27 'pallet-timestamp/runtime-benchmarks',28 'pallet-nft/runtime-benchmarks',29 'pallet-inflation/runtime-benchmarks',30 'sp-runtime/runtime-benchmarks',31]32std = [33 'codec/std',34 'cumulus-pallet-aura-ext/std',35 'cumulus-pallet-parachain-system/std',36 'cumulus-pallet-xcm/std',37 'cumulus-pallet-xcmp-queue/std',38 'cumulus-primitives-core/std',39 'cumulus-primitives-utility/std',40 'frame-executive/std',41 'frame-support/std',42 'frame-system/std',43 'frame-system-rpc-runtime-api/std',44 'pallet-aura/std',45 'pallet-balances/std',46 # 'pallet-contracts/std',47 # 'pallet-contracts-primitives/std',48 # 'pallet-contracts-rpc-runtime-api/std',49 # 'pallet-contract-helpers/std',50 'pallet-randomness-collective-flip/std',51 'pallet-sudo/std',52 'pallet-timestamp/std',53 'pallet-transaction-payment/std',54 'pallet-transaction-payment-rpc-runtime-api/std',55 'pallet-treasury/std',56 'pallet-vesting/std',57 'pallet-evm/std',58 'pallet-ethereum/std',59 'fp-rpc/std',60 'parachain-info/std',61 'serde',62 'pallet-inflation/std',63 'pallet-nft/std',64 'pallet-scheduler/std',65 'pallet-nft-charge-transaction/std',66 'pallet-nft-transaction-payment/std', 67 'nft-data-structs/std',68 'sp-api/std',69 'sp-block-builder/std',70 "sp-consensus-aura/std",71 'sp-core/std',72 'sp-inherents/std',73 'sp-io/std',74 'sp-offchain/std',75 'sp-runtime/std',76 'sp-session/std',77 'sp-std/std',78 'sp-transaction-pool/std',79 'sp-version/std',80 'xcm/std',81 'xcm-builder/std',82 'xcm-executor/std',83]8485################################################################################86# Substrate Dependencies8788[dependencies.codec]89default-features = false90features = ['derive']91package = 'parity-scale-codec'92version = '2.0.0'9394[dependencies.frame-benchmarking]95default-features = false96git = 'https://github.com/paritytech/substrate.git'97optional = true98branch = 'polkadot-v0.9.7'99version = '3.0.0'100101[dependencies.frame-executive]102default-features = false103git = 'https://github.com/paritytech/substrate.git'104branch = 'polkadot-v0.9.7'105version = '3.0.0'106107[dependencies.frame-support]108default-features = false109git = 'https://github.com/paritytech/substrate.git'110branch = 'polkadot-v0.9.7'111version = '3.0.0'112113[dependencies.frame-system]114default-features = false115git = 'https://github.com/paritytech/substrate.git'116branch = 'polkadot-v0.9.7'117version = '3.0.0'118119[dependencies.frame-system-benchmarking]120default-features = false121git = 'https://github.com/paritytech/substrate.git'122optional = true123branch = 'polkadot-v0.9.7'124version = '3.0.0'125126[dependencies.frame-system-rpc-runtime-api]127default-features = false128git = 'https://github.com/paritytech/substrate.git'129branch = 'polkadot-v0.9.7'130version = '3.0.0'131132[dependencies.hex-literal]133optional = true134version = '0.3.1'135136[dependencies.serde]137default-features = false138features = ['derive']139optional = true140version = '1.0.119'141142[dependencies.pallet-aura]143default-features = false144git = 'https://github.com/paritytech/substrate.git'145branch = 'polkadot-v0.9.7'146version = '3.0.0'147148[dependencies.pallet-balances]149default-features = false150git = 'https://github.com/paritytech/substrate.git'151branch = 'polkadot-v0.9.7'152version = '3.0.0'153154# Contracts specific packages155# [dependencies.pallet-contracts]156# git = 'https://github.com/paritytech/substrate.git'157# default-features = false158# branch = 'polkadot-v0.9.7'159# version = '3.0.0'160161# [dependencies.pallet-contracts-primitives]162# git = 'https://github.com/paritytech/substrate.git'163# default-features = false164# branch = 'polkadot-v0.9.7'165# version = '3.0.0'166167# [dependencies.pallet-contracts-rpc-runtime-api]168# git = 'https://github.com/paritytech/substrate.git'169# default-features = false170# branch = 'polkadot-v0.9.7'171# version = '3.0.0'172173[dependencies.pallet-randomness-collective-flip]174default-features = false175git = 'https://github.com/paritytech/substrate.git'176branch = 'polkadot-v0.9.7'177version = '3.0.0'178179[dependencies.pallet-sudo]180default-features = false181git = 'https://github.com/paritytech/substrate.git'182branch = 'polkadot-v0.9.7'183version = '3.0.0'184185[dependencies.pallet-timestamp]186default-features = false187git = 'https://github.com/paritytech/substrate.git'188branch = 'polkadot-v0.9.7'189version = '3.0.0'190191[dependencies.pallet-transaction-payment]192default-features = false193git = 'https://github.com/paritytech/substrate.git'194branch = 'polkadot-v0.9.7'195version = '3.0.0'196197[dependencies.pallet-transaction-payment-rpc-runtime-api]198default-features = false199git = 'https://github.com/paritytech/substrate.git'200branch = 'polkadot-v0.9.7'201version = '3.0.0'202203[dependencies.pallet-treasury]204default-features = false205git = 'https://github.com/paritytech/substrate.git'206branch = 'polkadot-v0.9.7'207version = '3.0.0'208209[dependencies.pallet-vesting]210default-features = false211git = 'https://github.com/paritytech/substrate.git'212branch = 'polkadot-v0.9.7'213version = '3.0.0'214215[dependencies.sp-arithmetic]216default-features = false217git = 'https://github.com/paritytech/substrate.git'218branch = 'polkadot-v0.9.7'219version = '3.0.0'220221[dependencies.sp-api]222default-features = false223git = 'https://github.com/paritytech/substrate.git'224branch = 'polkadot-v0.9.7'225version = '3.0.0'226227[dependencies.sp-block-builder]228default-features = false229git = 'https://github.com/paritytech/substrate.git'230branch = 'polkadot-v0.9.7'231version = '3.0.0'232233[dependencies.sp-core]234default-features = false235git = 'https://github.com/paritytech/substrate.git'236branch = 'polkadot-v0.9.7'237version = '3.0.0'238239[dependencies.sp-consensus-aura]240default-features = false241git = 'https://github.com/paritytech/substrate.git'242branch = 'polkadot-v0.9.7'243version = '0.9.0'244245[dependencies.sp-inherents]246default-features = false247git = 'https://github.com/paritytech/substrate.git'248branch = 'polkadot-v0.9.7'249version = '3.0.0'250251[dependencies.sp-io]252default-features = false253git = 'https://github.com/paritytech/substrate.git'254branch = 'polkadot-v0.9.7'255version = '3.0.0'256257[dependencies.sp-offchain]258default-features = false259git = 'https://github.com/paritytech/substrate.git'260branch = 'polkadot-v0.9.7'261version = '3.0.0'262263[dependencies.sp-runtime]264default-features = false265git = 'https://github.com/paritytech/substrate.git'266branch = 'polkadot-v0.9.7'267version = '3.0.0'268269[dependencies.sp-session]270default-features = false271git = 'https://github.com/paritytech/substrate.git'272branch = 'polkadot-v0.9.7'273version = '3.0.0'274275[dependencies.sp-std]276default-features = false277git = 'https://github.com/paritytech/substrate.git'278branch = 'polkadot-v0.9.7'279version = '3.0.0'280281[dependencies.sp-transaction-pool]282default-features = false283git = 'https://github.com/paritytech/substrate.git'284branch = 'polkadot-v0.9.7'285version = '3.0.0'286287[dependencies.sp-version]288default-features = false289git = 'https://github.com/paritytech/substrate.git'290branch = 'polkadot-v0.9.7'291version = '3.0.0'292293[dependencies.smallvec]294version = '1.4.1'295296################################################################################297# Cumulus dependencies298299[dependencies.parachain-info]300default-features = false301git = 'https://github.com/paritytech/cumulus.git'302branch = 'polkadot-v0.9.7'303version = '0.1.0'304305[dependencies.cumulus-pallet-aura-ext]306git = 'https://github.com/paritytech/cumulus.git'307branch = 'polkadot-v0.9.7'308default-features = false309310[dependencies.cumulus-pallet-parachain-system]311git = 'https://github.com/paritytech/cumulus.git'312branch = 'polkadot-v0.9.7'313default-features = false314315[dependencies.cumulus-primitives-core]316git = 'https://github.com/paritytech/cumulus.git'317branch = 'polkadot-v0.9.7'318default-features = false319320[dependencies.cumulus-pallet-xcm]321git = 'https://github.com/paritytech/cumulus.git'322branch = 'polkadot-v0.9.7'323default-features = false324325[dependencies.cumulus-pallet-dmp-queue]326git = 'https://github.com/paritytech/cumulus.git'327branch = 'polkadot-v0.9.7'328default-features = false329330[dependencies.cumulus-pallet-xcmp-queue]331git = 'https://github.com/paritytech/cumulus.git'332branch = 'polkadot-v0.9.7'333default-features = false334335[dependencies.cumulus-primitives-utility]336git = 'https://github.com/paritytech/cumulus.git'337branch = 'polkadot-v0.9.7'338default-features = false339340[dependencies.cumulus-primitives-timestamp]341git = 'https://github.com/paritytech/cumulus.git'342branch = 'polkadot-v0.9.7'343default-features = false344345################################################################################346# Polkadot dependencies347348[dependencies.polkadot-parachain]349git = 'https://github.com/paritytech/polkadot'350branch = 'release-v0.9.7'351default-features = false352353[dependencies.xcm]354git = 'https://github.com/paritytech/polkadot'355branch = 'release-v0.9.7'356default-features = false357358[dependencies.xcm-builder]359git = 'https://github.com/paritytech/polkadot'360branch = 'release-v0.9.7'361default-features = false362363[dependencies.xcm-executor]364git = 'https://github.com/paritytech/polkadot'365branch = 'release-v0.9.7'366default-features = false367368[dependencies.pallet-xcm]369git = 'https://github.com/paritytech/polkadot'370branch = 'release-v0.9.7'371default-features = false372373374375################################################################################376# local dependencies377378[dependencies]379pallet-nft = { path = '../pallets/nft', default-features = false, version = '3.0.0' }380pallet-inflation = { path = '../pallets/inflation', default-features = false, version = '3.0.0' }381nft-data-structs = { path = '../primitives/nft', default-features = false, version = '0.9.0' }382pallet-scheduler = { path = '../pallets/scheduler', default-features = false, version = '3.0.0' }383# pallet-contract-helpers = { path = '../pallets/contract-helpers', default-features = false, version = '0.1.0' }384pallet-nft-transaction-payment = { path = '../pallets/nft-transaction-payment', default-features = false, version = '3.0.0' }385pallet-nft-charge-transaction = { path = '../pallets/nft-charge-transaction', default-features = false, version = '3.0.0' }386387pallet-evm = { default-features = false, version = "5.0.0-dev", git = "https://github.com/usetech-llc/frontier.git", branch = "injected-transactions-parachain" }388pallet-ethereum = { default-features = false, version = "3.0.0-dev", git = "https://github.com/usetech-llc/frontier.git", branch = "injected-transactions-parachain" }389fp-rpc = { default-features = false, version = "2.0.0", git = "https://github.com/usetech-llc/frontier.git", branch = "injected-transactions-parachain" }390391################################################################################392# Build Dependencies393394[build-dependencies]395substrate-wasm-builder = '4.0.0'1################################################################################2# Package 34[package]5authors = ['Unique Network <support@uniquenetwork.io>']6build = 'build.rs'7description = 'Substrate node nft'8edition = '2018'9homepage = 'https://unique.network'10license = 'All Rights Reserved'11name = 'nft-runtime'12repository = 'https://github.com/usetech-llc/nft_private/'13version = '3.0.0'1415[package.metadata.docs.rs]16targets = ['x86_64-unknown-linux-gnu']1718[features]19default = ['std']20runtime-benchmarks = [21 'hex-literal',22 'frame-benchmarking',23 'frame-support/runtime-benchmarks',24 'frame-system-benchmarking',25 'frame-system/runtime-benchmarks',26 'pallet-balances/runtime-benchmarks',27 'pallet-timestamp/runtime-benchmarks',28 'pallet-nft/runtime-benchmarks',29 'pallet-inflation/runtime-benchmarks',30 'sp-runtime/runtime-benchmarks',31]32std = [33 'codec/std',34 'cumulus-pallet-aura-ext/std',35 'cumulus-pallet-parachain-system/std',36 'cumulus-pallet-xcm/std',37 'cumulus-pallet-xcmp-queue/std',38 'cumulus-primitives-core/std',39 'cumulus-primitives-utility/std',40 'frame-executive/std',41 'frame-support/std',42 'frame-system/std',43 'frame-system-rpc-runtime-api/std',44 'pallet-aura/std',45 'pallet-balances/std',46 # 'pallet-contracts/std',47 # 'pallet-contracts-primitives/std',48 # 'pallet-contracts-rpc-runtime-api/std',49 # 'pallet-contract-helpers/std',50 'pallet-randomness-collective-flip/std',51 'pallet-sudo/std',52 'pallet-timestamp/std',53 'pallet-transaction-payment/std',54 'pallet-transaction-payment-rpc-runtime-api/std',55 'pallet-treasury/std',56 'pallet-vesting/std',57 'pallet-evm/std',58 'pallet-ethereum/std',59 'fp-rpc/std',60 'parachain-info/std',61 'serde',62 'pallet-inflation/std',63 'pallet-nft/std',64 'pallet-scheduler/std',65 'pallet-nft-charge-transaction/std',66 'pallet-nft-transaction-payment/std', 67 'nft-data-structs/std',68 'sp-api/std',69 'sp-block-builder/std',70 "sp-consensus-aura/std",71 'sp-core/std',72 'sp-inherents/std',73 'sp-io/std',74 'sp-offchain/std',75 'sp-runtime/std',76 'sp-session/std',77 'sp-std/std',78 'sp-transaction-pool/std',79 'sp-version/std',80 'xcm/std',81 'xcm-builder/std',82 'xcm-executor/std',83]8485################################################################################86# Substrate Dependencies8788[dependencies.codec]89default-features = false90features = ['derive']91package = 'parity-scale-codec'92version = '2.0.0'9394[dependencies.frame-benchmarking]95default-features = false96git = 'https://github.com/paritytech/substrate.git'97optional = true98branch = 'polkadot-v0.9.8'99version = '3.0.0'100101[dependencies.frame-executive]102default-features = false103git = 'https://github.com/paritytech/substrate.git'104branch = 'polkadot-v0.9.8'105version = '3.0.0'106107[dependencies.frame-support]108default-features = false109git = 'https://github.com/paritytech/substrate.git'110branch = 'polkadot-v0.9.8'111version = '3.0.0'112113[dependencies.frame-system]114default-features = false115git = 'https://github.com/paritytech/substrate.git'116branch = 'polkadot-v0.9.8'117version = '3.0.0'118119[dependencies.frame-system-benchmarking]120default-features = false121git = 'https://github.com/paritytech/substrate.git'122optional = true123branch = 'polkadot-v0.9.8'124version = '3.0.0'125126[dependencies.frame-system-rpc-runtime-api]127default-features = false128git = 'https://github.com/paritytech/substrate.git'129branch = 'polkadot-v0.9.8'130version = '3.0.0'131132[dependencies.hex-literal]133optional = true134version = '0.3.1'135136[dependencies.serde]137default-features = false138features = ['derive']139optional = true140version = '1.0.119'141142[dependencies.pallet-aura]143default-features = false144git = 'https://github.com/paritytech/substrate.git'145branch = 'polkadot-v0.9.8'146version = '3.0.0'147148[dependencies.pallet-balances]149default-features = false150git = 'https://github.com/paritytech/substrate.git'151branch = 'polkadot-v0.9.8'152version = '3.0.0'153154# Contracts specific packages155# [dependencies.pallet-contracts]156# git = 'https://github.com/paritytech/substrate.git'157# default-features = false158# branch = 'polkadot-v0.9.8'159# version = '3.0.0'160161# [dependencies.pallet-contracts-primitives]162# git = 'https://github.com/paritytech/substrate.git'163# default-features = false164# branch = 'polkadot-v0.9.8'165# version = '3.0.0'166167# [dependencies.pallet-contracts-rpc-runtime-api]168# git = 'https://github.com/paritytech/substrate.git'169# default-features = false170# branch = 'polkadot-v0.9.8'171# version = '3.0.0'172173[dependencies.pallet-randomness-collective-flip]174default-features = false175git = 'https://github.com/paritytech/substrate.git'176branch = 'polkadot-v0.9.8'177version = '3.0.0'178179[dependencies.pallet-sudo]180default-features = false181git = 'https://github.com/paritytech/substrate.git'182branch = 'polkadot-v0.9.8'183version = '3.0.0'184185[dependencies.pallet-timestamp]186default-features = false187git = 'https://github.com/paritytech/substrate.git'188branch = 'polkadot-v0.9.8'189version = '3.0.0'190191[dependencies.pallet-transaction-payment]192default-features = false193git = 'https://github.com/paritytech/substrate.git'194branch = 'polkadot-v0.9.8'195version = '3.0.0'196197[dependencies.pallet-transaction-payment-rpc-runtime-api]198default-features = false199git = 'https://github.com/paritytech/substrate.git'200branch = 'polkadot-v0.9.8'201version = '3.0.0'202203[dependencies.pallet-treasury]204default-features = false205git = 'https://github.com/paritytech/substrate.git'206branch = 'polkadot-v0.9.8'207version = '3.0.0'208209[dependencies.pallet-vesting]210default-features = false211git = 'https://github.com/paritytech/substrate.git'212branch = 'polkadot-v0.9.8'213version = '3.0.0'214215[dependencies.sp-arithmetic]216default-features = false217git = 'https://github.com/paritytech/substrate.git'218branch = 'polkadot-v0.9.8'219version = '3.0.0'220221[dependencies.sp-api]222default-features = false223git = 'https://github.com/paritytech/substrate.git'224branch = 'polkadot-v0.9.8'225version = '3.0.0'226227[dependencies.sp-block-builder]228default-features = false229git = 'https://github.com/paritytech/substrate.git'230branch = 'polkadot-v0.9.8'231version = '3.0.0'232233[dependencies.sp-core]234default-features = false235git = 'https://github.com/paritytech/substrate.git'236branch = 'polkadot-v0.9.8'237version = '3.0.0'238239[dependencies.sp-consensus-aura]240default-features = false241git = 'https://github.com/paritytech/substrate.git'242branch = 'polkadot-v0.9.8'243version = '0.9.0'244245[dependencies.sp-inherents]246default-features = false247git = 'https://github.com/paritytech/substrate.git'248branch = 'polkadot-v0.9.8'249version = '3.0.0'250251[dependencies.sp-io]252default-features = false253git = 'https://github.com/paritytech/substrate.git'254branch = 'polkadot-v0.9.8'255version = '3.0.0'256257[dependencies.sp-offchain]258default-features = false259git = 'https://github.com/paritytech/substrate.git'260branch = 'polkadot-v0.9.8'261version = '3.0.0'262263[dependencies.sp-runtime]264default-features = false265git = 'https://github.com/paritytech/substrate.git'266branch = 'polkadot-v0.9.8'267version = '3.0.0'268269[dependencies.sp-session]270default-features = false271git = 'https://github.com/paritytech/substrate.git'272branch = 'polkadot-v0.9.8'273version = '3.0.0'274275[dependencies.sp-std]276default-features = false277git = 'https://github.com/paritytech/substrate.git'278branch = 'polkadot-v0.9.8'279version = '3.0.0'280281[dependencies.sp-transaction-pool]282default-features = false283git = 'https://github.com/paritytech/substrate.git'284branch = 'polkadot-v0.9.8'285version = '3.0.0'286287[dependencies.sp-version]288default-features = false289git = 'https://github.com/paritytech/substrate.git'290branch = 'polkadot-v0.9.8'291version = '3.0.0'292293[dependencies.smallvec]294version = '1.4.1'295296################################################################################297# Cumulus dependencies298299[dependencies.parachain-info]300default-features = false301git = 'https://github.com/paritytech/cumulus.git'302branch = 'polkadot-v0.9.8'303version = '0.1.0'304305[dependencies.cumulus-pallet-aura-ext]306git = 'https://github.com/paritytech/cumulus.git'307branch = 'polkadot-v0.9.8'308default-features = false309310[dependencies.cumulus-pallet-parachain-system]311git = 'https://github.com/paritytech/cumulus.git'312branch = 'polkadot-v0.9.8'313default-features = false314315[dependencies.cumulus-primitives-core]316git = 'https://github.com/paritytech/cumulus.git'317branch = 'polkadot-v0.9.8'318default-features = false319320[dependencies.cumulus-pallet-xcm]321git = 'https://github.com/paritytech/cumulus.git'322branch = 'polkadot-v0.9.8'323default-features = false324325[dependencies.cumulus-pallet-dmp-queue]326git = 'https://github.com/paritytech/cumulus.git'327branch = 'polkadot-v0.9.8'328default-features = false329330[dependencies.cumulus-pallet-xcmp-queue]331git = 'https://github.com/paritytech/cumulus.git'332branch = 'polkadot-v0.9.8'333default-features = false334335[dependencies.cumulus-primitives-utility]336git = 'https://github.com/paritytech/cumulus.git'337branch = 'polkadot-v0.9.8'338default-features = false339340[dependencies.cumulus-primitives-timestamp]341git = 'https://github.com/paritytech/cumulus.git'342branch = 'polkadot-v0.9.8'343default-features = false344345################################################################################346# Polkadot dependencies347348[dependencies.polkadot-parachain]349git = 'https://github.com/paritytech/polkadot'350branch = 'release-v0.9.8'351default-features = false352353[dependencies.xcm]354git = 'https://github.com/paritytech/polkadot'355branch = 'release-v0.9.8'356default-features = false357358[dependencies.xcm-builder]359git = 'https://github.com/paritytech/polkadot'360branch = 'release-v0.9.8'361default-features = false362363[dependencies.xcm-executor]364git = 'https://github.com/paritytech/polkadot'365branch = 'release-v0.9.8'366default-features = false367368[dependencies.pallet-xcm]369git = 'https://github.com/paritytech/polkadot'370branch = 'release-v0.9.8'371default-features = false372373374375################################################################################376# local dependencies377378[dependencies]379pallet-nft = { path = '../pallets/nft', default-features = false, version = '3.0.0' }380pallet-inflation = { path = '../pallets/inflation', default-features = false, version = '3.0.0' }381nft-data-structs = { path = '../primitives/nft', default-features = false, version = '0.9.0' }382pallet-scheduler = { path = '../pallets/scheduler', default-features = false, version = '3.0.0' }383# pallet-contract-helpers = { path = '../pallets/contract-helpers', default-features = false, version = '0.1.0' }384pallet-nft-transaction-payment = { path = '../pallets/nft-transaction-payment', default-features = false, version = '3.0.0' }385pallet-nft-charge-transaction = { path = '../pallets/nft-charge-transaction', default-features = false, version = '3.0.0' }386387pallet-evm = { default-features = false, version = "5.0.0-dev", git = "https://github.com/usetech-llc/frontier.git", branch = "injected-transactions-parachain" }388pallet-ethereum = { default-features = false, version = "3.0.0-dev", git = "https://github.com/usetech-llc/frontier.git", branch = "injected-transactions-parachain" }389fp-rpc = { default-features = false, version = "2.0.0", git = "https://github.com/usetech-llc/frontier.git", branch = "injected-transactions-parachain" }390391################################################################################392# Build Dependencies393394[build-dependencies]395substrate-wasm-builder = '4.0.0'runtime/src/lib.rsdiffbeforeafterboth--- a/runtime/src/lib.rs
+++ b/runtime/src/lib.rs
@@ -252,6 +252,7 @@
type ChainId = ChainId;
type Runner = pallet_evm::runner::stack::Runner<Self>;
type OnChargeTransaction = ();
+ type FindAuthor = EthereumFindAuthor<Aura>;
}
pub struct EthereumFindAuthor<F>(core::marker::PhantomData<F>);
@@ -274,7 +275,6 @@
impl pallet_ethereum::Config for Runtime {
type Event = Event;
- type FindAuthor = EthereumFindAuthor<Aura>;
type StateRoot = pallet_ethereum::IntermediateStateRoot;
type EvmSubmitLog = pallet_evm::Pallet<Runtime>;
}
@@ -687,9 +687,6 @@
type Currency = Balances;
type CollectionCreationPrice = CollectionCreationPrice;
type TreasuryAccountId = TreasuryAccountId;
-
- type EthereumChainId = ChainId;
- type EthereumTransactionSender = pallet_ethereum::Module<Runtime>;
}
parameter_types! {
@@ -753,7 +750,7 @@
{
Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>} = 30,
// Contracts: pallet_contracts::{Pallet, Call, Storage, Event<T>},
- 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<T>},
@@ -761,7 +758,7 @@
System: system::{Pallet, Call, Storage, Config, Event<T>},
Vesting: pallet_vesting::{Pallet, Call, Config<T>, Storage, Event<T>},
- ParachainSystem: cumulus_pallet_parachain_system::{Pallet, Call, Storage, Inherent, Event<T>, ValidateUnsigned} = 20,
+ ParachainSystem: cumulus_pallet_parachain_system::{Pallet, Call, Storage, Inherent, Event<T>} = 20,
ParachainInfo: parachain_info::{Pallet, Storage, Config} = 21,
Aura: pallet_aura::{Pallet, Config<T>},
@@ -910,8 +907,9 @@
fn validate_transaction(
source: TransactionSource,
tx: <Block as BlockT>::Extrinsic,
+ hash: <Block as BlockT>::Hash,
) -> TransactionValidity {
- Executive::validate_transaction(source, tx)
+ Executive::validate_transaction(source, tx, hash)
}
}
@@ -939,7 +937,7 @@
}
fn author() -> H160 {
- <pallet_ethereum::Module<Runtime>>::find_author()
+ <pallet_evm::Module<Runtime>>::find_author()
}
fn storage_at(address: H160, index: U256) -> H256 {
@@ -1029,6 +1027,13 @@
Ethereum::current_transaction_statuses()
)
}
+
+ fn extrinsic_filter(xts: Vec<<Block as sp_api::BlockT>::Extrinsic>) -> Vec<pallet_ethereum::Transaction> {
+ xts.into_iter().filter_map(|xt| match xt.function {
+ Call::Ethereum(pallet_ethereum::Call::transact(t)) => Some(t),
+ _ => None
+ }).collect()
+ }
}
impl sp_session::SessionKeys<Block> for Runtime {