--- 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.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' ################################################################################ @@ -17,196 +17,196 @@ [dependencies.frame-benchmarking] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' [dependencies.frame-benchmarking-cli] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' [dependencies.pallet-transaction-payment-rpc] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' [dependencies.substrate-prometheus-endpoint] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '0.9.0' [dependencies.sc-basic-authorship] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '0.9.0' [dependencies.sc-chain-spec] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' [dependencies.sc-cli] features = ['wasmtime'] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '0.9.0' [dependencies.sc-client-api] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' [dependencies.sc-consensus] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '0.9.0' [dependencies.sc-consensus-aura] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '0.9.0' [dependencies.sc-executor] features = ['wasmtime'] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '0.9.0' [dependencies.sc-finality-grandpa] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '0.9.0' [dependencies.sc-keystore] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' [dependencies.sc-rpc] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' [dependencies.sc-rpc-api] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '0.9.0' [dependencies.sc-service] features = ['wasmtime'] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '0.9.0' [dependencies.sc-telemetry] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' [dependencies.sc-transaction-pool] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' [dependencies.sc-tracing] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' [dependencies.sp-block-builder] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' [dependencies.sp-api] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' [dependencies.sp-blockchain] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' [dependencies.sp-consensus] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '0.9.0' [dependencies.sp-consensus-aura] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '0.9.0' [dependencies.sp-core] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' [dependencies.sp-finality-grandpa] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' [dependencies.sp-inherents] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' [dependencies.sp-keystore] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '0.9.0' [dependencies.sp-offchain] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' [dependencies.sp-runtime] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' [dependencies.sp-session] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' [dependencies.sp-timestamp] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' [dependencies.sp-transaction-pool] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' [dependencies.sp-trie] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' [dependencies.substrate-frame-rpc-system] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' [dependencies.pallet-contracts] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' [dependencies.pallet-contracts-rpc] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' [dependencies.sc-network] git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '0.9.0' [dependencies.serde] @@ -222,58 +222,58 @@ [dependencies.cumulus-client-consensus-aura] git = 'https://github.com/paritytech/cumulus.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' [dependencies.cumulus-client-consensus-common] git = 'https://github.com/paritytech/cumulus.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' [dependencies.cumulus-client-collator] git = 'https://github.com/paritytech/cumulus.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' [dependencies.cumulus-client-cli] git = 'https://github.com/paritytech/cumulus.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' [dependencies.cumulus-client-network] git = 'https://github.com/paritytech/cumulus.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' [dependencies.cumulus-primitives-core] git = 'https://github.com/paritytech/cumulus.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' [dependencies.cumulus-primitives-parachain-inherent] git = 'https://github.com/paritytech/cumulus.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' [dependencies.cumulus-client-service] git = 'https://github.com/paritytech/cumulus.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' ################################################################################ # Polkadot dependencies [dependencies.polkadot-primitives] git = "https://github.com/paritytech/polkadot" -branch = 'release-v0.9.3' +branch = 'release-v0.9.7' [dependencies.polkadot-service] git = "https://github.com/paritytech/polkadot" -branch = 'release-v0.9.3' +branch = 'release-v0.9.7' [dependencies.polkadot-cli] git = "https://github.com/paritytech/polkadot" -branch = 'release-v0.9.3' +branch = 'release-v0.9.7' [dependencies.polkadot-test-service] git = "https://github.com/paritytech/polkadot" -branch = 'release-v0.9.3' +branch = 'release-v0.9.7' [dependencies.polkadot-parachain] git = "https://github.com/paritytech/polkadot" -branch = 'release-v0.9.3' +branch = 'release-v0.9.7' ################################################################################ @@ -322,7 +322,7 @@ fc-rpc = { version = "2.0.0-dev", git = "https://github.com/usetech-llc/frontier.git", branch = "injected-transactions-parachain" } fc-db = { version = "1.0.0", git = "https://github.com/usetech-llc/frontier.git", branch = "injected-transactions-parachain" } fp-rpc = { version = "2.0.0", git = "https://github.com/usetech-llc/frontier.git", branch = "injected-transactions-parachain" } -pallet-ethereum = { version = "2.0.0-dev", git = "https://github.com/usetech-llc/frontier.git", branch = "injected-transactions-parachain" } +pallet-ethereum = { version = "3.0.0-dev", git = "https://github.com/usetech-llc/frontier.git", branch = "injected-transactions-parachain" } nft-rpc = { path = "../rpc" } --- a/node/cli/src/chain_spec.rs +++ b/node/cli/src/chain_spec.rs @@ -160,23 +160,23 @@ .to_vec(), changes_trie_config: Default::default(), }, - pallet_balances: BalancesConfig { + balances: BalancesConfig { balances: endowed_accounts .iter() .cloned() .map(|k| (k, 1 << 70)) .collect(), }, - pallet_treasury: Default::default(), - pallet_sudo: SudoConfig { key: root_key }, - pallet_vesting: VestingConfig { + treasury: Default::default(), + sudo: SudoConfig { key: root_key }, + vesting: VestingConfig { vesting: vested_accounts .iter() .cloned() .map(|k| (k, 1000, 100, 1 << 98)) .collect(), }, - pallet_nft: NftConfig { + nft: NftConfig { collection_id: vec![( 1, Collection { @@ -215,13 +215,13 @@ }, }, parachain_info: nft_runtime::ParachainInfoConfig { parachain_id: id }, - pallet_aura: nft_runtime::AuraConfig { + aura: nft_runtime::AuraConfig { authorities: initial_authorities, }, - cumulus_pallet_aura_ext: Default::default(), - pallet_evm: EVMConfig { + aura_ext: Default::default(), + evm: EVMConfig { accounts: BTreeMap::new(), }, - pallet_ethereum: EthereumConfig {}, + ethereum: EthereumConfig {}, } } --- a/node/cli/src/command.rs +++ b/node/cli/src/command.rs @@ -267,9 +267,6 @@ let runner = cli.create_runner(&cli.run.normalize())?; runner.run_node_until_exit(|config| async move { - // TODO - let key = sp_core::Pair::generate().0; - let para_id = chain_spec::Extensions::try_get(&*config.chain_spec).map(|e| e.para_id); @@ -306,7 +303,7 @@ } ); - crate::service::start_node(config, key, polkadot_config, id) + crate::service::start_node(config, polkadot_config, id) .await .map(|r| r.0) .map_err(Into::into) --- a/node/cli/src/service.rs +++ b/node/cli/src/service.rs @@ -23,9 +23,6 @@ }; use cumulus_primitives_core::ParaId; -// Polkadot Imports -use polkadot_primitives::v1::CollatorPair; - // Substrate Imports use sc_client_api::ExecutorProvider; pub use sc_executor::NativeExecutor; @@ -159,7 +156,7 @@ config.transaction_pool.clone(), config.role.is_authority().into(), config.prometheus_registry(), - task_manager.spawn_handle(), + task_manager.spawn_essential_handle(), client.clone(), ); @@ -202,7 +199,6 @@ #[sc_tracing::logging::prefix_logs_with("Parachain")] async fn start_node_impl( parachain_config: Configuration, - collator_key: CollatorPair, polkadot_config: Configuration, id: ParaId, build_import_queue: BIQ, @@ -244,15 +240,12 @@ telemetry_worker_handle, ) = params.other; - let relay_chain_full_node = cumulus_client_service::build_polkadot_full_node( - polkadot_config, - collator_key.clone(), - telemetry_worker_handle, - ) - .map_err(|e| match e { - polkadot_service::Error::Sub(x) => x, - s => format!("{}", s).into(), - })?; + let relay_chain_full_node = + cumulus_client_service::build_polkadot_full_node(polkadot_config, telemetry_worker_handle) + .map_err(|e| match e { + polkadot_service::Error::Sub(x) => x, + s => format!("{}", s).into(), + })?; let client = params.client.clone(); let backend = params.backend.clone(); @@ -269,7 +262,7 @@ let transaction_pool = params.transaction_pool.clone(); let mut task_manager = params.task_manager; let import_queue = cumulus_client_service::SharedImportQueue::new(params.import_queue); - let (network, network_status_sinks, system_rpc_tx, start_network) = + let (network, system_rpc_tx, start_network) = sc_service::build_network(sc_service::BuildNetworkParams { config: ¶chain_config, client: client.clone(), @@ -317,7 +310,6 @@ keystore: params.keystore_container.sync_keystore(), backend: backend.clone(), network: network.clone(), - network_status_sinks, system_rpc_tx, telemetry: telemetry.as_mut(), })?; @@ -348,7 +340,6 @@ announce_block, client: client.clone(), task_manager: &mut task_manager, - collator_key, relay_chain_full_node, spawner, parachain_consensus, @@ -415,13 +406,11 @@ /// Start a normal parachain node. pub async fn start_node( parachain_config: Configuration, - collator_key: CollatorPair, polkadot_config: Configuration, id: ParaId, ) -> sc_service::error::Result<(TaskManager, Arc)> { start_node_impl::<_, _>( parachain_config, - collator_key, polkadot_config, id, parachain_build_import_queue, --- 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.3' } -pallet-transaction-payment-rpc = { version = "3.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.3' } -pallet-transaction-payment-rpc-runtime-api = { version = "3.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.3' } -sc-client-api = { version = "3.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.3' } -sc-consensus-aura = { version = "0.9", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.3' } -sc-consensus-epochs = { version = "0.9", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.3' } -sc-finality-grandpa = { version = "0.9", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.3' } -sc-finality-grandpa-rpc = { version = "0.9", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.3' } -sc-keystore = { version = "3.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.3' } -sc-network = { version = "0.9", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.3' } -sc-rpc-api = { version = "0.9", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.3' } -sc-rpc = { version = "3.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.3' } -sc-service = { version = "0.9", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.3' } -sp-api = { version = "3.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.3' } -sp-block-builder = { version = "3.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.3' } -sp-blockchain = { version = "3.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.3' } -sp-consensus = { version = "0.9", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.3' } -sp-consensus-aura = { version = "0.9", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.3' } -sp-core = { version = "3.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.3' } -sp-offchain = { version = "3.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.3' } -sp-runtime = { version = "3.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.3' } -sp-storage = { version = "3.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.3' } -sp-session = { version = "3.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.3' } -sp-transaction-pool = { version = "3.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.3' } -sc-transaction-pool = { version = "3.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.3' } -sc-transaction-graph = { version = "3.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.3' } -substrate-frame-rpc-system = { version = "3.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.3' } +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' } 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.3' } -frame-system = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.3' } -pallet-contracts = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.3' } -sp-runtime = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.3' } -sp-std = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.3' } +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' } [features] default = ["std"] --- a/pallets/contract-helpers/src/lib.rs +++ b/pallets/contract-helpers/src/lib.rs @@ -75,7 +75,7 @@ #[pallet::call] impl Pallet { #[pallet::weight(0)] - fn toggle_sponsoring( + pub fn toggle_sponsoring( origin: OriginFor, contract: T::AccountId, sponsoring: bool, @@ -95,7 +95,7 @@ } #[pallet::weight(0)] - fn toggle_allowlist( + pub fn toggle_allowlist( origin: OriginFor, contract: T::AccountId, enabled: bool, @@ -115,7 +115,7 @@ } #[pallet::weight(0)] - fn toggle_allowed( + pub fn toggle_allowed( origin: OriginFor, contract: T::AccountId, user: T::AccountId, @@ -136,7 +136,7 @@ } #[pallet::weight(0)] - fn set_sponsoring_rate_limit( + pub fn set_sponsoring_rate_limit( origin: OriginFor, contract: T::AccountId, rate_limit: T::BlockNumber, --- 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.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' [dependencies.frame-support] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' [dependencies.frame-system] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' [dependencies.pallet-balances] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' [dependencies.pallet-timestamp] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' [dependencies.pallet-randomness-collective-flip] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' [dependencies.sp-std] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' 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.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' [dependencies.sp-core] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' [dependencies.sp-io] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' 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.3' } -frame-system = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.3' } -pallet-balances = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.3' } -pallet-transaction-payment = { default-features = false, version = "3.0.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.3' } -sp-std = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.3' } -frame-benchmarking = { default-features = false, version = "3.0.0", optional = true, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.3' } -sp-core = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.3' } -sp-io = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.3' } -sp-runtime = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.3' } +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' } pallet-nft-transaction-payment = { default-features = false, path="../nft-transaction-payment" } --- 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.3' } -frame-system = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.3' } -pallet-transaction-payment = { default-features = false, version = "3.0.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.3' } -sp-std = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.3' } -frame-benchmarking = { default-features = false, version = "3.0.0", optional = true, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.3' } -sp-core = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.3' } -sp-io = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.3' } -sp-runtime = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.3' } +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' } up-sponsorship = { default-features = false, path = "../../primitives/sponsorship", version = "0.1.0" } --- a/pallets/nft/Cargo.toml +++ b/pallets/nft/Cargo.toml @@ -56,55 +56,55 @@ default-features = false optional = true git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' [dependencies.frame-support] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' [dependencies.frame-system] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' [dependencies.pallet-balances] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' [dependencies.pallet-timestamp] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' [dependencies.pallet-randomness-collective-flip] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' [dependencies.sp-std] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' [dependencies.pallet-contracts] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' [dependencies.pallet-transaction-payment] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' [dependencies.serde] @@ -115,19 +115,19 @@ [dependencies.sp-runtime] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' [dependencies.sp-core] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' [dependencies.sp-io] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' @@ -149,12 +149,12 @@ 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.3" } +sp-api = { default-features = false, version = '3.0.0', git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.7" } evm-coder = { default-features = false, path = "../../crates/evm-coder" } primitive-types = { version = "0.9.0", default-features = false, features = ["serde_no_std"] } -pallet-evm = { default-features = false, version = "4.0.0-dev", git = "https://github.com/usetech-llc/frontier.git", branch = "injected-transactions-parachain" } -pallet-ethereum = { default-features = false, version = "2.0.0-dev", git = "https://github.com/usetech-llc/frontier.git", branch = "injected-transactions-parachain" } +pallet-evm = { default-features = false, version = "5.0.0-dev", git = "https://github.com/usetech-llc/frontier.git", branch = "injected-transactions-parachain" } +pallet-ethereum = { default-features = false, version = "3.0.0-dev", git = "https://github.com/usetech-llc/frontier.git", branch = "injected-transactions-parachain" } fp-evm = { default-features = false, version = '2.0.0', git = "https://github.com/usetech-llc/frontier.git", branch = "injected-transactions-parachain" } hex-literal = "0.3.1" \ No newline at end of file --- 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.3' } -frame-system = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.3' } -sp-runtime = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.3' } -sp-std = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.3' } -sp-io = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.3' } -frame-benchmarking = { default-features = false, version = '3.0.0', optional = true, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.3' } +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' } 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.3' } -substrate-test-utils = { version = "3.0.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.3' } +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' } [features] default = ["std"] --- a/primitives/nft/Cargo.toml +++ b/primitives/nft/Cargo.toml @@ -11,11 +11,11 @@ [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.3' } -frame-system = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.3' } -pallet-contracts = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.3' } -sp-core = { version = "3.0.0", default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.3' } -sp-runtime = { version = "3.0.0", default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.3' } +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-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' } [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.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' [dependencies.frame-executive] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' [dependencies.frame-support] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' [dependencies.frame-system] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' [dependencies.frame-system-benchmarking] default-features = false git = 'https://github.com/paritytech/substrate.git' optional = true -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' [dependencies.frame-system-rpc-runtime-api] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' 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.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' [dependencies.pallet-balances] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' # Contracts specific packages [dependencies.pallet-contracts] git = 'https://github.com/paritytech/substrate.git' default-features = false -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' [dependencies.pallet-contracts-primitives] git = 'https://github.com/paritytech/substrate.git' default-features = false -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' [dependencies.pallet-contracts-rpc-runtime-api] git = 'https://github.com/paritytech/substrate.git' default-features = false -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' [dependencies.pallet-randomness-collective-flip] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' [dependencies.pallet-sudo] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' [dependencies.pallet-timestamp] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' [dependencies.pallet-transaction-payment] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' 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.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' [dependencies.pallet-treasury] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' [dependencies.pallet-vesting] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' [dependencies.sp-arithmetic] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' [dependencies.sp-api] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' [dependencies.sp-block-builder] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' [dependencies.sp-core] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' [dependencies.sp-consensus-aura] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '0.9.0' [dependencies.sp-inherents] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' [dependencies.sp-io] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' [dependencies.sp-offchain] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' [dependencies.sp-runtime] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' [dependencies.sp-session] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' [dependencies.sp-std] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' [dependencies.sp-transaction-pool] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' [dependencies.sp-version] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '3.0.0' [dependencies.smallvec] @@ -299,42 +299,47 @@ [dependencies.parachain-info] default-features = false git = 'https://github.com/paritytech/cumulus.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' version = '0.1.0' [dependencies.cumulus-pallet-aura-ext] git = 'https://github.com/paritytech/cumulus.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' default-features = false [dependencies.cumulus-pallet-parachain-system] git = 'https://github.com/paritytech/cumulus.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' default-features = false [dependencies.cumulus-primitives-core] git = 'https://github.com/paritytech/cumulus.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' default-features = false [dependencies.cumulus-pallet-xcm] git = 'https://github.com/paritytech/cumulus.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' default-features = false [dependencies.cumulus-pallet-dmp-queue] git = 'https://github.com/paritytech/cumulus.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' default-features = false [dependencies.cumulus-pallet-xcmp-queue] git = 'https://github.com/paritytech/cumulus.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' default-features = false [dependencies.cumulus-primitives-utility] git = 'https://github.com/paritytech/cumulus.git' -branch = 'polkadot-v0.9.3' +branch = 'polkadot-v0.9.7' +default-features = false + +[dependencies.cumulus-primitives-timestamp] +git = 'https://github.com/paritytech/cumulus.git' +branch = 'polkadot-v0.9.7' default-features = false ################################################################################ @@ -342,27 +347,27 @@ [dependencies.polkadot-parachain] git = 'https://github.com/paritytech/polkadot' -branch = 'release-v0.9.3' +branch = 'release-v0.9.7' default-features = false [dependencies.xcm] git = 'https://github.com/paritytech/polkadot' -branch = 'release-v0.9.3' +branch = 'release-v0.9.7' default-features = false [dependencies.xcm-builder] git = 'https://github.com/paritytech/polkadot' -branch = 'release-v0.9.3' +branch = 'release-v0.9.7' default-features = false [dependencies.xcm-executor] git = 'https://github.com/paritytech/polkadot' -branch = 'release-v0.9.3' +branch = 'release-v0.9.7' default-features = false [dependencies.pallet-xcm] git = 'https://github.com/paritytech/polkadot' -branch = 'release-v0.9.3' +branch = 'release-v0.9.7' default-features = false @@ -379,8 +384,8 @@ pallet-nft-transaction-payment = { path = '../pallets/nft-transaction-payment', default-features = false, version = '3.0.0' } pallet-nft-charge-transaction = { path = '../pallets/nft-charge-transaction', default-features = false, version = '3.0.0' } -pallet-evm = { default-features = false, version = "4.0.0-dev", git = "https://github.com/usetech-llc/frontier.git", branch = "injected-transactions-parachain" } -pallet-ethereum = { default-features = false, version = "2.0.0-dev", git = "https://github.com/usetech-llc/frontier.git", branch = "injected-transactions-parachain" } +pallet-evm = { default-features = false, version = "5.0.0-dev", git = "https://github.com/usetech-llc/frontier.git", branch = "injected-transactions-parachain" } +pallet-ethereum = { default-features = false, version = "3.0.0-dev", git = "https://github.com/usetech-llc/frontier.git", branch = "injected-transactions-parachain" } fp-rpc = { default-features = false, version = "2.0.0", git = "https://github.com/usetech-llc/frontier.git", branch = "injected-transactions-parachain" } ################################################################################ --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -250,6 +250,7 @@ type BlockGasLimit = BlockGasLimit; type FeeCalculator = (); type GasWeightMapping = (); + type BlockHashMapping = pallet_ethereum::EthereumBlockHashMapping; type CallOrigin = EnsureAddressTruncated; type WithdrawOrigin = EnsureAddressTruncated; type AddressMapping = HashedAddressMapping; @@ -287,6 +288,8 @@ type EvmSubmitLog = pallet_evm::Pallet; } +impl pallet_randomness_collective_flip::Config for Runtime {} + impl system::Config for Runtime { /// The data to be stored in an account. type AccountData = pallet_balances::AccountData; @@ -355,6 +358,8 @@ impl pallet_balances::Config for Runtime { type MaxLocks = MaxLocks; + type MaxReserves = (); + type ReserveIdentifier = [u8; 8]; /// The type for recording an account's balance. type Balance = Balance; /// The ubiquitous event type. @@ -1153,7 +1158,31 @@ } } +struct CheckInherents; + +impl cumulus_pallet_parachain_system::CheckInherents for CheckInherents { + fn check_inherents( + block: &Block, + relay_state_proof: &cumulus_pallet_parachain_system::RelayChainStateProof, + ) -> sp_inherents::CheckInherentsResult { + let relay_chain_slot = relay_state_proof + .read_slot() + .expect("Could not read the relay chain slot from the proof"); + + let inherent_data = + cumulus_primitives_timestamp::InherentDataProvider::from_relay_chain_slot_and_duration( + relay_chain_slot, + sp_std::time::Duration::from_secs(6), + ) + .create_inherent_data() + .expect("Could not create the timestamp inherent data"); + + inherent_data.check_extrinsics(&block) + } +} + cumulus_pallet_parachain_system::register_validate_block!( - Runtime, - cumulus_pallet_aura_ext::BlockExecutor::, + Runtime = Runtime, + BlockExecutor = cumulus_pallet_aura_ext::BlockExecutor::, + CheckInherents = CheckInherents, );