From da8c2f0d7f89ca4203947e5652a2fa4c4cd26873 Mon Sep 17 00:00:00 2001 From: tgmichel Date: Mon, 9 Nov 2020 16:56:03 +0100 Subject: [PATCH 01/17] Remove optional node arguments for limiting past events --- node/parachain/src/cli.rs | 15 --------------- node/parachain/src/command.rs | 2 -- node/standalone/src/cli.rs | 15 --------------- node/standalone/src/command.rs | 2 -- 4 files changed, 34 deletions(-) diff --git a/node/parachain/src/cli.rs b/node/parachain/src/cli.rs index 1d64c92864..a0faf73eaf 100644 --- a/node/parachain/src/cli.rs +++ b/node/parachain/src/cli.rs @@ -72,18 +72,6 @@ pub struct RunCmd { pub parachain_id: Option, } -#[derive(Debug, StructOpt)] -pub struct EthCmd { - /// Number of past blocks allowed for querying ethereum events. - #[structopt(long = "eth-block-limit")] - pub block_limit: Option, - - /// Number of logs allowed for querying ethereum events. - #[structopt(long = "eth-log-limit")] - pub log_limit: Option, -} - - impl std::ops::Deref for RunCmd { type Target = sc_cli::RunCmd; @@ -108,9 +96,6 @@ pub struct Cli { /// Relaychain arguments #[structopt(raw = true)] pub relaychain_args: Vec, - - #[structopt(flatten)] - pub eth: EthCmd, } #[derive(Debug)] diff --git a/node/parachain/src/command.rs b/node/parachain/src/command.rs index c5e17445da..1f323a246b 100644 --- a/node/parachain/src/command.rs +++ b/node/parachain/src/command.rs @@ -253,8 +253,6 @@ pub fn run() -> Result<()> { polkadot_config, id, cli.run.base.validator, - cli.eth.block_limit, - cli.eth.log_limit, ) .map(|(x, _)| x) }) diff --git a/node/standalone/src/cli.rs b/node/standalone/src/cli.rs index 4ef1338cb0..a2a2ecaaf3 100644 --- a/node/standalone/src/cli.rs +++ b/node/standalone/src/cli.rs @@ -28,18 +28,6 @@ pub struct RunCmd { pub manual_seal: bool, } -#[allow(missing_docs)] -#[derive(Debug, StructOpt)] -pub struct EthCmd { - /// Number of past blocks allowed for querying ethereum events. - #[structopt(long = "eth-block-limit")] - pub block_limit: Option, - - /// Number of logs allowed for querying ethereum events. - #[structopt(long = "eth-log-limit")] - pub log_limit: Option, -} - #[derive(Debug, StructOpt)] pub struct Cli { #[structopt(subcommand)] @@ -47,9 +35,6 @@ pub struct Cli { #[structopt(flatten)] pub run: RunCmd, - - #[structopt(flatten)] - pub eth: EthCmd, } #[derive(Debug, StructOpt)] diff --git a/node/standalone/src/command.rs b/node/standalone/src/command.rs index 7f83f0443d..70c4b029cb 100644 --- a/node/standalone/src/command.rs +++ b/node/standalone/src/command.rs @@ -121,8 +121,6 @@ pub fn run() -> sc_cli::Result<()> { _ => service::new_full( config, cli.run.manual_seal, - cli.eth.block_limit, - cli.eth.log_limit, ), }) } From dc86c6597afb43769a27a34dae2f60b2e082f7b1 Mon Sep 17 00:00:00 2001 From: tgmichel Date: Mon, 9 Nov 2020 16:57:07 +0100 Subject: [PATCH 02/17] `pallet_evm` now uses smart pointers for error handling --- runtime/precompiles/src/lib.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runtime/precompiles/src/lib.rs b/runtime/precompiles/src/lib.rs index 65f0284124..0f1426819f 100644 --- a/runtime/precompiles/src/lib.rs +++ b/runtime/precompiles/src/lib.rs @@ -16,7 +16,7 @@ #![cfg_attr(not(feature = "std"), no_std)] -use sp_std::{prelude::*}; +use sp_std::{prelude::*, borrow::Cow}; use sp_core::H160; use pallet_evm::{ExitError, ExitSucceed, Precompile}; @@ -53,7 +53,7 @@ impl pallet_evm::Precompile for DeadbeefPrecompiled { log::info!("Calling deadbeef precompiled contract"); let mut result_vec: Vec = rustc_hex::FromHex::from_hex("deadbeef") - .map_err(|_| pallet_evm::ExitError::Other("unexpected deadbeef conversion"))?; + .map_err(|_| pallet_evm::ExitError::Other(Cow::from("unexpected deadbeef conversion")))?; result_vec.extend(input.to_vec()); Ok((pallet_evm::ExitSucceed::Returned, result_vec, cost)) From 6f9726e54d7e74f2a1721e14d10fdff3a9b76125 Mon Sep 17 00:00:00 2001 From: tgmichel Date: Mon, 9 Nov 2020 16:58:04 +0100 Subject: [PATCH 03/17] Update runtime --- runtime/src/lib.rs | 101 ++++++++++++++------------------------------- 1 file changed, 32 insertions(+), 69 deletions(-) diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 9ebc87538c..f0263739c3 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -45,7 +45,7 @@ use parachain::*; use codec::{Decode, Encode}; use sp_api::impl_runtime_apis; -use sp_core::{OpaqueMetadata, H160, H256, U256}; +use sp_core::{OpaqueMetadata, H160, U256}; use sp_runtime::{ create_runtime_str, generic, impl_opaque_keys, traits::{BlakeTwo256, Block as BlockT, IdentifyAccount, IdentityLookup, Saturating, Verify}, @@ -66,9 +66,9 @@ pub use frame_support::{ }, ConsensusEngineId, StorageValue, }; -use frontier_rpc_primitives::TransactionStatus; use pallet_evm::{ Account as EVMAccount, EnsureAddressTruncated, FeeCalculator, HashedAddressMapping, + Runner, }; #[cfg(any(feature = "std", test))] pub use sp_runtime::BuildStorage; @@ -250,6 +250,7 @@ impl pallet_evm::Trait for Runtime { type AddressMapping = HashedAddressMapping; type Currency = Balances; type Event = Event; + type Runner = pallet_evm::runner::stack::Runner; type Precompiles = precompiles::MoonbeamPrecompiles; type ChainId = ChainId; } @@ -421,80 +422,42 @@ impl_runtime_apis! { ::FeeCalculator::min_gas_price() } - fn account_code_at(address: H160) -> Vec { - EVM::account_codes(address) - } - - fn author() -> H160 { - Ethereum::find_author() - } - - fn storage_at(address: H160, index: U256) -> H256 { - let mut tmp = [0u8; 32]; - index.to_big_endian(&mut tmp); - EVM::account_storages(address, H256::from_slice(&tmp[..])) - } - fn call( from: H160, + to: H160, data: Vec, value: U256, gas_limit: U256, gas_price: Option, nonce: Option, - action: pallet_ethereum::TransactionAction, - ) -> Result<(Vec, U256), sp_runtime::DispatchError> { - match action { - pallet_ethereum::TransactionAction::Call(to) => - EVM::execute_call( - from, - to, - data, - value, - gas_limit.low_u32(), - gas_price.unwrap_or(U256::from(0)), - nonce, - false, - ) - .map(|(_, ret, gas, _)| (ret, gas)) - .map_err(|err| err.into()), - pallet_ethereum::TransactionAction::Create => - EVM::execute_create( - from, - data, - value, - gas_limit.low_u32(), - gas_price.unwrap_or(U256::from(0)), - nonce, - false, - ) - .map(|(_, _, gas, _)| (vec![], gas)) - .map_err(|err| err.into()), - } - } - - fn current_transaction_statuses() -> Option> { - Ethereum::current_transaction_statuses() - } - - fn current_block() -> Option { - Ethereum::current_block() - } - - fn current_receipts() -> Option> { - Ethereum::current_receipts() - } - - fn current_all() -> ( - Option, - Option>, - Option> - ) { - ( - Ethereum::current_block(), - Ethereum::current_receipts(), - Ethereum::current_transaction_statuses() - ) + ) -> Result { + ::Runner::call( + from, + to, + data, + value, + gas_limit.low_u32(), + gas_price, + nonce, + ).map_err(|err| err.into()) + } + + fn create( + from: H160, + data: Vec, + value: U256, + gas_limit: U256, + gas_price: Option, + nonce: Option, + ) -> Result { + ::Runner::create( + from, + data, + value, + gas_limit.low_u32(), + gas_price, + nonce, + ).map_err(|err| err.into()) } } From 654b16a735f339cc6eda4cbe18f59cffb8b47515 Mon Sep 17 00:00:00 2001 From: tgmichel Date: Mon, 9 Nov 2020 16:58:47 +0100 Subject: [PATCH 04/17] Update service Rpc handler --- node/parachain/src/rpc.rs | 21 ++++----------------- node/parachain/src/service.rs | 6 ------ node/standalone/src/rpc.rs | 21 ++++----------------- node/standalone/src/service.rs | 8 +------- 4 files changed, 9 insertions(+), 47 deletions(-) diff --git a/node/parachain/src/rpc.rs b/node/parachain/src/rpc.rs index 4ac94cd7b8..b9a7213a04 100644 --- a/node/parachain/src/rpc.rs +++ b/node/parachain/src/rpc.rs @@ -22,7 +22,6 @@ use sc_consensus_manual_seal::rpc::{EngineCommand, ManualSeal, ManualSealApi}; use moonbeam_runtime::{Hash, AccountId, Index, opaque::Block, Balance}; use sp_api::ProvideRuntimeApi; use sp_transaction_pool::TransactionPool; -use sc_transaction_graph::{Pool, ChainApi}; use sp_blockchain::{Error as BlockChainError, HeaderMetadata, HeaderBackend}; use sc_rpc_api::DenyUnsafe; use sc_client_api::{ @@ -36,21 +35,15 @@ use sc_network::NetworkService; use jsonrpc_pubsub::manager::SubscriptionManager; /// Full client dependencies. -pub struct FullDeps { +pub struct FullDeps { /// The client instance to use. pub client: Arc, /// Transaction pool instance. pub pool: Arc

, - /// Validated pool access. - pub graph_pool: Arc>, /// Whether to deny unsafe calls pub deny_unsafe: DenyUnsafe, /// The Node authority flag pub is_authority: bool, - /// Number of past blocks allowed for querying ethereum events. - pub eth_block_limit: Option, - /// Number of logs allowed for querying ethereum events. - pub eth_log_limit: Option, /// Network service pub network: Arc>, /// Manual seal command sink @@ -58,8 +51,8 @@ pub struct FullDeps { } /// Instantiate all Full RPC extensions. -pub fn create_full( - deps: FullDeps, +pub fn create_full( + deps: FullDeps, subscription_task_executor: SubscriptionTaskExecutor ) -> jsonrpc_core::IoHandler where BE: Backend + 'static, @@ -74,7 +67,6 @@ pub fn create_full( C::Api: frontier_rpc_primitives::EthereumRuntimeRPCApi, ::Error: fmt::Debug, P: TransactionPool + 'static, - A: ChainApi + 'static, { use substrate_frame_rpc_system::{FullSystem, SystemApi}; use pallet_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApi}; @@ -84,11 +76,8 @@ pub fn create_full( let FullDeps { client, pool, - graph_pool, deny_unsafe, is_authority, - eth_block_limit, - eth_log_limit, network, command_sink } = deps; @@ -102,12 +91,10 @@ pub fn create_full( io.extend_with( EthApiServer::to_delegate(EthApi::new( client.clone(), - graph_pool.clone(), pool.clone(), moonbeam_runtime::TransactionConverter, + network.clone(), is_authority, - eth_block_limit, - eth_log_limit, )) ); io.extend_with( diff --git a/node/parachain/src/service.rs b/node/parachain/src/service.rs index c4614c4c5c..f67340220b 100644 --- a/node/parachain/src/service.rs +++ b/node/parachain/src/service.rs @@ -67,7 +67,6 @@ pub fn new_partial( moonbeam_runtime::opaque::Block, Arc, FullClient, - FullBackend, >, >, sc_service::Error, @@ -130,8 +129,6 @@ pub fn run_node( mut polkadot_config: polkadot_collator::Configuration, id: polkadot_primitives::v0::Id, validator: bool, - eth_block_limit: Option, - eth_log_limit: Option ) -> sc_service::error::Result<( TaskManager, Arc< @@ -205,11 +202,8 @@ pub fn run_node( let deps = crate::rpc::FullDeps { client: client.clone(), pool: pool.clone(), - graph_pool: pool.pool().clone(), deny_unsafe, is_authority, - eth_block_limit, - eth_log_limit, network: network.clone(), command_sink: Some(command_sink.clone()) }; diff --git a/node/standalone/src/rpc.rs b/node/standalone/src/rpc.rs index 6c6b2c8d5b..551a2c0c02 100644 --- a/node/standalone/src/rpc.rs +++ b/node/standalone/src/rpc.rs @@ -22,7 +22,6 @@ use sc_consensus_manual_seal::rpc::{EngineCommand, ManualSeal, ManualSealApi}; use moonbeam_runtime::{Hash, AccountId, Index, opaque::Block, Balance}; use sp_api::ProvideRuntimeApi; use sp_transaction_pool::TransactionPool; -use sc_transaction_graph::{Pool, ChainApi}; use sp_blockchain::{Error as BlockChainError, HeaderMetadata, HeaderBackend}; use sc_rpc_api::DenyUnsafe; use sc_client_api::{ @@ -48,21 +47,15 @@ pub struct LightDeps { } /// Full client dependencies. -pub struct FullDeps { +pub struct FullDeps { /// The client instance to use. pub client: Arc, /// Transaction pool instance. pub pool: Arc

, - /// Validated pool access. - pub graph_pool: Arc>, /// Whether to deny unsafe calls pub deny_unsafe: DenyUnsafe, /// The Node authority flag pub is_authority: bool, - /// Number of past blocks allowed for querying ethereum events. - pub eth_block_limit: Option, - /// Number of logs allowed for querying ethereum events. - pub eth_log_limit: Option, /// Network service pub network: Arc>, /// Manual seal command sink @@ -70,8 +63,8 @@ pub struct FullDeps { } /// Instantiate all Full RPC extensions. -pub fn create_full( - deps: FullDeps, +pub fn create_full( + deps: FullDeps, subscription_task_executor: SubscriptionTaskExecutor ) -> jsonrpc_core::IoHandler where BE: Backend + 'static, @@ -86,7 +79,6 @@ pub fn create_full( C::Api: frontier_rpc_primitives::EthereumRuntimeRPCApi, ::Error: fmt::Debug, P: TransactionPool + 'static, - A: ChainApi + 'static, { use substrate_frame_rpc_system::{FullSystem, SystemApi}; use pallet_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApi}; @@ -96,11 +88,8 @@ pub fn create_full( let FullDeps { client, pool, - graph_pool, deny_unsafe, is_authority, - eth_block_limit, - eth_log_limit, network, command_sink } = deps; @@ -114,12 +103,10 @@ pub fn create_full( io.extend_with( EthApiServer::to_delegate(EthApi::new( client.clone(), - graph_pool.clone(), pool.clone(), moonbeam_runtime::TransactionConverter, + network.clone(), is_authority, - eth_block_limit, - eth_log_limit, )) ); io.extend_with( diff --git a/node/standalone/src/service.rs b/node/standalone/src/service.rs index 316f9bc7de..2c6a2c54f1 100644 --- a/node/standalone/src/service.rs +++ b/node/standalone/src/service.rs @@ -52,13 +52,12 @@ pub enum ConsensusResult { Block, GrandpaBlockImport, FullClient, - FullBackend, >, AuraPair >, sc_finality_grandpa::LinkHalf ), - ManualSeal(FrontierBlockImport, FullClient, FullBackend>) + ManualSeal(FrontierBlockImport, FullClient>) } pub fn new_partial(config: &Configuration, manual_seal: bool) -> Result< @@ -144,8 +143,6 @@ pub fn new_partial(config: &Configuration, manual_seal: bool) -> Result< pub fn new_full( config: Configuration, manual_seal: bool, - eth_block_limit: Option, - eth_log_limit: Option, ) -> Result { let sc_service::PartialComponents { client, backend, mut task_manager, import_queue, keystore, select_chain, transaction_pool, @@ -216,11 +213,8 @@ pub fn new_full( let deps = crate::rpc::FullDeps { client: client.clone(), pool: pool.clone(), - graph_pool: pool.pool().clone(), deny_unsafe, is_authority, - eth_block_limit, - eth_log_limit, network: network.clone(), command_sink: Some(command_sink.clone()) }; From 997d373b8d86eb027d2721d081b5af28887f1282 Mon Sep 17 00:00:00 2001 From: tgmichel Date: Mon, 9 Nov 2020 16:59:02 +0100 Subject: [PATCH 05/17] Update dependencies --- Cargo.lock | 1562 ++++++++++++++++++-------------- node/parachain/Cargo.toml | 15 +- node/standalone/Cargo.lock | 741 ++++++++------- node/standalone/Cargo.toml | 15 +- runtime/Cargo.toml | 6 +- runtime/precompiles/Cargo.toml | 2 +- 6 files changed, 1286 insertions(+), 1055 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bc5d0dff86..38e56853bf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -12,11 +12,11 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b6a2d3371669ab3ca9797670853d61402b03d0b4b9ebf33d677dfa720203072" +checksum = "7c0929d69e78dd9bf5408269919fcbcaeb2e35e5d43e5815517cdc6a8e11a423" dependencies = [ - "gimli 0.22.0", + "gimli 0.23.0", ] [[package]] @@ -42,9 +42,9 @@ dependencies = [ [[package]] name = "aes" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7001367fde4c768a19d1029f0a8be5abd9308e1119846d5bd9ad26297b8faf5" +checksum = "dd2bc6d3f370b5666245ff421e231cba4353df936e26986d2918e61a8fd6aef6" dependencies = [ "aes-soft", "aesni", @@ -53,9 +53,9 @@ dependencies = [ [[package]] name = "aes-gcm" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86f5007801316299f922a6198d1d09a0bae95786815d066d5880d13f7c45ead1" +checksum = "0301c9e9c443494d970a07885e8cf3e587bae8356a1d5abd0999068413f7205f" dependencies = [ "aead", "aes", @@ -66,30 +66,30 @@ dependencies = [ [[package]] name = "aes-soft" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4925647ee64e5056cf231608957ce7c81e12d6d6e316b9ce1404778cc1d35fa7" +checksum = "63dd91889c49327ad7ef3b500fd1109dbd3c509a03db0d4a9ce413b79f575cb6" dependencies = [ "block-cipher", "byteorder", - "opaque-debug 0.2.3", + "opaque-debug 0.3.0", ] [[package]] name = "aesni" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d050d39b0b7688b3a3254394c3e30a9d66c41dcf9b05b0e2dbdc623f6505d264" +checksum = "0a6fe808308bb07d393e2ea47780043ec47683fcf19cf5efc8ca51c50cc8c68a" dependencies = [ "block-cipher", - "opaque-debug 0.2.3", + "opaque-debug 0.3.0", ] [[package]] name = "ahash" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f33b5018f120946c1dcf279194f238a9f146725593ead1c08fa47ff22b0b5d3" +checksum = "29661b60bec623f0586702976ff4d0c9942dcb6723161c2df0eea78455cfedfb" dependencies = [ "const-random", ] @@ -102,9 +102,9 @@ checksum = "e8fd72866655d1904d6b0997d0b07ba561047d070fbe29de039031c641b61217" [[package]] name = "aho-corasick" -version = "0.7.13" +version = "0.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "043164d8ba5c4c3035fec9bbee8647c0261d788f3474306f93bb65901cae0e86" +checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5" dependencies = [ "memchr", ] @@ -117,7 +117,7 @@ checksum = "4f823d037a7ec6ea2197046bafd4ae150e6bc36f9ca347404f46a46823fa84f2" dependencies = [ "approx", "num-complex", - "num-traits 0.2.12", + "num-traits 0.2.14", ] [[package]] @@ -140,9 +140,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.32" +version = "1.0.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b602bfe940d21c130f3895acd65221e8a61270debe89d628b9cb4e3ccb8569b" +checksum = "bf8dcb5b4bbaa28653b647d8c77bd4ed40183b48882e130c1f1ffb73de069fd7" [[package]] name = "approx" @@ -150,7 +150,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0e60b75072ecd4168020818c0107f2857bb6c4e64252d8d3983f6263b40a5c3" dependencies = [ - "num-traits 0.2.12", + "num-traits 0.2.14", ] [[package]] @@ -176,9 +176,9 @@ dependencies = [ [[package]] name = "arrayvec" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" +checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" [[package]] name = "asn1_der" @@ -196,7 +196,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d0864d84b8e07b145449be9a8537db86bf9de5ce03b913214694643b4743502" dependencies = [ "quote 1.0.7", - "syn 1.0.42", + "syn 1.0.48", ] [[package]] @@ -215,15 +215,15 @@ dependencies = [ [[package]] name = "assert_matches" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7deb0a829ca7bcfaf5da70b073a8d128619259a7be8216a355e23f00763059e5" +checksum = "695579f0f2520f3774bb40461e5adb066459d4e0af4d59d20175484fb8e9edf1" [[package]] name = "async-channel" -version = "1.4.2" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21279cfaa4f47df10b1816007e738ca3747ef2ee53ffc51cdbf57a8bb266fee3" +checksum = "59740d83946db6a5af71ae25ddf9562c2b176b2ca42cf99a455f09f4a220d6b9" dependencies = [ "concurrent-queue", "event-listener", @@ -246,9 +246,9 @@ dependencies = [ [[package]] name = "async-global-executor" -version = "1.3.0" +version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fefeb39da249f4c33af940b779a56723ce45809ef5c54dad84bb538d4ffb6d9e" +checksum = "73079b49cd26b8fd5a15f68fc7707fc78698dc2a3d61430f2a7a9430230dfa04" dependencies = [ "async-executor", "async-io", @@ -259,9 +259,9 @@ dependencies = [ [[package]] name = "async-io" -version = "1.1.10" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54bc4c1c7292475efb2253227dbcfad8fe1ca4c02bc62c510cc2f3da5c4704e" +checksum = "40a0b2bb8ae20fede194e779150fe283f65a4a08461b496de546ec366b174ad9" dependencies = [ "concurrent-queue", "fastrand", @@ -288,15 +288,15 @@ dependencies = [ [[package]] name = "async-std" -version = "1.6.5" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9fa76751505e8df1c7a77762f60486f60c71bbd9b8557f4da6ad47d083732ed" +checksum = "a7e82538bc65a25dbdff70e4c5439d52f068048ab97cdea0acd73f131594caa1" dependencies = [ "async-global-executor", "async-io", "async-mutex", "blocking", - "crossbeam-utils", + "crossbeam-utils 0.8.0", "futures-channel", "futures-core", "futures-io", @@ -315,9 +315,9 @@ dependencies = [ [[package]] name = "async-task" -version = "4.0.2" +version = "4.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ab27c1aa62945039e44edaeee1dc23c74cc0c303dd5fe0fb462a184f1c3a518" +checksum = "e91831deabf0d6d7ec49552e489aed63b7456a7a3c46cff62adad428110b0af0" [[package]] name = "async-tls" @@ -325,7 +325,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df097e3f506bec0e1a24f06bb3c962c228f36671de841ff579cb99f371772634" dependencies = [ - "futures 0.3.5", + "futures 0.3.7", "rustls", "webpki", "webpki-roots 0.19.0", @@ -362,15 +362,15 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" [[package]] name = "backtrace" -version = "0.3.50" +version = "0.3.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46254cf2fdcdf1badb5934448c1bcbe046a56537b3987d96c51a7afc5d03f293" +checksum = "2baad346b2d4e94a24347adeee9c7a93f412ee94b9cc26e5b59dea23848e9f28" dependencies = [ "addr2line", - "cfg-if", + "cfg-if 1.0.0", "libc", "miniz_oxide", - "object 0.20.0", + "object 0.22.0", "rustc-demangle", ] @@ -404,7 +404,7 @@ checksum = "66c0bb6167449588ff70803f4127f0684f9063097eca5016f37eb52b92c2cf36" dependencies = [ "bitflags", "cexpr", - "cfg-if", + "cfg-if 0.1.10", "clang-sys", "clap", "env_logger", @@ -412,7 +412,7 @@ dependencies = [ "lazycell", "log 0.4.11", "peeking_take_while", - "proc-macro2 1.0.23", + "proc-macro2 1.0.24", "quote 1.0.7", "regex", "rustc-hash", @@ -444,15 +444,13 @@ dependencies = [ [[package]] name = "blake2" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84ce5b6108f8e154604bd4eb76a2f726066c3464d5a552a4229262a18c9bb471" +checksum = "10a5720225ef5daecf08657f23791354e1685a8c91a4c60c7f3d3b2892f978f4" dependencies = [ - "byte-tools", - "byteorder", "crypto-mac 0.8.0", "digest 0.9.0", - "opaque-debug 0.2.3", + "opaque-debug 0.3.0", ] [[package]] @@ -467,23 +465,23 @@ dependencies = [ [[package]] name = "blake2b_simd" -version = "0.5.10" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a" +checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587" dependencies = [ "arrayref", - "arrayvec 0.5.1", + "arrayvec 0.5.2", "constant_time_eq", ] [[package]] name = "blake2s_simd" -version = "0.5.10" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab9e07352b829279624ceb7c64adb4f585dacdb81d35cafae81139ccd617cf44" +checksum = "9e461a7034e85b211a4acb57ee2e6730b32912b06c08cc242243c39fc21ae6a2" dependencies = [ "arrayref", - "arrayvec 0.5.1", + "arrayvec 0.5.2", "constant_time_eq", ] @@ -511,9 +509,9 @@ dependencies = [ [[package]] name = "block-cipher" -version = "0.7.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa136449e765dc7faa244561ccae839c394048667929af599b5d931ebe7b7f10" +checksum = "f337a3e6da609650eb74e02bc9fac7b735049f7623ab12f2e4c719316fcc7e80" dependencies = [ "generic-array 0.14.4", ] @@ -553,11 +551,17 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "476e9cd489f9e121e02ffa6014a8ef220ecb15c05ed23fc34cca13925dc283fb" +[[package]] +name = "bs58" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" + [[package]] name = "bstr" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31accafdb70df7871592c058eca3985b71104e15ac32f64706022c58867da931" +checksum = "473fc6b38233f9af7baa94fb5852dca389e3d95b8e21c8e3719301462c5d9faf" dependencies = [ "memchr", ] @@ -617,9 +621,9 @@ checksum = "631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba" [[package]] name = "cc" -version = "1.0.60" +version = "1.0.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef611cc68ff783f18535d77ddd080185275713d852c4f5cbb6122c462a7a825c" +checksum = "f1770ced377336a88a67c473594ccc14eca6f4559217c34f64aac8f83d641b40" dependencies = [ "jobserver", ] @@ -639,11 +643,17 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + [[package]] name = "chacha20" -version = "0.4.3" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "086c0f07ac275808b7bf9a39f2fd013aae1498be83632814c8c4e0bd53f2dc58" +checksum = "244fbce0d47e97e8ef2f63b81d5e05882cb518c68531eb33194990d7b7e85845" dependencies = [ "stream-cipher", "zeroize", @@ -651,9 +661,9 @@ dependencies = [ [[package]] name = "chacha20poly1305" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18b0c90556d8e3fec7cf18d84a2f53d27b21288f2fe481b830fadcf809e48205" +checksum = "9bf18d374d66df0c05cdddd528a7db98f78c28e2519b120855c4f84c5027b1f5" dependencies = [ "aead", "chacha20", @@ -664,13 +674,13 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.18" +version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d021fddb7bd3e734370acfa4a83f34095571d8570c039f1420d77540f68d5772" +checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" dependencies = [ "libc", "num-integer", - "num-traits 0.2.12", + "num-traits 0.2.14", "time", "winapi 0.3.9", ] @@ -730,9 +740,9 @@ dependencies = [ [[package]] name = "const-random" -version = "0.1.8" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f1af9ac737b2dd2d577701e59fd09ba34822f6f2ebdb30a7647405d9e55e16a" +checksum = "02dc82c12dc2ee6e1ded861cf7d582b46f66f796d1b6c93fa28b911ead95da02" dependencies = [ "const-random-macro", "proc-macro-hack", @@ -740,14 +750,20 @@ dependencies = [ [[package]] name = "const-random-macro" -version = "0.1.8" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25e4c606eb459dd29f7c57b2e0879f2b6f14ee130918c2b78ccb58a9624e6c7a" +checksum = "fc757bbb9544aa296c2ae00c679e81f886b37e28e59097defe0cf524306f6685" dependencies = [ - "getrandom", + "getrandom 0.2.0", "proc-macro-hack", ] +[[package]] +name = "const_fn" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c478836e029dcef17fb47c89023448c64f781a046e0300e257ad8225ae59afab" + [[package]] name = "constant_time_eq" version = "0.1.5" @@ -870,21 +886,21 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1" +checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", ] [[package]] name = "crossbeam-channel" -version = "0.4.4" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87" +checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775" dependencies = [ - "crossbeam-utils", - "maybe-uninit", + "cfg-if 1.0.0", + "crossbeam-utils 0.8.0", ] [[package]] @@ -893,11 +909,22 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285" dependencies = [ - "crossbeam-epoch", - "crossbeam-utils", + "crossbeam-epoch 0.8.2", + "crossbeam-utils 0.7.2", "maybe-uninit", ] +[[package]] +name = "crossbeam-deque" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-epoch 0.9.0", + "crossbeam-utils 0.8.0", +] + [[package]] name = "crossbeam-epoch" version = "0.8.2" @@ -905,22 +932,36 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" dependencies = [ "autocfg 1.0.1", - "cfg-if", - "crossbeam-utils", + "cfg-if 0.1.10", + "crossbeam-utils 0.7.2", "lazy_static", "maybe-uninit", "memoffset", "scopeguard 1.1.0", ] +[[package]] +name = "crossbeam-epoch" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0f606a85340376eef0d6d8fec399e6d4a544d648386c6645eb6d0653b27d9f" +dependencies = [ + "cfg-if 1.0.0", + "const_fn", + "crossbeam-utils 0.8.0", + "lazy_static", + "memoffset", + "scopeguard 1.1.0", +] + [[package]] name = "crossbeam-queue" version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570" dependencies = [ - "cfg-if", - "crossbeam-utils", + "cfg-if 0.1.10", + "crossbeam-utils 0.7.2", "maybe-uninit", ] @@ -931,7 +972,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" dependencies = [ "autocfg 1.0.1", - "cfg-if", + "cfg-if 0.1.10", + "lazy_static", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec91540d98355f690a86367e566ecad2e9e579f230230eb7c21398372be73ea5" +dependencies = [ + "autocfg 1.0.1", + "cfg-if 1.0.0", + "const_fn", "lazy_static", ] @@ -979,7 +1032,7 @@ dependencies = [ "cumulus-network", "cumulus-primitives", "cumulus-runtime", - "futures 0.3.5", + "futures 0.3.7", "log 0.4.11", "parity-scale-codec", "parking_lot 0.9.0", @@ -1003,7 +1056,7 @@ name = "cumulus-consensus" version = "0.1.0" source = "git+https://github.com/paritytech/cumulus?rev=8a445a425086fc927f946a72b245e829fba200d0#8a445a425086fc927f946a72b245e829fba200d0" dependencies = [ - "futures 0.3.5", + "futures 0.3.7", "log 0.4.11", "parity-scale-codec", "polkadot-primitives", @@ -1042,7 +1095,7 @@ version = "0.1.0" source = "git+https://github.com/paritytech/cumulus?rev=8a445a425086fc927f946a72b245e829fba200d0#8a445a425086fc927f946a72b245e829fba200d0" dependencies = [ "cumulus-primitives", - "futures 0.3.5", + "futures 0.3.7", "log 0.4.11", "parity-scale-codec", "parking_lot 0.10.2", @@ -1189,9 +1242,9 @@ dependencies = [ [[package]] name = "data-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4d0e2d24e5ee3b23a01de38eefdcd978907890701f08ffffd4cb457ca4ee8d6" +checksum = "993a608597367c6377b258c25d7120740f00ed23a2252b729b1932dd7866f908" [[package]] name = "derive_more" @@ -1221,13 +1274,13 @@ dependencies = [ [[package]] name = "derive_more" -version = "0.99.10" +version = "0.99.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dcfabdab475c16a93d669dddfc393027803e347d09663f524447f642fbb84ba" +checksum = "41cb0e6161ad61ed084a36ba71fbba9e3ac5aee3606fb607fe08da6acbcf3d8c" dependencies = [ - "proc-macro2 1.0.23", + "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.42", + "syn 1.0.48", ] [[package]] @@ -1260,7 +1313,7 @@ version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "551a778172a450d7fc12e629ca3b0428d00f6afa9a43da1b630d54604e97371c" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "dirs-sys", ] @@ -1307,22 +1360,22 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "558e40ea573c374cf53507fd240b7ee2f5477df7cfebdb97323ec61c719399c5" dependencies = [ - "proc-macro2 1.0.23", + "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.42", + "syn 1.0.48", ] [[package]] name = "dyn-clone" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c53dc3a653e0f64081026e4bf048d48fec9fce90c66e8326ca7292df0ff2d82" +checksum = "d55796afa1b20c2945ca8eabfc421839f2b766619209f1ede813cf2484f31804" [[package]] name = "ed25519" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07dfc993ea376e864fe29a4099a61ca0bb994c6d7745a61bf60ddb3d64e05237" +checksum = "37c66a534cbb46ab4ea03477eae19d5c22c01da8258030280b7bd9d8433fb6ef" dependencies = [ "signature", ] @@ -1337,7 +1390,7 @@ dependencies = [ "ed25519", "rand 0.7.3", "serde", - "sha2 0.9.1", + "sha2 0.9.2", "zeroize", ] @@ -1382,9 +1435,9 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "946ee94e3dbf58fdd324f9ce245c7b238d46a66f00e86a020b71996349e46cce" dependencies = [ - "proc-macro2 1.0.23", + "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.42", + "syn 1.0.48", ] [[package]] @@ -1402,9 +1455,9 @@ dependencies = [ [[package]] name = "environmental" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "516aa8d7a71cb00a1c4146f0798549b93d083d4f189b3ced8f3de6b8f11ee6c4" +checksum = "6576a1755ddffd988788025e75bce9e74b018f7cc226198fe931d077911c6d7e" [[package]] name = "erased-serde" @@ -1417,9 +1470,9 @@ dependencies = [ [[package]] name = "errno" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6eab5ee3df98a279d9b316b1af6ac95422127b1290317e6d18c1743c99418b01" +checksum = "fa68f2fb9cae9d37c9b2b3584aba698a2e97f72d7aef7b9f7aa71d8b54ce46fe" dependencies = [ "errno-dragonfly", "libc", @@ -1464,15 +1517,19 @@ dependencies = [ [[package]] name = "ethereum" -version = "0.3.3" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da7fef4d2da1de3a4f4f85408379644276db9b46c4af7b0fe38a3debec5cb7cd" +checksum = "df706418ff7d3874b9506424b04ea0bef569a2b39412b43a27ea86e679be108e" dependencies = [ "ethereum-types", + "hash-db", + "hash256-std-hasher", "parity-scale-codec", "rlp", "rlp-derive", - "sha3 0.8.2", + "serde", + "sha3 0.9.1", + "triehash", ] [[package]] @@ -1498,13 +1555,16 @@ checksum = "f7531096570974c3a9dcf9e4b8e1cede1ec26cf5046219fb3b9d897503b9be59" [[package]] name = "evm" -version = "0.17.0" +version = "0.18.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68224b0aa788720ef0c8a23030a4412a021ed73df069a922bee8f0db9ed617e2" +checksum = "f1fc70736bd5ec89622647ea9346b70567557917596a39538d76e8f2a17ff59e" dependencies = [ + "ethereum", "evm-core", "evm-gasometer", "evm-runtime", + "log 0.4.11", + "parity-scale-codec", "primitive-types", "rlp", "serde", @@ -1513,18 +1573,20 @@ dependencies = [ [[package]] name = "evm-core" -version = "0.17.0" +version = "0.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a040378759577447945c89da1b07d6e33fda32a97a104afe0ec3fa1c382949d" +checksum = "63c6c39300d7779427f461408d867426e202ea72ac7ece2455689ff0e4bddb6f" dependencies = [ + "parity-scale-codec", "primitive-types", + "serde", ] [[package]] name = "evm-gasometer" -version = "0.17.0" +version = "0.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bb5bc051afad6bb0735c82b46656bbdfac41917861307a608b1404a546fec42" +checksum = "689c481648c3f45b64b1278077c04284ad535e068c9d6872153c7b74da7ccb03" dependencies = [ "evm-core", "evm-runtime", @@ -1533,9 +1595,9 @@ dependencies = [ [[package]] name = "evm-runtime" -version = "0.17.0" +version = "0.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7410f5677a52203d3fca02b0eb8f96f9799f3a45cff82946a8ed28379e6b1b04" +checksum = "61a148ad1b3e0af31aa03c6c3cc9df3a529e279dad8e29b4ef90dccad32601e4" dependencies = [ "evm-core", "primitive-types", @@ -1548,7 +1610,7 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d8013f441e38e31c670e7f34ec8f1d5d3a2bd9d303c1ff83976ca886005e8f48" dependencies = [ - "futures 0.1.29", + "futures 0.1.30", "parking_lot 0.7.1", ] @@ -1558,7 +1620,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e43f2f1833d64e33f15592464d6fdd70f349dda7b1a53088eb83cd94014008c5" dependencies = [ - "futures 0.3.5", + "futures 0.3.7", ] [[package]] @@ -1577,9 +1639,9 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" dependencies = [ - "proc-macro2 1.0.23", + "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.42", + "syn 1.0.48", "synstructure", ] @@ -1597,9 +1659,12 @@ checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" [[package]] name = "fastrand" -version = "1.3.5" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c85295147490b8fcf2ea3d104080a105a8b2c63f9c319e82c02d8e952388919" +checksum = "ca5faf057445ce5c9d4329e382b2ce7ca38550ef3b73a5348362d5f24e0c7fe3" +dependencies = [ + "instant", +] [[package]] name = "fdlimit" @@ -1627,10 +1692,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8feb87a63249689640ac9c011742c33139204e3c134293d3054022276869133b" dependencies = [ "either", - "futures 0.3.5", + "futures 0.3.7", "futures-timer 2.0.2", "log 0.4.11", - "num-traits 0.2.12", + "num-traits 0.2.14", "parity-scale-codec", "parking_lot 0.9.0", ] @@ -1655,11 +1720,11 @@ checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d" [[package]] name = "flate2" -version = "1.0.17" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "766d0e77a2c1502169d4a93ff3b8c15a71fd946cd0126309752104e5f3c46d94" +checksum = "7411863d55df97a419aa64cb4d2f167103ea9d767e2c54a1868b7ac3f6b47129" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "crc32fast", "libc", "libz-sys", @@ -1675,15 +1740,25 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "parity-scale-codec", ] +[[package]] +name = "form_urlencoded" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ece68d15c92e84fa4f19d3780f1294e5ca82a78a6d515f1efaabcc144688be00" +dependencies = [ + "matches", + "percent-encoding 2.1.0", +] + [[package]] name = "frame-benchmarking" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "frame-support", "frame-system", @@ -1700,7 +1775,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "frame-benchmarking", "parity-scale-codec", @@ -1718,7 +1793,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "frame-support", "frame-system", @@ -1733,7 +1808,7 @@ dependencies = [ [[package]] name = "frame-metadata" version = "11.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "parity-scale-codec", "serde", @@ -1744,7 +1819,7 @@ dependencies = [ [[package]] name = "frame-support" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "bitmask", "frame-metadata", @@ -1769,40 +1844,40 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "frame-support-procedural-tools", - "proc-macro2 1.0.23", + "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.42", + "syn 1.0.48", ] [[package]] name = "frame-support-procedural-tools" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", - "proc-macro2 1.0.23", + "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.42", + "syn 1.0.48", ] [[package]] name = "frame-support-procedural-tools-derive" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ - "proc-macro2 1.0.23", + "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.42", + "syn 1.0.48", ] [[package]] name = "frame-system" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -1818,7 +1893,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "parity-scale-codec", "sp-api", @@ -1827,13 +1902,12 @@ dependencies = [ [[package]] name = "frontier-consensus" version = "0.1.0" -source = "git+https://github.com/purestake/frontier?branch=v0.2-hotfixes#adb97b1d03209b2e3a357ec75a8207473a4934c3" +source = "git+https://github.com/purestake/frontier?branch=v0.3-hotfixes#5b8a2b3af8fffcd8c5a50429dc569987d3279899" dependencies = [ - "derive_more 0.99.10", + "derive_more 0.99.11", "ethereum", "frontier-consensus-primitives", - "frontier-rpc-primitives", - "futures 0.3.5", + "futures 0.3.7", "log 0.4.11", "parity-scale-codec", "sc-client-api", @@ -1843,7 +1917,6 @@ dependencies = [ "sp-consensus", "sp-core", "sp-inherents", - "sp-io", "sp-runtime", "sp-timestamp", "substrate-prometheus-endpoint", @@ -1852,7 +1925,7 @@ dependencies = [ [[package]] name = "frontier-consensus-primitives" version = "0.1.0" -source = "git+https://github.com/purestake/frontier?branch=v0.2-hotfixes#adb97b1d03209b2e3a357ec75a8207473a4934c3" +source = "git+https://github.com/purestake/frontier?branch=v0.3-hotfixes#5b8a2b3af8fffcd8c5a50429dc569987d3279899" dependencies = [ "parity-scale-codec", "sp-core", @@ -1863,27 +1936,28 @@ dependencies = [ [[package]] name = "frontier-rpc" version = "0.1.0" -source = "git+https://github.com/purestake/frontier?branch=v0.2-hotfixes#adb97b1d03209b2e3a357ec75a8207473a4934c3" +source = "git+https://github.com/purestake/frontier?branch=v0.3-hotfixes#5b8a2b3af8fffcd8c5a50429dc569987d3279899" dependencies = [ "ethereum", "ethereum-types", "frontier-consensus", "frontier-rpc-core", "frontier-rpc-primitives", - "futures 0.3.5", + "futures 0.3.7", "jsonrpc-core", "jsonrpc-core-client", "jsonrpc-derive", "jsonrpc-pubsub", "log 0.4.11", - "pallet-ethereum 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "pallet-ethereum", + "pallet-evm", "parity-scale-codec", "rlp", + "rustc-hex", "sc-client-api", "sc-network", "sc-rpc", "sc-service", - "sc-transaction-graph", "sha3 0.8.2", "sp-api", "sp-blockchain", @@ -1896,7 +1970,7 @@ dependencies = [ [[package]] name = "frontier-rpc-core" version = "0.1.0" -source = "git+https://github.com/purestake/frontier?branch=v0.2-hotfixes#adb97b1d03209b2e3a357ec75a8207473a4934c3" +source = "git+https://github.com/purestake/frontier?branch=v0.3-hotfixes#5b8a2b3af8fffcd8c5a50429dc569987d3279899" dependencies = [ "ethereum-types", "jsonrpc-core", @@ -1911,14 +1985,14 @@ dependencies = [ [[package]] name = "frontier-rpc-primitives" version = "0.1.0" -source = "git+https://github.com/purestake/frontier?branch=v0.2-hotfixes#adb97b1d03209b2e3a357ec75a8207473a4934c3" +source = "git+https://github.com/purestake/frontier?branch=v0.3-hotfixes#5b8a2b3af8fffcd8c5a50429dc569987d3279899" dependencies = [ "ethereum", "ethereum-types", - "pallet-evm", "parity-scale-codec", "sp-api", "sp-core", + "sp-evm", "sp-runtime", "sp-std", ] @@ -1959,15 +2033,15 @@ checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" [[package]] name = "futures" -version = "0.1.29" +version = "0.1.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b980f2816d6ee8673b6517b52cb0e808a180efc92e5c19d02cdda79066703ef" +checksum = "4c7e4c2612746b0df8fed4ce0c69156021b704c9aefa360311c04e6e9e002eed" [[package]] name = "futures" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e05b85ec287aac0dc34db7d4a569323df697f9c55b99b15d6b4ef8cde49f613" +checksum = "95314d38584ffbfda215621d723e0a3906f032e03ae5551e650058dac83d4797" dependencies = [ "futures-channel", "futures-core", @@ -1980,9 +2054,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f366ad74c28cca6ba456d95e6422883cfb4b252a83bed929c83abfdbbf2967d5" +checksum = "0448174b01148032eed37ac4aed28963aaaa8cfa93569a08e5b479bbc6c2c151" dependencies = [ "futures-core", "futures-sink", @@ -1999,9 +2073,9 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59f5fff90fd5d971f936ad674802482ba441b6f09ba5e15fd8b39145582ca399" +checksum = "18eaa56102984bed2c88ea39026cff3ce3b4c7f508ca970cedf2450ea10d4e46" [[package]] name = "futures-core-preview" @@ -2015,7 +2089,7 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4" dependencies = [ - "futures 0.1.29", + "futures 0.1.30", "num_cpus", ] @@ -2025,21 +2099,21 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fdcef58a173af8148b182684c9f2d5250875adbcaff7b5794073894f9d8634a9" dependencies = [ - "futures 0.1.29", - "futures 0.3.5", + "futures 0.1.30", + "futures 0.3.7", "lazy_static", "log 0.4.11", "parking_lot 0.9.0", - "pin-project", + "pin-project 0.4.27", "serde", "serde_json", ] [[package]] name = "futures-executor" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10d6bb888be1153d3abeb9006b11b02cf5e9b209fda28693c31ae1e4e012e314" +checksum = "f5f8e0c9258abaea85e78ebdda17ef9666d390e987f006be6080dfe354b708cb" dependencies = [ "futures-core", "futures-task", @@ -2049,15 +2123,15 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de27142b013a8e869c14957e6d2edeef89e97c289e69d042ee3a49acd8b51789" +checksum = "6e1798854a4727ff944a7b12aa999f58ce7aa81db80d2dfaaf2ba06f065ddd2b" [[package]] name = "futures-lite" -version = "1.11.1" +version = "1.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "381a7ad57b1bad34693f63f6f377e1abded7a9c85c9d3eb6771e11c60aaadab9" +checksum = "5e6c079abfac3ab269e2927ec048dabc89d009ebfdda6b8ee86624f30c689658" dependencies = [ "fastrand", "futures-core", @@ -2070,27 +2144,27 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0b5a30a4328ab5473878237c447333c093297bded83a4983d10f4deea240d39" +checksum = "e36fccf3fc58563b4a14d265027c627c3b665d7fed489427e88e7cc929559efe" dependencies = [ "proc-macro-hack", - "proc-macro2 1.0.23", + "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.42", + "syn 1.0.48", ] [[package]] name = "futures-sink" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f2032893cb734c7a05d85ce0cc8b8c4075278e93b24b66f9de99d6eb0fa8acc" +checksum = "0e3ca3f17d6e8804ae5d3df7a7d35b2b3a6fe89dac84b31872720fc3060a0b11" [[package]] name = "futures-task" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdb66b5f09e22019b1ab0830f7785bcea8e7a42148683f99214f73f8ec21a626" +checksum = "96d502af37186c4fef99453df03e374683f8a1eec9dcc1e66b3b82dc8278ce3c" dependencies = [ "once_cell", ] @@ -2109,11 +2183,11 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" [[package]] name = "futures-util" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8764574ff08b701a084482c3c7031349104b07ac897393010494beaa18ce32c6" +checksum = "abcb44342f62e6f3e8ac427b8aa815f724fd705dfad060b18ac7866c15bb8e34" dependencies = [ - "futures 0.1.29", + "futures 0.1.30", "futures-channel", "futures-core", "futures-io", @@ -2121,7 +2195,7 @@ dependencies = [ "futures-sink", "futures-task", "memchr", - "pin-project", + "pin-project 1.0.1", "pin-utils", "proc-macro-hack", "proc-macro-nested", @@ -2147,9 +2221,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce54d63f8b0c75023ed920d46fd71d0cbbb830b0ee012726b5b4f506fb6dea5b" dependencies = [ "bytes 0.5.6", - "futures 0.3.5", + "futures 0.3.7", "memchr", - "pin-project", + "pin-project 0.4.27", ] [[package]] @@ -2205,7 +2279,18 @@ version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", + "libc", + "wasi 0.9.0+wasi-snapshot-preview1", +] + +[[package]] +name = "getrandom" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee8025cf36f917e6a52cce185b7c7177689b838b7ec138364e50cc2277a56cf4" +dependencies = [ + "cfg-if 0.1.10", "libc", "wasi 0.9.0+wasi-snapshot-preview1", ] @@ -2232,9 +2317,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaf91faf136cb47367fa430cd46e37a788775e7fa104f8b4bcb3861dc389b724" +checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce" [[package]] name = "glob" @@ -2244,9 +2329,9 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" [[package]] name = "globset" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ad1da430bd7281dde2576f44c84cc3f0f7b475e7202cd503042dff01a8c8120" +checksum = "c152169ef1e421390738366d2f796655fec62621dabbd0fd476f905934061e4a" dependencies = [ "aho-corasick", "bstr", @@ -2277,7 +2362,7 @@ dependencies = [ "byteorder", "bytes 0.4.12", "fnv", - "futures 0.1.29", + "futures 0.1.30", "http 0.1.21", "indexmap", "log 0.4.11", @@ -2288,9 +2373,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "993f9e0baeed60001cf565546b0d3dbe6a6ad23f2bd31644a133c641eccf6d53" +checksum = "5e4728fd124914ad25e99e3d15a9361a879f6620f63cb56bbb08f95abb97a535" dependencies = [ "bytes 0.5.6", "fnv", @@ -2303,6 +2388,7 @@ dependencies = [ "tokio 0.2.22", "tokio-util", "tracing", + "tracing-futures", ] [[package]] @@ -2326,7 +2412,7 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e6073d0ca812575946eb5f35ff68dbe519907b25c42530389ff946dc84c6ead" dependencies = [ - "ahash 0.2.18", + "ahash 0.2.19", "autocfg 0.1.7", ] @@ -2342,9 +2428,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00d63df3d41950fb462ed38308eea019113ad1508da725bbedcd0fa5a85ef5f7" +checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" [[package]] name = "heck" @@ -2357,9 +2443,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.1.16" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c30f6d0bc6b00693347368a67d41b58f2fb851215ff1da49e90fe2c5c667151" +checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8" dependencies = [ "libc", ] @@ -2445,7 +2531,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6741c859c1b2463a423a1dbce98d418e6c3c3fc720fb0d45528657320920292d" dependencies = [ "bytes 0.4.12", - "futures 0.1.29", + "futures 0.1.30", "http 0.1.21", "tokio-buf", ] @@ -2488,7 +2574,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9dbe6ed1438e1f8ad955a4701e9a944938e9519f6888d12d8558b645e247d5f6" dependencies = [ "bytes 0.4.12", - "futures 0.1.29", + "futures 0.1.30", "futures-cpupool", "h2 0.1.26", "http 0.1.21", @@ -2513,21 +2599,21 @@ dependencies = [ [[package]] name = "hyper" -version = "0.13.8" +version = "0.13.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f3afcfae8af5ad0576a31e768415edb627824129e8e5a29b8bfccb2f234e835" +checksum = "f6ad767baac13b44d4529fcf58ba2cd0995e36e7b435bc5b039de6f47e880dbf" dependencies = [ "bytes 0.5.6", "futures-channel", "futures-core", "futures-util", - "h2 0.2.6", + "h2 0.2.7", "http 0.2.1", "http-body 0.3.1", "httparse", "httpdate", "itoa", - "pin-project", + "pin-project 1.0.1", "socket2", "tokio 0.2.22", "tower-service", @@ -2544,7 +2630,7 @@ dependencies = [ "bytes 0.5.6", "ct-logs", "futures-util", - "hyper 0.13.8", + "hyper 0.13.9", "log 0.4.11", "rustls", "rustls-native-certs", @@ -2617,9 +2703,9 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ef5550a42e3740a0e71f909d4c861056a284060af885ae7aa6242820f920d9d" dependencies = [ - "proc-macro2 1.0.23", + "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.42", + "syn 1.0.48", ] [[package]] @@ -2629,17 +2715,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55e2e4c765aa53a0424761bf9f41aa7a6ac1efa87238f59560640e27fca028f2" dependencies = [ "autocfg 1.0.1", - "hashbrown 0.9.0", + "hashbrown 0.9.1", "serde", ] [[package]] name = "instant" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63312a18f7ea8760cdd0a7c5aac1a619752a246b833545e3e36d1f81f7cd9e66" +checksum = "cb1fc4429a33e1f80d41dc9fea4d108a88bec1de8053878898ae448a0b52f613" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", ] [[package]] @@ -2648,7 +2734,7 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "276ec31bcb4a9ee45f58bec6f9ec700ae4cf4f4f8f2fa7e06cb406bd5ffdd770" dependencies = [ - "num-traits 0.2.12", + "num-traits 0.2.14", ] [[package]] @@ -2657,7 +2743,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64fa110ec7b8f493f416eed552740d10e7030ad5f63b2308f82c9608ec2df275" dependencies = [ - "futures 0.3.5", + "futures 0.3.7", "futures-timer 2.0.2", ] @@ -2731,7 +2817,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2773fa94a2a1fd51efb89a8f45b8861023dbb415d18d3c9235ae9388d780f9ec" dependencies = [ "failure", - "futures 0.1.29", + "futures 0.1.30", "jsonrpc-core", "jsonrpc-pubsub", "log 0.4.11", @@ -2746,7 +2832,7 @@ version = "14.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0747307121ffb9703afd93afbd0fb4f854c38fb873f2c8b90e0e902f27c7b62" dependencies = [ - "futures 0.1.29", + "futures 0.1.30", "log 0.4.11", "serde", "serde_derive", @@ -2769,9 +2855,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d0e77e8812f02155b85a677a96e1d16b60181950c0636199bc4528524fba98dc" dependencies = [ "proc-macro-crate", - "proc-macro2 1.0.23", + "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.42", + "syn 1.0.48", ] [[package]] @@ -2996,15 +3082,15 @@ checksum = "3576a87f2ba00f6f106fdfcd16db1d698d648a26ad8e0573cad8537c3c362d2a" [[package]] name = "libc" -version = "0.2.77" +version = "0.2.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2f96b10ec2560088a8e76961b00d47107b3a625fecb76dedb29ee7ccbf98235" +checksum = "4d58d1b70b004888f764dfbf6a26a3b0342a1632d33968e4a179d8011c760614" [[package]] name = "libflate" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9bac9023e1db29c084f9f8cd9d3852e5e8fddf98fb47c4964a0ea4663d95949" +checksum = "389de7875e06476365974da3e7ff85d55f1972188ccd9f6020dd7c8156e17914" dependencies = [ "adler32", "crc32fast", @@ -3041,7 +3127,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0306a49ee6a89468f96089906f36b0eef82c988dcfc8acf3e2dcd6ad1c859f85" dependencies = [ "bytes 0.5.6", - "futures 0.3.5", + "futures 0.3.7", "lazy_static", "libp2p-core", "libp2p-core-derive", @@ -3060,7 +3146,7 @@ dependencies = [ "multihash", "parity-multiaddr", "parking_lot 0.10.2", - "pin-project", + "pin-project 0.4.27", "smallvec 1.4.2", "wasm-timer", ] @@ -3072,11 +3158,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a694fd76d7c33a45a0e6e1525e9b9b5d11127c9c94e560ac0f8abba54ed80af" dependencies = [ "asn1_der", - "bs58", + "bs58 0.3.1", "ed25519-dalek", "either", "fnv", - "futures 0.3.5", + "futures 0.3.7", "futures-timer 3.0.2", "lazy_static", "libsecp256k1", @@ -3085,7 +3171,7 @@ dependencies = [ "multistream-select", "parity-multiaddr", "parking_lot 0.10.2", - "pin-project", + "pin-project 0.4.27", "prost", "prost-build", "rand 0.7.3", @@ -3106,7 +3192,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f753d9324cd3ec14bf04b8a8cd0d269c87f294153d6bf2a84497a63a5ad22213" dependencies = [ "quote 1.0.7", - "syn 1.0.42", + "syn 1.0.48", ] [[package]] @@ -3115,7 +3201,7 @@ version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f751924b6b98e350005e0b87a822beb246792a3fb878c684e088f866158120ac" dependencies = [ - "futures 0.3.5", + "futures 0.3.7", "libp2p-core", "log 0.4.11", ] @@ -3126,7 +3212,7 @@ version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "912c00a7bf67e0e765daf0cc37e08f675ea26aba3d6d1fbfaee81f19a4c23049" dependencies = [ - "futures 0.3.5", + "futures 0.3.7", "libp2p-core", "libp2p-swarm", "log 0.4.11", @@ -3142,11 +3228,11 @@ version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44ed3a4c8111c570ab2bffb30c6353178d7603ce3787e3c5f2493c8d3d16d1f0" dependencies = [ - "arrayvec 0.5.1", + "arrayvec 0.5.2", "bytes 0.5.6", "either", "fnv", - "futures 0.3.5", + "futures 0.3.7", "futures_codec", "libp2p-core", "libp2p-swarm", @@ -3173,7 +3259,7 @@ dependencies = [ "data-encoding", "dns-parser", "either", - "futures 0.3.5", + "futures 0.3.7", "lazy_static", "libp2p-core", "libp2p-swarm", @@ -3193,7 +3279,7 @@ checksum = "14ae0ffacd30f073f96cd518b2c9cd2cb18ac27c3d136a4b23cf1af99f33e541" dependencies = [ "bytes 0.5.6", "fnv", - "futures 0.3.5", + "futures 0.3.7", "futures_codec", "libp2p-core", "log 0.4.11", @@ -3209,7 +3295,7 @@ checksum = "8f353f8966bbaaf7456535fffd3f366f153148773a0cf04b2ec3860955cb720e" dependencies = [ "bytes 0.5.6", "curve25519-dalek 2.1.0", - "futures 0.3.5", + "futures 0.3.7", "lazy_static", "libp2p-core", "log 0.4.11", @@ -3219,7 +3305,7 @@ dependencies = [ "sha2 0.8.2", "snow", "static_assertions", - "x25519-dalek", + "x25519-dalek 0.6.0", "zeroize", ] @@ -3229,7 +3315,7 @@ version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70130cf130e4ba6dc177366e72dd9f86f9e3588fa1a0c4145247e676f16affad" dependencies = [ - "futures 0.3.5", + "futures 0.3.7", "libp2p-core", "libp2p-swarm", "log 0.4.11", @@ -3244,7 +3330,7 @@ version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f88d5e2a090a2aadf042cd33484e2f015c6dab212567406a59deece5dedbd133" dependencies = [ - "futures 0.3.5", + "futures 0.3.7", "libp2p-core", "log 0.4.11", "rand 0.7.3", @@ -3260,7 +3346,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b1fa2bbad054020cb875546a577a66a65a5bf42eff55ed5265f92ffee3cc052" dependencies = [ "async-std", - "futures 0.3.5", + "futures 0.3.7", "futures-timer 3.0.2", "get_if_addrs", "ipnet", @@ -3275,7 +3361,7 @@ version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0feb99e32fea20ffb1bbf56a6fb2614bff7325ff44a515728385170b3420d2c3" dependencies = [ - "futures 0.3.5", + "futures 0.3.7", "js-sys", "libp2p-core", "parity-send-wrapper", @@ -3291,14 +3377,14 @@ checksum = "046a5201f6e471f22b22b394e4d084269ed1e28cf7300f7b49874385db84c7bd" dependencies = [ "async-tls", "either", - "futures 0.3.5", + "futures 0.3.7", "libp2p-core", "log 0.4.11", "quicksink", "rustls", "rw-stream-sink", "soketto", - "url 2.1.1", + "url 2.2.0", "webpki", "webpki-roots 0.18.0", ] @@ -3309,7 +3395,7 @@ version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "46ae9bf2f7d8a4be9c7e9b61df9de9dc1bd66419d669098f22f81f8d9571029a" dependencies = [ - "futures 0.3.5", + "futures 0.3.7", "libp2p-core", "parking_lot 0.10.2", "thiserror", @@ -3424,7 +3510,7 @@ version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", ] [[package]] @@ -3468,9 +3554,9 @@ checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" [[package]] name = "memchr" -version = "2.3.3" +version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" +checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" [[package]] name = "memmap" @@ -3531,9 +3617,9 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c60c0dfe32c10b43a144bad8fc83538c52f58302c92300ea7ec7bf7b38d5a7b9" +checksum = "0f2d26ec3309788e423cfbf68ad1800f061638098d76a83681af979dc4eda19d" dependencies = [ "adler", "autocfg 1.0.1", @@ -3545,7 +3631,7 @@ version = "0.6.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fce347092656428bc8eaf6201042cb551b8d67855af7374542a92a0fbfcac430" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "fuchsia-zircon", "fuchsia-zircon-sys", "iovec", @@ -3631,13 +3717,13 @@ dependencies = [ "frontier-consensus", "frontier-rpc", "frontier-rpc-primitives", - "futures 0.3.5", + "futures 0.3.7", "jsonrpc-core", "jsonrpc-pubsub", "log 0.4.11", "moonbeam-runtime", "nix 0.17.0", - "pallet-ethereum 0.1.0 (git+https://github.com/purestake/frontier?branch=v0.2-hotfixes)", + "pallet-ethereum", "pallet-evm", "pallet-sudo", "pallet-transaction-payment-rpc", @@ -3667,7 +3753,6 @@ dependencies = [ "sc-rpc", "sc-rpc-api", "sc-service", - "sc-transaction-graph", "sc-transaction-pool", "serde", "sp-api", @@ -3709,7 +3794,7 @@ dependencies = [ "log 0.4.11", "pallet-aura", "pallet-balances", - "pallet-ethereum 0.1.0 (git+https://github.com/purestake/frontier?branch=v0.2-hotfixes)", + "pallet-ethereum", "pallet-evm", "pallet-grandpa", "pallet-randomness-collective-flip", @@ -3733,7 +3818,7 @@ dependencies = [ "sp-std", "sp-transaction-pool", "sp-version", - "substrate-wasm-builder-runner 1.0.6 (git+https://github.com/paritytech/substrate.git?branch=rococo-branch)", + "substrate-wasm-builder-runner 1.0.6 (git+https://github.com/paritytech/substrate?branch=rococo-branch)", ] [[package]] @@ -3751,8 +3836,8 @@ dependencies = [ "blake2b_simd", "blake2s_simd", "digest 0.9.0", - "sha-1 0.9.1", - "sha2 0.9.1", + "sha-1 0.9.2", + "sha2 0.9.2", "sha3 0.9.1", "unsigned-varint 0.5.1", ] @@ -3765,16 +3850,16 @@ checksum = "1255076139a83bb467426e7f8d0134968a8118844faa755985e077cf31850333" [[package]] name = "multistream-select" -version = "0.8.2" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9157e87afbc2ef0d84cc0345423d715f445edde00141c93721c162de35a05e5" +checksum = "93faf2e41f9ee62fb01680ed48f3cc26652352327aa2e59869070358f6b7dd75" dependencies = [ "bytes 0.5.6", - "futures 0.3.5", + "futures 0.3.7", "log 0.4.11", - "pin-project", + "pin-project 1.0.1", "smallvec 1.4.2", - "unsigned-varint 0.4.0", + "unsigned-varint 0.5.1", ] [[package]] @@ -3789,7 +3874,7 @@ dependencies = [ "matrixmultiply", "num-complex", "num-rational", - "num-traits 0.2.12", + "num-traits 0.2.14", "rand 0.6.5", "typenum", ] @@ -3819,7 +3904,7 @@ version = "0.2.35" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3ebc3ec692ed7c9a255596c67808dee269f64655d8baf7b4f0638e51ba1d6853" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "libc", "winapi 0.3.9", ] @@ -3834,7 +3919,7 @@ dependencies = [ "byteorder", "enum-primitive-derive", "libc", - "num-traits 0.2.12", + "num-traits 0.2.14", "thiserror", ] @@ -3846,7 +3931,7 @@ checksum = "b7fd5681d13fda646462cfbd4e5f2051279a89a544d50eb98c365b507246839f" dependencies = [ "bitflags", "bytes 0.4.12", - "cfg-if", + "cfg-if 0.1.10", "gcc", "libc", "void", @@ -3860,7 +3945,7 @@ checksum = "50e4785f2c3b7589a0d0c1dd60285e1188adac4006e8abd6dd578e1567027363" dependencies = [ "bitflags", "cc", - "cfg-if", + "cfg-if 0.1.10", "libc", "void", ] @@ -3889,9 +3974,9 @@ dependencies = [ [[package]] name = "ntapi" -version = "0.3.4" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a31937dea023539c72ddae0e3571deadc1414b300483fa7aaec176168cfa9d2" +checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44" dependencies = [ "winapi 0.3.9", ] @@ -3904,7 +3989,7 @@ checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304" dependencies = [ "autocfg 1.0.1", "num-integer", - "num-traits 0.2.12", + "num-traits 0.2.14", ] [[package]] @@ -3914,17 +3999,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95" dependencies = [ "autocfg 1.0.1", - "num-traits 0.2.12", + "num-traits 0.2.14", ] [[package]] name = "num-integer" -version = "0.1.43" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d59457e662d541ba17869cf51cf177c0b5f0cbf476c66bdc90bf1edac4f875b" +checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" dependencies = [ "autocfg 1.0.1", - "num-traits 0.2.12", + "num-traits 0.2.14", ] [[package]] @@ -3936,7 +4021,7 @@ dependencies = [ "autocfg 1.0.1", "num-bigint", "num-integer", - "num-traits 0.2.12", + "num-traits 0.2.14", ] [[package]] @@ -3945,14 +4030,14 @@ version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" dependencies = [ - "num-traits 0.2.12", + "num-traits 0.2.14", ] [[package]] name = "num-traits" -version = "0.2.12" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611" +checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" dependencies = [ "autocfg 1.0.1", "libm", @@ -3985,6 +4070,12 @@ dependencies = [ "wasmparser 0.57.0", ] +[[package]] +name = "object" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d3b63360ec3cb337817c2dbd47ab4a0f170d285d8e5a2064600f3def1402397" + [[package]] name = "once_cell" version = "1.4.1" @@ -4024,7 +4115,7 @@ dependencies = [ [[package]] name = "pallet-aura" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "frame-support", "frame-system", @@ -4043,7 +4134,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "frame-support", "frame-system", @@ -4059,7 +4150,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "frame-support", "frame-system", @@ -4074,7 +4165,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "frame-benchmarking", "frame-support", @@ -4099,7 +4190,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "frame-benchmarking", "frame-support", @@ -4113,7 +4204,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "frame-support", "frame-system", @@ -4128,7 +4219,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "frame-benchmarking", "frame-support", @@ -4143,7 +4234,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "frame-support", "frame-system", @@ -4157,13 +4248,7 @@ dependencies = [ [[package]] name = "pallet-ethereum" version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd4556fb64842e71bb6e2f98b7541c0d310069eb607d432c6ac9bdaecbfd3118" - -[[package]] -name = "pallet-ethereum" -version = "0.1.0" -source = "git+https://github.com/purestake/frontier?branch=v0.2-hotfixes#adb97b1d03209b2e3a357ec75a8207473a4934c3" +source = "git+https://github.com/purestake/frontier?branch=v0.3-hotfixes#5b8a2b3af8fffcd8c5a50429dc569987d3279899" dependencies = [ "ethereum", "ethereum-types", @@ -4181,6 +4266,7 @@ dependencies = [ "rustc-hex", "serde", "sha3 0.8.2", + "sp-evm", "sp-io", "sp-runtime", "sp-std", @@ -4189,9 +4275,11 @@ dependencies = [ [[package]] name = "pallet-evm" version = "2.0.0-rc6" -source = "git+https://github.com/purestake/substrate?branch=tgmichel-rococo-branch#9c3a6b1d198cee2b542579752b096ef1968ef0c8" +source = "git+https://github.com/purestake/substrate?branch=v0.3-hotfixes#52b93fd397ee7a3900df8aaa2e207ac1e557e3e0" dependencies = [ "evm", + "evm-gasometer", + "evm-runtime", "frame-support", "frame-system", "impl-trait-for-tuples", @@ -4205,6 +4293,7 @@ dependencies = [ "serde", "sha3 0.8.2", "sp-core", + "sp-evm", "sp-io", "sp-runtime", "sp-std", @@ -4213,7 +4302,7 @@ dependencies = [ [[package]] name = "pallet-finality-tracker" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "frame-support", "frame-system", @@ -4229,7 +4318,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "frame-benchmarking", "frame-support", @@ -4251,7 +4340,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "enumflags2", "frame-benchmarking", @@ -4267,7 +4356,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "frame-support", "frame-system", @@ -4286,7 +4375,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "frame-support", "frame-system", @@ -4302,7 +4391,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "frame-support", "frame-system", @@ -4316,7 +4405,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "frame-support", "frame-system", @@ -4331,7 +4420,7 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "frame-support", "frame-system", @@ -4345,7 +4434,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "frame-support", "frame-system", @@ -4360,7 +4449,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "frame-support", "frame-system", @@ -4375,7 +4464,7 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "frame-support", "frame-system", @@ -4388,7 +4477,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "enumflags2", "frame-support", @@ -4403,7 +4492,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "frame-benchmarking", "frame-support", @@ -4418,7 +4507,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "frame-support", "frame-system", @@ -4438,7 +4527,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "frame-support", "frame-system", @@ -4452,7 +4541,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "frame-support", "frame-system", @@ -4472,18 +4561,18 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "proc-macro-crate", - "proc-macro2 1.0.23", + "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.42", + "syn 1.0.48", ] [[package]] name = "pallet-sudo" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "frame-support", "frame-system", @@ -4497,7 +4586,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "frame-benchmarking", "frame-support", @@ -4514,7 +4603,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "frame-support", "frame-system", @@ -4531,7 +4620,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -4549,7 +4638,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "frame-support", "parity-scale-codec", @@ -4562,7 +4651,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "frame-support", "frame-system", @@ -4576,7 +4665,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "frame-support", "frame-system", @@ -4591,7 +4680,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "enumflags2", "frame-support", @@ -4629,20 +4718,20 @@ dependencies = [ [[package]] name = "parity-multiaddr" -version = "0.9.2" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2165a93382a93de55868dcbfa11e4a8f99676a9164eee6a2b4a9479ad319c257" +checksum = "22fe99b938abd57507e37f8d4ef30cd74b33c71face2809b37b8beb71bab15ab" dependencies = [ "arrayref", - "bs58", + "bs58 0.4.0", "byteorder", "data-encoding", "multihash", "percent-encoding 2.1.0", "serde", "static_assertions", - "unsigned-varint 0.4.0", - "url 2.1.1", + "unsigned-varint 0.5.1", + "url 2.2.0", ] [[package]] @@ -4651,7 +4740,7 @@ version = "1.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c740e5fbcb6847058b40ac7e5574766c6388f585e184d769910fe0d3a2ca861" dependencies = [ - "arrayvec 0.5.1", + "arrayvec 0.5.2", "bitvec", "byte-slice-cast", "parity-scale-codec-derive", @@ -4665,9 +4754,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "198db82bb1c18fc00176004462dd809b2a6d851669550aa17af6dacd21ae0c14" dependencies = [ "proc-macro-crate", - "proc-macro2 1.0.23", + "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.42", + "syn 1.0.48", ] [[package]] @@ -4683,7 +4772,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e57fea504fea33f9fbb5f49f378359030e7e026a6ab849bb9e8f0787376f1bf" dependencies = [ "bytes 0.4.12", - "futures 0.1.29", + "futures 0.1.30", "libc", "log 0.4.11", "mio-named-pipes", @@ -4701,7 +4790,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "297ff91fa36aec49ce183484b102f6b75b46776822bd81525bfc4cc9b0dd0f5c" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "hashbrown 0.8.2", "impl-trait-for-tuples", "parity-util-mem-derive", @@ -4717,8 +4806,8 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f557c32c6d268a07c921471619c0295f5efad3a0e76d4f97a05c091a51d110b2" dependencies = [ - "proc-macro2 1.0.23", - "syn 1.0.42", + "proc-macro2 1.0.24", + "syn 1.0.48", "synstructure", ] @@ -4795,7 +4884,7 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "cloudabi 0.0.3", "libc", "redox_syscall", @@ -4810,7 +4899,7 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d58c7c768d4ba344e3e8d72518ac13e259d7c7ade24167003b8488e10b6740a3" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "cloudabi 0.0.3", "libc", "redox_syscall", @@ -4824,7 +4913,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c361aa727dd08437f2f1447be8b59a33b0edd15e0fcee698f935613d9efbca9b" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "cloudabi 0.1.0", "instant", "libc", @@ -4898,29 +4987,49 @@ dependencies = [ [[package]] name = "pin-project" -version = "0.4.24" +version = "0.4.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ffbc8e94b38ea3d2d8ba92aea2983b503cd75d0888d75b86bb37970b5698e15" +dependencies = [ + "pin-project-internal 0.4.27", +] + +[[package]] +name = "pin-project" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f48fad7cfbff853437be7cf54d7b993af21f53be7f0988cbfe4a51535aa77205" +checksum = "ee41d838744f60d959d7074e3afb6b35c7456d0f61cad38a24e35e6553f73841" dependencies = [ - "pin-project-internal", + "pin-project-internal 1.0.1", ] [[package]] name = "pin-project-internal" -version = "0.4.24" +version = "0.4.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24c6d293bdd3ca5a1697997854c6cf7855e43fb6a0ba1c47af57a5bcafd158ae" +checksum = "65ad2ae56b6abe3a1ee25f15ee605bacadb9a764edaba9c2bf4103800d4a1895" dependencies = [ - "proc-macro2 1.0.23", + "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.42", + "syn 1.0.48", +] + +[[package]] +name = "pin-project-internal" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81a4ffa594b66bff340084d4081df649a7dc049ac8d7fc458d8e628bfbbb2f86" +dependencies = [ + "proc-macro2 1.0.24", + "quote 1.0.7", + "syn 1.0.48", ] [[package]] name = "pin-project-lite" -version = "0.1.8" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71f349a4f0e70676ffb2dbafe16d0c992382d02f0a952e3ddf584fc289dac6b3" +checksum = "c917123afa01924fc84bb20c4c03f004d9c38e5127e3c039bbf7f4b9c76a2f6b" [[package]] name = "pin-utils" @@ -4930,9 +5039,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.18" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d36492546b6af1463394d46f0c834346f31548646f6ba10849802c9c9a27ac33" +checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c" [[package]] name = "platforms" @@ -4945,9 +5054,9 @@ name = "polkadot-availability-store" version = "0.8.22" source = "git+https://github.com/paritytech/polkadot?branch=rococo-branch#9d2324b24a8e616b67a96b862e048e75b0ec211b" dependencies = [ - "derive_more 0.99.10", + "derive_more 0.99.11", "exit-future 0.2.0", - "futures 0.3.5", + "futures 0.3.7", "kvdb", "kvdb-memorydb", "kvdb-rocksdb", @@ -4973,7 +5082,7 @@ version = "0.8.22" source = "git+https://github.com/paritytech/polkadot?branch=rococo-branch#9d2324b24a8e616b67a96b862e048e75b0ec211b" dependencies = [ "frame-benchmarking-cli", - "futures 0.3.5", + "futures 0.3.7", "log 0.4.11", "polkadot-service", "sc-cli", @@ -4995,7 +5104,7 @@ name = "polkadot-collator" version = "0.8.22" source = "git+https://github.com/paritytech/polkadot?branch=rococo-branch#9d2324b24a8e616b67a96b862e048e75b0ec211b" dependencies = [ - "futures 0.3.5", + "futures 0.3.7", "futures-timer 2.0.2", "log 0.4.11", "parity-scale-codec", @@ -5050,7 +5159,7 @@ dependencies = [ "bytes 0.5.6", "derive_more 0.14.1", "exit-future 0.2.0", - "futures 0.3.5", + "futures 0.3.7", "futures-timer 2.0.2", "log 0.4.11", "parity-scale-codec", @@ -5075,8 +5184,8 @@ name = "polkadot-parachain" version = "0.8.22" source = "git+https://github.com/paritytech/polkadot?branch=rococo-branch#9d2324b24a8e616b67a96b862e048e75b0ec211b" dependencies = [ - "derive_more 0.99.10", - "futures 0.3.5", + "derive_more 0.99.11", + "futures 0.3.7", "log 0.4.11", "parity-scale-codec", "parking_lot 0.10.2", @@ -5278,7 +5387,7 @@ source = "git+https://github.com/paritytech/polkadot?branch=rococo-branch#9d2324 dependencies = [ "frame-benchmarking", "frame-system-rpc-runtime-api", - "futures 0.3.5", + "futures 0.3.7", "hex-literal 0.2.1", "kusama-runtime", "lazy_static", @@ -5400,7 +5509,7 @@ name = "polkadot-test-runtime-client" version = "2.0.0" source = "git+https://github.com/paritytech/polkadot?branch=rococo-branch#9d2324b24a8e616b67a96b862e048e75b0ec211b" dependencies = [ - "futures 0.3.5", + "futures 0.3.7", "pallet-timestamp", "parity-scale-codec", "polkadot-primitives", @@ -5426,8 +5535,8 @@ source = "git+https://github.com/paritytech/polkadot?branch=rococo-branch#9d2324 dependencies = [ "frame-benchmarking", "frame-system", - "futures 0.1.29", - "futures 0.3.5", + "futures 0.1.30", + "futures 0.3.7", "hex", "log 0.4.11", "pallet-staking", @@ -5476,7 +5585,7 @@ dependencies = [ "bitvec", "derive_more 0.14.1", "exit-future 0.2.0", - "futures 0.3.5", + "futures 0.3.7", "futures-timer 2.0.2", "log 0.4.11", "pallet-babe", @@ -5508,11 +5617,11 @@ dependencies = [ [[package]] name = "polling" -version = "2.0.1" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab773feb154f12c49ffcfd66ab8bdcf9a1843f950db48b0d8be9d4393783b058" +checksum = "a2a7bc6b2a29e632e45451c941832803a18cce6781db04de8a04696cdca8bde4" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "libc", "log 0.4.11", "wepoll-sys", @@ -5521,28 +5630,28 @@ dependencies = [ [[package]] name = "poly1305" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b42192ab143ed7619bf888a7f9c6733a9a2153b218e2cd557cfdb52fbf9bb1" +checksum = "22ce46de8e53ee414ca4d02bfefac75d8c12fba948b76622a40b4be34dfce980" dependencies = [ "universal-hash", ] [[package]] name = "polyval" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9a50142b55ab3ed0e9f68dfb3709f1d90d29da24e91033f28b96330643107dc" +checksum = "a5884790f1ce3553ad55fec37b5aaac5882e0e845a2612df744d6c85c9bf046c" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "universal-hash", ] [[package]] name = "ppv-lite86" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c36fa947111f5c62a733b652544dd0016a43ce89619538a8ef92724a6f501a20" +checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" [[package]] name = "precompiles" @@ -5611,9 +5720,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", - "proc-macro2 1.0.23", + "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.42", + "syn 1.0.48", "version_check", ] @@ -5623,16 +5732,16 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "proc-macro2 1.0.23", + "proc-macro2 1.0.24", "quote 1.0.7", "version_check", ] [[package]] name = "proc-macro-hack" -version = "0.5.18" +version = "0.5.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99c605b9a0adc77b7211c6b1f722dcb613d68d66859a44f3d485a6da332b0598" +checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" [[package]] name = "proc-macro-nested" @@ -5651,9 +5760,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.23" +version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51ef7cd2518ead700af67bf9d1a658d90b6037d77110fd9c0445429d0ba1c6c9" +checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71" dependencies = [ "unicode-xid 0.2.1", ] @@ -5679,7 +5788,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd0ced56dee39a6e960c15c74dc48849d614586db2eaada6497477af7c7811cd" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "fnv", "lazy_static", "spin", @@ -5722,9 +5831,9 @@ checksum = "537aa19b95acde10a12fec4301466386f757403de4cd4e5b4fa78fb5ecb18f72" dependencies = [ "anyhow", "itertools 0.8.2", - "proc-macro2 1.0.23", + "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.42", + "syn 1.0.48", ] [[package]] @@ -5775,7 +5884,7 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37" dependencies = [ - "proc-macro2 1.0.23", + "proc-macro2 1.0.24", ] [[package]] @@ -5845,7 +5954,7 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" dependencies = [ - "getrandom", + "getrandom 0.1.15", "libc", "rand_chacha 0.2.2", "rand_core 0.5.1", @@ -5894,7 +6003,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" dependencies = [ - "getrandom", + "getrandom 0.1.15", ] [[package]] @@ -5996,25 +6105,25 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" [[package]] name = "rayon" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfd016f0c045ad38b5251be2c9c0ab806917f82da4d36b2a327e5166adad9270" +checksum = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674" dependencies = [ "autocfg 1.0.1", - "crossbeam-deque", + "crossbeam-deque 0.8.0", "either", "rayon-core", ] [[package]] name = "rayon-core" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8c4fec834fb6e6d2dd5eece3c7b432a52f0ba887cf40e595190c4107edc08bf" +checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a" dependencies = [ "crossbeam-channel", - "crossbeam-deque", - "crossbeam-utils", + "crossbeam-deque 0.8.0", + "crossbeam-utils 0.8.0", "lazy_static", "num_cpus", ] @@ -6040,7 +6149,7 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d" dependencies = [ - "getrandom", + "getrandom 0.1.15", "redox_syscall", "rust-argon2", ] @@ -6056,22 +6165,22 @@ dependencies = [ [[package]] name = "ref-cast" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "745c1787167ddae5569661d5ffb8b25ae5fedbf46717eaa92d652221cec72623" +checksum = "e17626b2f4bcf35b84bf379072a66e28cfe5c3c6ae58b38e4914bb8891dabece" dependencies = [ "ref-cast-impl", ] [[package]] name = "ref-cast-impl" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d21b475ab879ef0e315ad99067fa25778c3b0377f57f1b00207448dac1a3144" +checksum = "0c523ccaed8ac4b0288948849a350b37d3035827413c458b6a40ddb614bb4f72" dependencies = [ - "proc-macro2 1.0.23", + "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.42", + "syn 1.0.48", ] [[package]] @@ -6087,9 +6196,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.3.9" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6" +checksum = "38cf2c13ed4745de91a5eb834e11c00bcc3709e773173b2ce4c56c9fbde04b9c" dependencies = [ "aho-corasick", "memchr", @@ -6099,9 +6208,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.18" +version = "0.6.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8" +checksum = "3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189" [[package]] name = "region" @@ -6140,9 +6249,9 @@ version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "475e68978dc5b743f2f40d8e0a8fdc83f1c5e78cbf4b8fa5e74e73beebc340de" dependencies = [ - "proc-macro2 1.0.23", + "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.42", + "syn 1.0.48", ] [[package]] @@ -6185,9 +6294,9 @@ checksum = "cabe4fa914dec5870285fa7f71f602645da47c486e68486d2b4ceb4a343e90ac" [[package]] name = "rlp" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a7d3f9bed94764eac15b8f14af59fac420c236adaff743b7bcc88e265cb4345" +checksum = "1190dcc8c3a512f1eef5d09bb8c84c7f39e1054e174d1795482e18f5272f2e73" dependencies = [ "rustc-hex", ] @@ -6198,9 +6307,9 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e33d7b2abe0c340d8797fe2907d3f20d3b5ea5908683618bfe80df7f621f672a" dependencies = [ - "proc-macro2 1.0.23", + "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.42", + "syn 1.0.48", ] [[package]] @@ -6301,14 +6410,14 @@ dependencies = [ "base64", "blake2b_simd", "constant_time_eq", - "crossbeam-utils", + "crossbeam-utils 0.7.2", ] [[package]] name = "rustc-demangle" -version = "0.1.16" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" +checksum = "6e3bad0ee36814ca07d7968269dd4b7ec89ec2da10c4bb613928d3077083c232" [[package]] name = "rustc-hash" @@ -6368,8 +6477,8 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4da5fcb054c46f5a5dff833b129285a93d3f0179531735e6c866e8cc307d2020" dependencies = [ - "futures 0.3.5", - "pin-project", + "futures 0.3.7", + "pin-project 0.4.27", "static_assertions", ] @@ -6391,11 +6500,11 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "bytes 0.5.6", - "derive_more 0.99.10", - "futures 0.3.5", + "derive_more 0.99.11", + "futures 0.3.7", "futures-timer 3.0.2", "libp2p", "log 0.4.11", @@ -6418,9 +6527,9 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ - "futures 0.3.5", + "futures 0.3.7", "futures-timer 3.0.2", "log 0.4.11", "parity-scale-codec", @@ -6442,7 +6551,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -6459,7 +6568,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "impl-trait-for-tuples", "sc-chain-spec-derive", @@ -6475,26 +6584,26 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "proc-macro-crate", - "proc-macro2 1.0.23", + "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.42", + "syn 1.0.48", ] [[package]] name = "sc-cli" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "ansi_term 0.12.1", "atty", "chrono", - "derive_more 0.99.10", + "derive_more 0.99.11", "env_logger", "fdlimit", - "futures 0.3.5", + "futures 0.3.7", "lazy_static", "log 0.4.11", "names", @@ -6527,11 +6636,11 @@ dependencies = [ [[package]] name = "sc-client-api" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ - "derive_more 0.99.10", + "derive_more 0.99.11", "fnv", - "futures 0.3.5", + "futures 0.3.7", "hash-db", "hex-literal 0.2.1", "kvdb", @@ -6563,7 +6672,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "blake2-rfc", "hash-db", @@ -6593,7 +6702,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "sc-client-api", "sp-blockchain", @@ -6604,17 +6713,17 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ - "derive_more 0.99.10", + "derive_more 0.99.11", "fork-tree", - "futures 0.3.5", + "futures 0.3.7", "futures-timer 3.0.2", "log 0.4.11", "merlin", "num-bigint", "num-rational", - "num-traits 0.2.12", + "num-traits 0.2.14", "parity-scale-codec", "parking_lot 0.10.2", "pdqselect", @@ -6648,10 +6757,10 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ - "derive_more 0.99.10", - "futures 0.3.5", + "derive_more 0.99.11", + "futures 0.3.7", "jsonrpc-core", "jsonrpc-core-client", "jsonrpc-derive", @@ -6672,7 +6781,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "fork-tree", "parity-scale-codec", @@ -6685,11 +6794,11 @@ dependencies = [ [[package]] name = "sc-consensus-manual-seal" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "assert_matches", - "derive_more 0.99.10", - "futures 0.3.5", + "derive_more 0.99.11", + "futures 0.3.7", "jsonrpc-core", "jsonrpc-core-client", "jsonrpc-derive", @@ -6710,9 +6819,9 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ - "futures 0.3.5", + "futures 0.3.7", "futures-timer 3.0.2", "log 0.4.11", "parity-scale-codec", @@ -6733,7 +6842,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "log 0.4.11", "sc-client-api", @@ -6747,9 +6856,9 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ - "derive_more 0.99.10", + "derive_more 0.99.11", "lazy_static", "libsecp256k1", "log 0.4.11", @@ -6775,9 +6884,9 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ - "derive_more 0.99.10", + "derive_more 0.99.11", "log 0.4.11", "parity-scale-codec", "parity-wasm", @@ -6792,7 +6901,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "log 0.4.11", "parity-scale-codec", @@ -6807,7 +6916,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "cranelift-codegen", "cranelift-wasm", @@ -6828,18 +6937,18 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "assert_matches", - "derive_more 0.99.10", + "derive_more 0.99.11", "finality-grandpa", "fork-tree", - "futures 0.3.5", + "futures 0.3.7", "futures-timer 3.0.2", "log 0.4.11", "parity-scale-codec", "parking_lot 0.10.2", - "pin-project", + "pin-project 0.4.27", "rand 0.7.3", "sc-block-builder", "sc-client-api", @@ -6866,11 +6975,11 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ - "derive_more 0.99.10", + "derive_more 0.99.11", "finality-grandpa", - "futures 0.3.5", + "futures 0.3.7", "jsonrpc-core", "jsonrpc-core-client", "jsonrpc-derive", @@ -6883,10 +6992,10 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "ansi_term 0.12.1", - "futures 0.3.5", + "futures 0.3.7", "log 0.4.11", "parity-util-mem", "sc-client-api", @@ -6901,9 +7010,9 @@ dependencies = [ [[package]] name = "sc-keystore" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ - "derive_more 0.99.10", + "derive_more 0.99.11", "hex", "merlin", "parking_lot 0.10.2", @@ -6917,7 +7026,7 @@ dependencies = [ [[package]] name = "sc-light" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "hash-db", "lazy_static", @@ -6936,17 +7045,17 @@ dependencies = [ [[package]] name = "sc-network" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "bitflags", - "bs58", + "bs58 0.3.1", "bytes 0.5.6", - "derive_more 0.99.10", + "derive_more 0.99.11", "either", "erased-serde", "fnv", "fork-tree", - "futures 0.3.5", + "futures 0.3.7", "futures-timer 3.0.2", "futures_codec", "hex", @@ -6959,7 +7068,7 @@ dependencies = [ "nohash-hasher", "parity-scale-codec", "parking_lot 0.10.2", - "pin-project", + "pin-project 0.4.27", "prost", "prost-build", "rand 0.7.3", @@ -6988,9 +7097,9 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ - "futures 0.3.5", + "futures 0.3.7", "futures-timer 3.0.2", "libp2p", "log 0.4.11", @@ -7003,13 +7112,13 @@ dependencies = [ [[package]] name = "sc-offchain" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "bytes 0.5.6", "fnv", - "futures 0.3.5", + "futures 0.3.7", "futures-timer 3.0.2", - "hyper 0.13.8", + "hyper 0.13.9", "hyper-rustls", "log 0.4.11", "num_cpus", @@ -7030,9 +7139,9 @@ dependencies = [ [[package]] name = "sc-peerset" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ - "futures 0.3.5", + "futures 0.3.7", "libp2p", "log 0.4.11", "serde_json", @@ -7043,7 +7152,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "log 0.4.11", "substrate-prometheus-endpoint", @@ -7052,9 +7161,9 @@ dependencies = [ [[package]] name = "sc-rpc" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ - "futures 0.3.5", + "futures 0.3.7", "hash-db", "jsonrpc-core", "jsonrpc-pubsub", @@ -7084,10 +7193,10 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ - "derive_more 0.99.10", - "futures 0.3.5", + "derive_more 0.99.11", + "futures 0.3.7", "jsonrpc-core", "jsonrpc-core-client", "jsonrpc-derive", @@ -7108,7 +7217,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "jsonrpc-core", "jsonrpc-http-server", @@ -7124,13 +7233,13 @@ dependencies = [ [[package]] name = "sc-service" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ - "derive_more 0.99.10", + "derive_more 0.99.11", "directories", "exit-future 0.2.0", - "futures 0.1.29", - "futures 0.3.5", + "futures 0.1.30", + "futures 0.3.7", "futures-timer 3.0.2", "hash-db", "jsonrpc-pubsub", @@ -7140,7 +7249,7 @@ dependencies = [ "parity-scale-codec", "parity-util-mem", "parking_lot 0.10.2", - "pin-project", + "pin-project 0.4.27", "procfs", "rand 0.7.3", "sc-block-builder", @@ -7187,7 +7296,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "log 0.4.11", "parity-scale-codec", @@ -7201,14 +7310,14 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ - "futures 0.3.5", + "futures 0.3.7", "futures-timer 3.0.2", "libp2p", "log 0.4.11", "parking_lot 0.10.2", - "pin-project", + "pin-project 0.4.27", "rand 0.7.3", "serde", "slog", @@ -7222,7 +7331,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "erased-serde", "log 0.4.11", @@ -7239,10 +7348,10 @@ dependencies = [ [[package]] name = "sc-transaction-graph" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ - "derive_more 0.99.10", - "futures 0.3.5", + "derive_more 0.99.11", + "futures 0.3.7", "linked-hash-map", "log 0.4.11", "parity-util-mem", @@ -7260,10 +7369,10 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ - "derive_more 0.99.10", - "futures 0.3.5", + "derive_more 0.99.11", + "futures 0.3.7", "futures-diagnose", "intervalier", "log 0.4.11", @@ -7300,9 +7409,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "021b403afe70d81eea68f6ea12f6b3c9588e5d536a94c3bf80f15e7faa267862" dependencies = [ "arrayref", - "arrayvec 0.5.1", + "arrayvec 0.5.2", "curve25519-dalek 2.1.0", - "getrandom", + "getrandom 0.1.15", "merlin", "rand 0.7.3", "rand_core 0.5.1", @@ -7331,22 +7440,22 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "scroll" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb2332cb595d33f7edd5700f4cbf94892e680c7f0ae56adab58a35190b66cb1" +checksum = "fda28d4b4830b807a8b43f7b0e6b5df875311b3e7621d84577188c175b6ec1ec" dependencies = [ "scroll_derive", ] [[package]] name = "scroll_derive" -version = "0.10.2" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e367622f934864ffa1c704ba2b82280aab856e3d8213c84c5720257eb34b15b9" +checksum = "b12bd20b94c7cdfda8c7ba9b92ad0d9a56e3fa018c25fca83b51aa664c9b4c0d" dependencies = [ - "proc-macro2 1.0.23", + "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.42", + "syn 1.0.48", ] [[package]] @@ -7408,29 +7517,29 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.116" +version = "1.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96fe57af81d28386a513cbc6858332abc6117cfdb5999647c6444b8f43a370a5" +checksum = "b88fa983de7720629c9387e9f517353ed404164b1e482c970a90c1a4aaf7dc1a" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.116" +version = "1.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f630a6370fd8e457873b4bd2ffdae75408bc291ba72be773772a4c2a065d9ae8" +checksum = "cbd1ae72adb44aab48f325a02444a5fc079349a8d804c1fc922aed3f7454c74e" dependencies = [ - "proc-macro2 1.0.23", + "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.42", + "syn 1.0.48", ] [[package]] name = "serde_json" -version = "1.0.57" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "164eacbdb13512ec2745fb09d51fd5b22b0d65ed294a1dcf7285a360c80a675c" +checksum = "dcac07dbffa1c65e7f816ab9eba78eb142c6d44410f4eeba1e26e4f5dfa56b95" dependencies = [ "itoa", "ryu", @@ -7451,12 +7560,12 @@ dependencies = [ [[package]] name = "sha-1" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "170a36ea86c864a3f16dd2687712dd6646f7019f301e57537c7f4dc9f5916770" +checksum = "ce3cdf1b5e620a498ee6f2a171885ac7e22f0e12089ec4b3d22b84921792507c" dependencies = [ "block-buffer 0.9.0", - "cfg-if", + "cfg-if 1.0.0", "cpuid-bool", "digest 0.9.0", "opaque-debug 0.3.0", @@ -7476,12 +7585,12 @@ dependencies = [ [[package]] name = "sha2" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2933378ddfeda7ea26f48c555bdad8bb446bf8a3d17832dc83e380d444cfb8c1" +checksum = "6e7aab86fe2149bad8c507606bdb3f4ef5e7b2380eb92350f56122cca72a42a8" dependencies = [ "block-buffer 0.9.0", - "cfg-if", + "cfg-if 1.0.0", "cpuid-bool", "digest 0.9.0", "opaque-debug 0.3.0", @@ -7518,7 +7627,7 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf3ab0cdff84d6c66fc9e268010ea6508e58ee942575afb66f2cf194bb218bb4" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "enum_primitive", "libc", "log 0.4.11", @@ -7550,11 +7659,10 @@ checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" [[package]] name = "signal-hook-registry" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e12110bc539e657a646068aaf5eb5b63af9d0c1f7b29c97113fad80e15f035" +checksum = "ce32ea0c6c56d5eacaeb814fbed9960547021d3edd010ded1425f180536b20ab" dependencies = [ - "arc-swap", "libc", ] @@ -7609,9 +7717,9 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a945ec7f7ce853e89ffa36be1e27dce9a43e82ff9093bf3461c30d5da74ed11b" dependencies = [ - "proc-macro2 1.0.23", + "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.42", + "syn 1.0.48", ] [[package]] @@ -7631,9 +7739,9 @@ checksum = "fbee7696b84bbf3d89a1c2eccff0850e3047ed46bfcd2e92c29a2d074d57e252" [[package]] name = "snow" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32bf8474159a95551661246cda4976e89356999e3cbfef36f493dacc3fae1e8e" +checksum = "795dd7aeeee24468e5a32661f6d27f7b5cbed802031b2d7640c7b10f8fb2dd50" dependencies = [ "aes-gcm", "blake2", @@ -7642,9 +7750,9 @@ dependencies = [ "rand_core 0.5.1", "ring", "rustc_version", - "sha2 0.9.1", + "sha2 0.9.2", "subtle 2.3.0", - "x25519-dalek", + "x25519-dalek 1.1.0", ] [[package]] @@ -7653,7 +7761,7 @@ version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1fa70dc5c8104ec096f4fe7ede7a221d35ae13dcd19ba1ad9a81d2cab9a1c44" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "libc", "redox_syscall", "winapi 0.3.9", @@ -7668,19 +7776,19 @@ dependencies = [ "base64", "bytes 0.5.6", "flate2", - "futures 0.3.5", + "futures 0.3.7", "httparse", "log 0.4.11", "rand 0.7.3", - "sha-1 0.9.1", + "sha-1 0.9.2", ] [[package]] name = "sp-allocator" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ - "derive_more 0.99.10", + "derive_more 0.99.11", "log 0.4.11", "sp-core", "sp-std", @@ -7690,7 +7798,7 @@ dependencies = [ [[package]] name = "sp-api" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "hash-db", "parity-scale-codec", @@ -7705,19 +7813,19 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "blake2-rfc", "proc-macro-crate", - "proc-macro2 1.0.23", + "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.42", + "syn 1.0.48", ] [[package]] name = "sp-application-crypto" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "parity-scale-codec", "serde", @@ -7729,10 +7837,10 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "integer-sqrt", - "num-traits 0.2.12", + "num-traits 0.2.14", "parity-scale-codec", "serde", "sp-debug-derive", @@ -7742,7 +7850,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "parity-scale-codec", "sp-api", @@ -7754,7 +7862,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -7765,7 +7873,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "parity-scale-codec", "sp-api", @@ -7777,9 +7885,9 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ - "derive_more 0.99.10", + "derive_more 0.99.11", "log 0.4.11", "lru", "parity-scale-codec", @@ -7794,7 +7902,7 @@ dependencies = [ [[package]] name = "sp-chain-spec" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "serde", "serde_json", @@ -7803,10 +7911,10 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ - "derive_more 0.99.10", - "futures 0.3.5", + "derive_more 0.99.11", + "futures 0.3.7", "futures-timer 3.0.2", "libp2p", "log 0.4.11", @@ -7829,7 +7937,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "parity-scale-codec", "sp-api", @@ -7843,7 +7951,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "merlin", "parity-scale-codec", @@ -7862,7 +7970,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -7871,7 +7979,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -7883,15 +7991,15 @@ dependencies = [ [[package]] name = "sp-core" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "base58", "blake2-rfc", "byteorder", - "derive_more 0.99.10", + "derive_more 0.99.11", "dyn-clonable", "ed25519-dalek", - "futures 0.3.5", + "futures 0.3.7", "hash-db", "hash256-std-hasher", "hex", @@ -7900,7 +8008,7 @@ dependencies = [ "libsecp256k1", "log 0.4.11", "merlin", - "num-traits 0.2.12", + "num-traits 0.2.14", "parity-scale-codec", "parity-util-mem", "parking_lot 0.10.2", @@ -7927,7 +8035,7 @@ dependencies = [ [[package]] name = "sp-database" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "kvdb", "parking_lot 0.10.2", @@ -7936,17 +8044,29 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ - "proc-macro2 1.0.23", + "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.42", + "syn 1.0.48", +] + +[[package]] +name = "sp-evm" +version = "0.8.0" +source = "git+https://github.com/purestake/substrate?branch=v0.3-hotfixes#52b93fd397ee7a3900df8aaa2e207ac1e557e3e0" +dependencies = [ + "evm", + "parity-scale-codec", + "serde", + "sp-core", + "sp-std", ] [[package]] name = "sp-externalities" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "environmental", "parity-scale-codec", @@ -7957,7 +8077,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "finality-grandpa", "log 0.4.11", @@ -7973,7 +8093,7 @@ dependencies = [ [[package]] name = "sp-finality-tracker" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -7983,9 +8103,9 @@ dependencies = [ [[package]] name = "sp-inherents" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ - "derive_more 0.99.10", + "derive_more 0.99.11", "parity-scale-codec", "parking_lot 0.10.2", "sp-core", @@ -7995,9 +8115,9 @@ dependencies = [ [[package]] name = "sp-io" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ - "futures 0.3.5", + "futures 0.3.7", "hash-db", "libsecp256k1", "log 0.4.11", @@ -8016,7 +8136,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "lazy_static", "sp-core", @@ -8027,7 +8147,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "parity-scale-codec", "serde", @@ -8039,18 +8159,18 @@ dependencies = [ [[package]] name = "sp-npos-elections-compact" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "proc-macro-crate", - "proc-macro2 1.0.23", + "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.42", + "syn 1.0.48", ] [[package]] name = "sp-offchain" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "sp-api", "sp-core", @@ -8060,7 +8180,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "backtrace", "log 0.4.11", @@ -8069,7 +8189,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "serde", "sp-core", @@ -8078,7 +8198,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "either", "hash256-std-hasher", @@ -8100,7 +8220,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "parity-scale-codec", "primitive-types", @@ -8115,19 +8235,19 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "Inflector", "proc-macro-crate", - "proc-macro2 1.0.23", + "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.42", + "syn 1.0.48", ] [[package]] name = "sp-serializer" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "serde", "serde_json", @@ -8136,7 +8256,7 @@ dependencies = [ [[package]] name = "sp-session" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "parity-scale-codec", "sp-api", @@ -8149,7 +8269,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -8159,12 +8279,12 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "hash-db", "itertools 0.9.0", "log 0.4.11", - "num-traits 0.2.12", + "num-traits 0.2.14", "parity-scale-codec", "parking_lot 0.10.2", "rand 0.7.3", @@ -8180,12 +8300,12 @@ dependencies = [ [[package]] name = "sp-std" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" [[package]] name = "sp-storage" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "impl-serde 0.2.3", "ref-cast", @@ -8197,7 +8317,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -8211,7 +8331,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "log 0.4.11", "rental", @@ -8221,10 +8341,10 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ - "derive_more 0.99.10", - "futures 0.3.5", + "derive_more 0.99.11", + "futures 0.3.7", "log 0.4.11", "parity-scale-codec", "serde", @@ -8236,7 +8356,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "hash-db", "memory-db", @@ -8250,9 +8370,9 @@ dependencies = [ [[package]] name = "sp-utils" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ - "futures 0.3.5", + "futures 0.3.7", "futures-core", "futures-timer 3.0.2", "lazy_static", @@ -8262,7 +8382,7 @@ dependencies = [ [[package]] name = "sp-version" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "impl-serde 0.2.3", "parity-scale-codec", @@ -8274,7 +8394,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -8311,10 +8431,11 @@ dependencies = [ [[package]] name = "stream-cipher" -version = "0.4.1" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09f8ed9974042b8c3672ff3030a69fcc03b74c47c3d1ecb7755e8a3626011e88" +checksum = "c80e15f898d8d8f25db24c253ea615cc14acf418ff307822995814e7d42cfa89" dependencies = [ + "block-cipher", "generic-array 0.14.4", ] @@ -8335,9 +8456,9 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" [[package]] name = "structopt" -version = "0.3.18" +version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33f6461027d7f08a13715659b2948e1602c31a3756aeae9378bfe7518c72e82" +checksum = "126d630294ec449fae0b16f964e35bf3c74f940da9dca17ee9b905f7b3112eb8" dependencies = [ "clap", "lazy_static", @@ -8346,15 +8467,15 @@ dependencies = [ [[package]] name = "structopt-derive" -version = "0.4.11" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c92e775028122a4b3dd55d58f14fc5120289c69bee99df1d117ae30f84b225c9" +checksum = "65e51c492f9e23a220534971ff5afc14037289de430e3c83f9daf6a1b6ae91e8" dependencies = [ "heck", "proc-macro-error", - "proc-macro2 1.0.23", + "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.42", + "syn 1.0.48", ] [[package]] @@ -8373,9 +8494,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0054a7df764039a6cd8592b9de84be4bec368ff081d203a7d5371cbfa8e65c81" dependencies = [ "heck", - "proc-macro2 1.0.23", + "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.42", + "syn 1.0.48", ] [[package]] @@ -8394,7 +8515,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "platforms", ] @@ -8402,10 +8523,10 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "frame-system-rpc-runtime-api", - "futures 0.3.5", + "futures 0.3.7", "jsonrpc-core", "jsonrpc-core-client", "jsonrpc-derive", @@ -8425,12 +8546,12 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "async-std", - "derive_more 0.99.10", + "derive_more 0.99.11", "futures-util", - "hyper 0.13.8", + "hyper 0.13.9", "log 0.4.11", "prometheus", "tokio 0.2.22", @@ -8439,10 +8560,10 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ - "futures 0.1.29", - "futures 0.3.5", + "futures 0.1.30", + "futures 0.3.7", "hash-db", "hex", "parity-scale-codec", @@ -8465,9 +8586,9 @@ dependencies = [ [[package]] name = "substrate-test-runtime" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "frame-executive", "frame-support", "frame-system", @@ -8498,16 +8619,16 @@ dependencies = [ "sp-transaction-pool", "sp-trie", "sp-version", - "substrate-wasm-builder-runner 1.0.6 (git+https://github.com/paritytech/substrate.git?branch=rococo-branch)", + "substrate-wasm-builder-runner 1.0.6 (git+https://github.com/paritytech/substrate?branch=rococo-branch)", "trie-db", ] [[package]] name = "substrate-test-runtime-client" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ - "futures 0.3.5", + "futures 0.3.7", "parity-scale-codec", "sc-block-builder", "sc-client-api", @@ -8532,7 +8653,7 @@ checksum = "d2a965994514ab35d3893e9260245f2947fd1981cdd4fffd2c6e6d1a9ce02e6a" [[package]] name = "substrate-wasm-builder-runner" version = "1.0.6" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" +source = "git+https://github.com/paritytech/substrate?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" [[package]] name = "substrate-wasmtime" @@ -8542,7 +8663,7 @@ checksum = "d75a69f5b3afef86e3e372529bf3fb1f7219b20287c4490e4cb4b4e91970f4f5" dependencies = [ "anyhow", "backtrace", - "cfg-if", + "cfg-if 0.1.10", "lazy_static", "libc", "log 0.4.11", @@ -8595,11 +8716,11 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.42" +version = "1.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c51d92969d209b54a98397e1b91c8ae82d8c87a7bb87df0b29aa2ad81454228" +checksum = "cc371affeffc477f42a221a1e4297aedcea33d47d19b61455588bd9d8f6b19ac" dependencies = [ - "proc-macro2 1.0.23", + "proc-macro2 1.0.24", "quote 1.0.7", "unicode-xid 0.2.1", ] @@ -8619,9 +8740,9 @@ version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701" dependencies = [ - "proc-macro2 1.0.23", + "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.42", + "syn 1.0.48", "unicode-xid 0.2.1", ] @@ -8631,7 +8752,7 @@ version = "0.14.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2983daff11a197c7c406b130579bc362177aa54cf2cc1f34d6ac88fccaa6a5e1" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "doc-comment", "libc", "ntapi", @@ -8658,7 +8779,7 @@ version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "libc", "rand 0.7.3", "redox_syscall", @@ -8697,22 +8818,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.20" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dfdd070ccd8ccb78f4ad66bf1982dc37f620ef696c6b5028fe2ed83dd3d0d08" +checksum = "0e9ae34b84616eedaaf1e9dd6026dbe00dcafa92aa0c8077cb69df1fcfe5e53e" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.20" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd80fc12f73063ac132ac92aceea36734f04a1d93c1240c6944e23a3b8841793" +checksum = "9ba20f23e85b10754cd195504aebf6a27e2e6cbe28c17778a0c930724628dd56" dependencies = [ - "proc-macro2 1.0.23", + "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.42", + "syn 1.0.48", ] [[package]] @@ -8782,7 +8903,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a09c0b5bb588872ab2f09afa13ee6e9dac11e10a0ec9e8e3ba39a5a5d530af6" dependencies = [ "bytes 0.4.12", - "futures 0.1.29", + "futures 0.1.30", "mio", "num_cpus", "tokio-codec", @@ -8830,7 +8951,7 @@ checksum = "8fb220f46c53859a4b7ec083e41dec9778ff0b1851c0942b211edb89e0ccdc46" dependencies = [ "bytes 0.4.12", "either", - "futures 0.1.29", + "futures 0.1.30", ] [[package]] @@ -8840,7 +8961,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25b2998660ba0e70d18684de5d06b70b70a3a747469af9dea7618cc59e75976b" dependencies = [ "bytes 0.4.12", - "futures 0.1.29", + "futures 0.1.30", "tokio-io", ] @@ -8850,7 +8971,7 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1de0e32a83f131e002238d7ccde18211c0a5397f60cbfffcb112868c2e0e20e" dependencies = [ - "futures 0.1.29", + "futures 0.1.30", "tokio-executor 0.1.10", ] @@ -8860,8 +8981,8 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb2d1b8f4548dbf5e1f7818512e9c406860678f29c300cdf0ebac72d1a3a1671" dependencies = [ - "crossbeam-utils", - "futures 0.1.29", + "crossbeam-utils 0.7.2", + "futures 0.1.30", ] [[package]] @@ -8881,7 +9002,7 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "297a1206e0ca6302a0eed35b700d292b275256f596e2f3fea7729d5e629b6ff4" dependencies = [ - "futures 0.1.29", + "futures 0.1.30", "tokio-io", "tokio-threadpool", ] @@ -8893,7 +9014,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57fc868aae093479e3131e3d165c93b1c7474109d13c90ec0dda2a1bbfff0674" dependencies = [ "bytes 0.4.12", - "futures 0.1.29", + "futures 0.1.30", "log 0.4.11", ] @@ -8903,9 +9024,9 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0c3acc6aa564495a0f2e1d59fab677cd7f81a19994cfc7f3ad0e64301560389" dependencies = [ - "proc-macro2 1.0.23", + "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.42", + "syn 1.0.48", ] [[package]] @@ -8915,7 +9036,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d282d483052288b2308ba5ee795f5673b159c9bdf63c385a05609da782a5eae" dependencies = [ "bytes 0.4.12", - "futures 0.1.29", + "futures 0.1.30", "mio", "mio-named-pipes", "tokio 0.1.22", @@ -8927,8 +9048,8 @@ version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09bc590ec4ba8ba87652da2068d150dcada2cfa2e07faae270a5e0409aa51351" dependencies = [ - "crossbeam-utils", - "futures 0.1.29", + "crossbeam-utils 0.7.2", + "futures 0.1.30", "lazy_static", "log 0.4.11", "mio", @@ -8958,7 +9079,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24da22d077e0f15f55162bdbdc661228c1581892f52074fb242678d015b45162" dependencies = [ - "futures 0.1.29", + "futures 0.1.30", ] [[package]] @@ -8968,7 +9089,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "edfe50152bc8164fcc456dab7891fa9bf8beaf01c5ee7e1dd43a397c3cf87dee" dependencies = [ "fnv", - "futures 0.1.29", + "futures 0.1.30", ] [[package]] @@ -8989,7 +9110,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98df18ed66e3b72e742f185882a9e201892407957e45fbff8da17ae7a7c51f72" dependencies = [ "bytes 0.4.12", - "futures 0.1.29", + "futures 0.1.30", "iovec", "mio", "tokio-io", @@ -9002,10 +9123,10 @@ version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df720b6581784c118f0eb4310796b12b1d242a7eb95f716a8367855325c25f89" dependencies = [ - "crossbeam-deque", + "crossbeam-deque 0.7.3", "crossbeam-queue", - "crossbeam-utils", - "futures 0.1.29", + "crossbeam-utils 0.7.2", + "futures 0.1.30", "lazy_static", "log 0.4.11", "num_cpus", @@ -9019,8 +9140,8 @@ version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93044f2d313c95ff1cb7809ce9a7a05735b012288a888b62d4434fd58c94f296" dependencies = [ - "crossbeam-utils", - "futures 0.1.29", + "crossbeam-utils 0.7.2", + "futures 0.1.30", "slab", "tokio-executor 0.1.10", ] @@ -9032,7 +9153,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2a0b10e610b39c38b031a2fcab08e4b82f16ece36504988dcbd81dbba650d82" dependencies = [ "bytes 0.4.12", - "futures 0.1.29", + "futures 0.1.30", "log 0.4.11", "mio", "tokio-codec", @@ -9047,7 +9168,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab57a4ac4111c8c9dbcf70779f6fc8bc35ae4b2454809febac840ad19bd7e4e0" dependencies = [ "bytes 0.4.12", - "futures 0.1.29", + "futures 0.1.30", "iovec", "libc", "log 0.4.11", @@ -9074,9 +9195,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a" +checksum = "75cf45bb0bef80604d001caaec0d09da99611b3c0fd39d3080468875cdb65645" dependencies = [ "serde", ] @@ -9089,12 +9210,13 @@ checksum = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860" [[package]] name = "tracing" -version = "0.1.19" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d79ca061b032d6ce30c660fded31189ca0b9922bf483cd70759f13a2d86786c" +checksum = "b0987850db3733619253fe60e17cb59b82d37c7e6c0236bb81e4d6b87c879f27" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "log 0.4.11", + "pin-project-lite", "tracing-attributes", "tracing-core", ] @@ -9105,20 +9227,30 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "80e0ccfc3378da0cce270c946b676a376943f5cd16aeba64568e7939806f4ada" dependencies = [ - "proc-macro2 1.0.23", + "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.42", + "syn 1.0.48", ] [[package]] name = "tracing-core" -version = "0.1.16" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bcf46c1f1f06aeea2d6b81f3c863d0930a596c86ad1920d4e5bad6dd1d7119a" +checksum = "f50de3927f93d202783f4513cda820ab47ef17f624b03c096e86ef00c67e6b5f" dependencies = [ "lazy_static", ] +[[package]] +name = "tracing-futures" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab7bb6f14721aa00656086e9335d363c5c8747bae02ebe32ea2c7dece5689b4c" +dependencies = [ + "pin-project 0.4.27", + "tracing", +] + [[package]] name = "treeline" version = "0.1.0" @@ -9156,6 +9288,16 @@ dependencies = [ "hash-db", ] +[[package]] +name = "triehash" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f490aa7aa4e4d07edeba442c007e42e3e7f43aafb5112c5b047fff0b1aa5449c" +dependencies = [ + "hash-db", + "rlp", +] + [[package]] name = "try-lock" version = "0.2.3" @@ -9164,11 +9306,13 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "twox-hash" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bfd5b7557925ce778ff9b9ef90e3ade34c524b5ff10e239c69a42d546d2af56" +checksum = "04f8ab788026715fa63b31960869617cba39117e520eb415b0139543e325ab59" dependencies = [ + "cfg-if 0.1.10", "rand 0.7.3", + "static_assertions", ] [[package]] @@ -9293,10 +9437,11 @@ dependencies = [ [[package]] name = "url" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "829d4a8476c35c9bf0bbce5a3b23f4106f79728039b726d292bb93bc106787cb" +checksum = "5909f2b0817350449ed73e8bcd81c8c3c8d9a7a5d8acba4b27db277f1868976e" dependencies = [ + "form_urlencoded", "idna 0.2.0", "matches", "percent-encoding 2.1.0", @@ -9353,7 +9498,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6395efa4784b027708f7451087e647ec73cc74f5d9bc2e418404248d679a230" dependencies = [ - "futures 0.1.29", + "futures 0.1.30", "log 0.4.11", "try-lock", ] @@ -9386,7 +9531,7 @@ version = "0.2.68" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ac64ead5ea5f05873d7c12b545865ca2b8d28adfc50a49b84770a3a97265d42" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "wasm-bindgen-macro", ] @@ -9399,9 +9544,9 @@ dependencies = [ "bumpalo", "lazy_static", "log 0.4.11", - "proc-macro2 1.0.23", + "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.42", + "syn 1.0.48", "wasm-bindgen-shared", ] @@ -9411,7 +9556,7 @@ version = "0.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b7866cab0aa01de1edf8b5d7936938a7e397ee50ce24119aef3e1eaa3b6171da" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "js-sys", "wasm-bindgen", "web-sys", @@ -9433,9 +9578,9 @@ version = "0.2.68" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f249f06ef7ee334cc3b8ff031bfc11ec99d00f34d86da7498396dc1e3b1498fe" dependencies = [ - "proc-macro2 1.0.23", + "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.42", + "syn 1.0.48", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -9452,7 +9597,7 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f" dependencies = [ - "futures 0.3.5", + "futures 0.3.7", "js-sys", "parking_lot 0.11.0", "pin-utils", @@ -9470,7 +9615,7 @@ dependencies = [ "libc", "memory_units", "num-rational", - "num-traits 0.2.12", + "num-traits 0.2.14", "parity-wasm", "wasmi-validation", ] @@ -9521,7 +9666,7 @@ dependencies = [ "anyhow", "base64", "bincode", - "cfg-if", + "cfg-if 0.1.10", "cranelift-codegen", "cranelift-entity", "cranelift-frontend", @@ -9550,7 +9695,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e914c013c7a9f15f4e429d5431f2830fb8adb56e40567661b69c5ec1d645be23" dependencies = [ "anyhow", - "cfg-if", + "cfg-if 0.1.10", "cranelift-codegen", "cranelift-entity", "cranelift-frontend", @@ -9593,7 +9738,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e8d4d1af8dd5f7096cfcc89dd668d358e52980c38cce199643372ffd6590e27" dependencies = [ "anyhow", - "cfg-if", + "cfg-if 0.1.10", "gimli 0.21.0", "lazy_static", "libc", @@ -9613,7 +9758,7 @@ checksum = "3a25f140bbbaadb07c531cba99ce1a966dba216138dc1b2a0ddecec851a01a93" dependencies = [ "backtrace", "cc", - "cfg-if", + "cfg-if 0.1.10", "indexmap", "lazy_static", "libc", @@ -9628,18 +9773,18 @@ dependencies = [ [[package]] name = "wast" -version = "24.0.0" +version = "27.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff1e3bd3ad0b2ee7784add89c30dc96b89a54b43e5d6d95d774eda1863b3500" +checksum = "c2c3ef5f6a72dffa44c24d5811123f704e18a1dbc83637d347b1852b41d3835c" dependencies = [ "leb128", ] [[package]] name = "wat" -version = "1.0.25" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7c0bb2872ae453f98cec6ff1bf1a71cde1da6041fce8b0ac39d51eb033e9ec0" +checksum = "835cf59c907f67e2bbc20f50157e08f35006fe2a8444d8ec9f5683e22f937045" dependencies = [ "wast", ] @@ -9684,9 +9829,9 @@ dependencies = [ [[package]] name = "wepoll-sys" -version = "3.0.0" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "142bc2cba3fe88be1a8fcb55c727fa4cd5b0cf2d7438722792e22f26f04bc1e0" +checksum = "0fcb14dea929042224824779fbc82d9fab8d2e6d3cbc0ac404de8edf489e77ff" dependencies = [ "cc", ] @@ -9827,7 +9972,7 @@ dependencies = [ "rand 0.7.3", "sha-1 0.8.2", "slab", - "url 2.1.1", + "url 2.2.0", ] [[package]] @@ -9851,13 +9996,24 @@ dependencies = [ "zeroize", ] +[[package]] +name = "x25519-dalek" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc614d95359fd7afc321b66d2107ede58b246b844cf5d8a0adcca413e439f088" +dependencies = [ + "curve25519-dalek 3.0.0", + "rand_core 0.5.1", + "zeroize", +] + [[package]] name = "yamux" version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "053585b18bca1a3d00e4b5ef93e72d4f49a10005374c455db7177e27149c899d" dependencies = [ - "futures 0.3.5", + "futures 0.3.7", "log 0.4.11", "nohash-hasher", "parking_lot 0.10.2", @@ -9880,9 +10036,9 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3f369ddb18862aba61aa49bf31e74d29f0f162dec753063200e1dc084345d16" dependencies = [ - "proc-macro2 1.0.23", + "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.42", + "syn 1.0.48", "synstructure", ] diff --git a/node/parachain/Cargo.toml b/node/parachain/Cargo.toml index 40e7fe7022..77dd22629a 100644 --- a/node/parachain/Cargo.toml +++ b/node/parachain/Cargo.toml @@ -23,8 +23,8 @@ codec = { package = 'parity-scale-codec', version = '1.0.0' } structopt = "0.3.3" ansi_term = "0.12.1" serde = { version = "1.0.101", features = ["derive"] } -jsonrpc-core = "14.0.3" -jsonrpc-pubsub = "14.0.3" +jsonrpc-core = "14.2.0" +jsonrpc-pubsub = "14.2.0" # Parachain dependencies moonbeam-runtime = { path = "../../runtime" } @@ -44,7 +44,6 @@ sc-executor = { git = "https://github.com/paritytech/substrate", branch = "rococ sc-service = { git = "https://github.com/paritytech/substrate", branch = "rococo-branch" } sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "rococo-branch" } sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "rococo-branch" } -sc-transaction-graph = { git = "https://github.com/paritytech/substrate", branch = "rococo-branch" } sc-network = { git = "https://github.com/paritytech/substrate", branch = "rococo-branch" } sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "rococo-branch", version = "0.8.0-rc5" } sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "rococo-branch" } @@ -60,13 +59,13 @@ substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "rococo-branch" } sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "rococo-branch" } sc-consensus-manual-seal = { git = "https://github.com/paritytech/substrate", branch = "rococo-branch" } -evm = { package = "pallet-evm", git = "https://github.com/purestake/substrate", branch = "tgmichel-rococo-branch" } +evm = { package = "pallet-evm", git = "https://github.com/purestake/substrate", branch = "v0.3-hotfixes" } -ethereum = { version = "0.1.0", package = "pallet-ethereum", git = "https://github.com/purestake/frontier", branch = "v0.2-hotfixes" } +ethereum = { version = "0.1.0", package = "pallet-ethereum", git = "https://github.com/purestake/frontier", branch = "v0.3-hotfixes" } -frontier-rpc = { version = "0.1.0", git = "https://github.com/purestake/frontier", branch = "v0.2-hotfixes" } -frontier-rpc-primitives = { version = "0.1.0", git = "https://github.com/purestake/frontier", branch = "v0.2-hotfixes" } -frontier-consensus = { version = "0.1.0", git = "https://github.com/purestake/frontier", branch = "v0.2-hotfixes" } +frontier-rpc = { version = "0.1.0", git = "https://github.com/purestake/frontier", branch = "v0.3-hotfixes" } +frontier-rpc-primitives = { version = "0.1.0", git = "https://github.com/purestake/frontier", branch = "v0.3-hotfixes" } +frontier-consensus = { version = "0.1.0", git = "https://github.com/purestake/frontier", branch = "v0.3-hotfixes" } # Cumulus dependencies cumulus-consensus = { git = "https://github.com/paritytech/cumulus", rev = '8a445a425086fc927f946a72b245e829fba200d0' } diff --git a/node/standalone/Cargo.lock b/node/standalone/Cargo.lock index ef44837dd7..e137d5438a 100644 --- a/node/standalone/Cargo.lock +++ b/node/standalone/Cargo.lock @@ -12,11 +12,11 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b6a2d3371669ab3ca9797670853d61402b03d0b4b9ebf33d677dfa720203072" +checksum = "7c0929d69e78dd9bf5408269919fcbcaeb2e35e5d43e5815517cdc6a8e11a423" dependencies = [ - "gimli 0.22.0", + "gimli 0.23.0", ] [[package]] @@ -102,9 +102,9 @@ checksum = "e8fd72866655d1904d6b0997d0b07ba561047d070fbe29de039031c641b61217" [[package]] name = "aho-corasick" -version = "0.7.14" +version = "0.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b476ce7103678b0c6d3d395dbbae31d48ff910bd28be979ba5d48c6351131d0d" +checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5" dependencies = [ "memchr", ] @@ -117,7 +117,7 @@ checksum = "4f823d037a7ec6ea2197046bafd4ae150e6bc36f9ca347404f46a46823fa84f2" dependencies = [ "approx", "num-complex", - "num-traits 0.2.12", + "num-traits 0.2.14", ] [[package]] @@ -140,9 +140,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.33" +version = "1.0.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1fd36ffbb1fb7c834eac128ea8d0e310c5aeb635548f9d58861e1308d46e71c" +checksum = "bf8dcb5b4bbaa28653b647d8c77bd4ed40183b48882e130c1f1ffb73de069fd7" [[package]] name = "approx" @@ -150,7 +150,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0e60b75072ecd4168020818c0107f2857bb6c4e64252d8d3983f6263b40a5c3" dependencies = [ - "num-traits 0.2.12", + "num-traits 0.2.14", ] [[package]] @@ -176,9 +176,9 @@ dependencies = [ [[package]] name = "arrayvec" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" +checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" [[package]] name = "asn1_der" @@ -196,7 +196,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d0864d84b8e07b145449be9a8537db86bf9de5ce03b913214694643b4743502" dependencies = [ "quote 1.0.7", - "syn 1.0.45", + "syn 1.0.48", ] [[package]] @@ -232,9 +232,9 @@ dependencies = [ [[package]] name = "async-global-executor" -version = "1.4.2" +version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "124ac8c265e407641c3362b8f4d39cdb4e243885b71eef087be27199790f5a3a" +checksum = "73079b49cd26b8fd5a15f68fc7707fc78698dc2a3d61430f2a7a9430230dfa04" dependencies = [ "async-executor", "async-io", @@ -245,9 +245,9 @@ dependencies = [ [[package]] name = "async-io" -version = "1.1.10" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54bc4c1c7292475efb2253227dbcfad8fe1ca4c02bc62c510cc2f3da5c4704e" +checksum = "40a0b2bb8ae20fede194e779150fe283f65a4a08461b496de546ec366b174ad9" dependencies = [ "concurrent-queue", "fastrand", @@ -274,15 +274,15 @@ dependencies = [ [[package]] name = "async-std" -version = "1.6.5" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9fa76751505e8df1c7a77762f60486f60c71bbd9b8557f4da6ad47d083732ed" +checksum = "a7e82538bc65a25dbdff70e4c5439d52f068048ab97cdea0acd73f131594caa1" dependencies = [ "async-global-executor", "async-io", "async-mutex", "blocking", - "crossbeam-utils", + "crossbeam-utils 0.8.0", "futures-channel", "futures-core", "futures-io", @@ -311,7 +311,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df097e3f506bec0e1a24f06bb3c962c228f36671de841ff579cb99f371772634" dependencies = [ - "futures 0.3.6", + "futures 0.3.7", "rustls", "webpki", "webpki-roots 0.19.0", @@ -348,15 +348,15 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" [[package]] name = "backtrace" -version = "0.3.53" +version = "0.3.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "707b586e0e2f247cbde68cdd2c3ce69ea7b7be43e1c5b426e37c9319c4b9838e" +checksum = "2baad346b2d4e94a24347adeee9c7a93f412ee94b9cc26e5b59dea23848e9f28" dependencies = [ "addr2line", "cfg-if 1.0.0", "libc", "miniz_oxide", - "object 0.21.1", + "object 0.22.0", "rustc-demangle", ] @@ -430,15 +430,13 @@ dependencies = [ [[package]] name = "blake2" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84ce5b6108f8e154604bd4eb76a2f726066c3464d5a552a4229262a18c9bb471" +checksum = "10a5720225ef5daecf08657f23791354e1685a8c91a4c60c7f3d3b2892f978f4" dependencies = [ - "byte-tools", - "byteorder", "crypto-mac 0.8.0", "digest 0.9.0", - "opaque-debug 0.2.3", + "opaque-debug 0.3.0", ] [[package]] @@ -453,23 +451,23 @@ dependencies = [ [[package]] name = "blake2b_simd" -version = "0.5.10" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a" +checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587" dependencies = [ "arrayref", - "arrayvec 0.5.1", + "arrayvec 0.5.2", "constant_time_eq", ] [[package]] name = "blake2s_simd" -version = "0.5.10" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab9e07352b829279624ceb7c64adb4f585dacdb81d35cafae81139ccd617cf44" +checksum = "9e461a7034e85b211a4acb57ee2e6730b32912b06c08cc242243c39fc21ae6a2" dependencies = [ "arrayref", - "arrayvec 0.5.1", + "arrayvec 0.5.2", "constant_time_eq", ] @@ -539,6 +537,12 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "476e9cd489f9e121e02ffa6014a8ef220ecb15c05ed23fc34cca13925dc283fb" +[[package]] +name = "bs58" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" + [[package]] name = "bstr" version = "0.2.14" @@ -603,9 +607,9 @@ checksum = "631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba" [[package]] name = "cc" -version = "1.0.61" +version = "1.0.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed67cbde08356238e75fc4656be4749481eeffb09e19f320a25237d5221c985d" +checksum = "f1770ced377336a88a67c473594ccc14eca6f4559217c34f64aac8f83d641b40" dependencies = [ "jobserver", ] @@ -662,7 +666,7 @@ checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" dependencies = [ "libc", "num-integer", - "num-traits 0.2.12", + "num-traits 0.2.14", "time", "winapi 0.3.9", ] @@ -740,6 +744,12 @@ dependencies = [ "proc-macro-hack", ] +[[package]] +name = "const_fn" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c478836e029dcef17fb47c89023448c64f781a046e0300e257ad8225ae59afab" + [[package]] name = "constant_time_eq" version = "0.1.5" @@ -862,21 +872,21 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1" +checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", ] [[package]] name = "crossbeam-channel" -version = "0.4.4" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87" +checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775" dependencies = [ - "crossbeam-utils", - "maybe-uninit", + "cfg-if 1.0.0", + "crossbeam-utils 0.8.0", ] [[package]] @@ -885,11 +895,22 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285" dependencies = [ - "crossbeam-epoch", - "crossbeam-utils", + "crossbeam-epoch 0.8.2", + "crossbeam-utils 0.7.2", "maybe-uninit", ] +[[package]] +name = "crossbeam-deque" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-epoch 0.9.0", + "crossbeam-utils 0.8.0", +] + [[package]] name = "crossbeam-epoch" version = "0.8.2" @@ -898,13 +919,27 @@ checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" dependencies = [ "autocfg 1.0.1", "cfg-if 0.1.10", - "crossbeam-utils", + "crossbeam-utils 0.7.2", "lazy_static", "maybe-uninit", "memoffset", "scopeguard", ] +[[package]] +name = "crossbeam-epoch" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0f606a85340376eef0d6d8fec399e6d4a544d648386c6645eb6d0653b27d9f" +dependencies = [ + "cfg-if 1.0.0", + "const_fn", + "crossbeam-utils 0.8.0", + "lazy_static", + "memoffset", + "scopeguard", +] + [[package]] name = "crossbeam-queue" version = "0.2.3" @@ -912,7 +947,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570" dependencies = [ "cfg-if 0.1.10", - "crossbeam-utils", + "crossbeam-utils 0.7.2", "maybe-uninit", ] @@ -927,6 +962,18 @@ dependencies = [ "lazy_static", ] +[[package]] +name = "crossbeam-utils" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec91540d98355f690a86367e566ecad2e9e579f230230eb7c21398372be73ea5" +dependencies = [ + "autocfg 1.0.1", + "cfg-if 1.0.0", + "const_fn", + "lazy_static", +] + [[package]] name = "crunchy" version = "0.2.2" @@ -1087,9 +1134,9 @@ dependencies = [ [[package]] name = "data-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4d0e2d24e5ee3b23a01de38eefdcd978907890701f08ffffd4cb457ca4ee8d6" +checksum = "993a608597367c6377b258c25d7120740f00ed23a2252b729b1932dd7866f908" [[package]] name = "derive_more" @@ -1099,7 +1146,7 @@ checksum = "41cb0e6161ad61ed084a36ba71fbba9e3ac5aee3606fb607fe08da6acbcf3d8c" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.45", + "syn 1.0.48", ] [[package]] @@ -1175,14 +1222,14 @@ checksum = "558e40ea573c374cf53507fd240b7ee2f5477df7cfebdb97323ec61c719399c5" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.45", + "syn 1.0.48", ] [[package]] name = "dyn-clone" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c53dc3a653e0f64081026e4bf048d48fec9fce90c66e8326ca7292df0ff2d82" +checksum = "d55796afa1b20c2945ca8eabfc421839f2b766619209f1ede813cf2484f31804" [[package]] name = "ed25519" @@ -1203,7 +1250,7 @@ dependencies = [ "ed25519", "rand 0.7.3", "serde", - "sha2 0.9.1", + "sha2 0.9.2", "zeroize", ] @@ -1250,7 +1297,7 @@ checksum = "946ee94e3dbf58fdd324f9ce245c7b238d46a66f00e86a020b71996349e46cce" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.45", + "syn 1.0.48", ] [[package]] @@ -1283,9 +1330,9 @@ dependencies = [ [[package]] name = "errno" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6eab5ee3df98a279d9b316b1af6ac95422127b1290317e6d18c1743c99418b01" +checksum = "fa68f2fb9cae9d37c9b2b3584aba698a2e97f72d7aef7b9f7aa71d8b54ce46fe" dependencies = [ "errno-dragonfly", "libc", @@ -1318,29 +1365,19 @@ dependencies = [ [[package]] name = "ethereum" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da7fef4d2da1de3a4f4f85408379644276db9b46c4af7b0fe38a3debec5cb7cd" -dependencies = [ - "ethereum-types", - "parity-scale-codec", - "rlp", - "rlp-derive", - "sha3 0.8.2", -] - -[[package]] -name = "ethereum" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7538b2bb55bde83b500c4e6ea0bdb3b1c0e9e5ae57951941e5412db32c2a8344" +checksum = "df706418ff7d3874b9506424b04ea0bef569a2b39412b43a27ea86e679be108e" dependencies = [ "ethereum-types", + "hash-db", + "hash256-std-hasher", "parity-scale-codec", "rlp", "rlp-derive", "serde", "sha3 0.9.1", + "triehash", ] [[package]] @@ -1366,11 +1403,11 @@ checksum = "f7531096570974c3a9dcf9e4b8e1cede1ec26cf5046219fb3b9d897503b9be59" [[package]] name = "evm" -version = "0.17.3" +version = "0.18.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16c8deca0ec3efa361b03d9cae6fe94321a1d2d0a523437edd720b3d140e3c08" +checksum = "f1fc70736bd5ec89622647ea9346b70567557917596a39538d76e8f2a17ff59e" dependencies = [ - "ethereum 0.4.1", + "ethereum", "evm-core", "evm-gasometer", "evm-runtime", @@ -1384,19 +1421,20 @@ dependencies = [ [[package]] name = "evm-core" -version = "0.17.2" +version = "0.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf2d732b3c36df36833761cf67df8f65866be1d368d20508bc3e13e6f256c8c5" +checksum = "63c6c39300d7779427f461408d867426e202ea72ac7ece2455689ff0e4bddb6f" dependencies = [ - "log 0.4.11", + "parity-scale-codec", "primitive-types", + "serde", ] [[package]] name = "evm-gasometer" -version = "0.17.2" +version = "0.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46de1b91ccd744627484183729f1b5af484b3bf15505007fc28cc54264cb9ea1" +checksum = "689c481648c3f45b64b1278077c04284ad535e068c9d6872153c7b74da7ccb03" dependencies = [ "evm-core", "evm-runtime", @@ -1405,9 +1443,9 @@ dependencies = [ [[package]] name = "evm-runtime" -version = "0.17.2" +version = "0.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2c1d1ffe96f833788512c890d702457d790dba4917ac6f64f8f60fbd9bc40b8" +checksum = "61a148ad1b3e0af31aa03c6c3cc9df3a529e279dad8e29b4ef90dccad32601e4" dependencies = [ "evm-core", "primitive-types", @@ -1420,7 +1458,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e43f2f1833d64e33f15592464d6fdd70f349dda7b1a53088eb83cd94014008c5" dependencies = [ - "futures 0.3.6", + "futures 0.3.7", ] [[package]] @@ -1441,7 +1479,7 @@ checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.45", + "syn 1.0.48", "synstructure", ] @@ -1492,10 +1530,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8feb87a63249689640ac9c011742c33139204e3c134293d3054022276869133b" dependencies = [ "either", - "futures 0.3.6", + "futures 0.3.7", "futures-timer 2.0.2", "log 0.4.11", - "num-traits 0.2.12", + "num-traits 0.2.14", "parity-scale-codec", "parking_lot 0.9.0", ] @@ -1520,11 +1558,11 @@ checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d" [[package]] name = "flate2" -version = "1.0.18" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da80be589a72651dcda34d8b35bcdc9b7254ad06325611074d9cc0fbb19f60ee" +checksum = "7411863d55df97a419aa64cb4d2f167103ea9d767e2c54a1868b7ac3f6b47129" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "crc32fast", "libc", "libz-sys", @@ -1545,6 +1583,16 @@ dependencies = [ "parity-scale-codec", ] +[[package]] +name = "form_urlencoded" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ece68d15c92e84fa4f19d3780f1294e5ca82a78a6d515f1efaabcc144688be00" +dependencies = [ + "matches", + "percent-encoding 2.1.0", +] + [[package]] name = "frame-benchmarking" version = "2.0.0-rc5" @@ -1621,7 +1669,7 @@ dependencies = [ "frame-support-procedural-tools", "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.45", + "syn 1.0.48", ] [[package]] @@ -1633,7 +1681,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.45", + "syn 1.0.48", ] [[package]] @@ -1643,7 +1691,7 @@ source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#8 dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.45", + "syn 1.0.48", ] [[package]] @@ -1674,13 +1722,12 @@ dependencies = [ [[package]] name = "frontier-consensus" version = "0.1.0" -source = "git+https://github.com/purestake/frontier?branch=v0.2-hotfixes#adb97b1d03209b2e3a357ec75a8207473a4934c3" +source = "git+https://github.com/purestake/frontier?branch=v0.3-hotfixes#5b8a2b3af8fffcd8c5a50429dc569987d3279899" dependencies = [ "derive_more", - "ethereum 0.3.3", + "ethereum", "frontier-consensus-primitives", - "frontier-rpc-primitives", - "futures 0.3.6", + "futures 0.3.7", "log 0.4.11", "parity-scale-codec", "sc-client-api", @@ -1690,7 +1737,6 @@ dependencies = [ "sp-consensus", "sp-core", "sp-inherents", - "sp-io", "sp-runtime", "sp-timestamp", "substrate-prometheus-endpoint", @@ -1699,7 +1745,7 @@ dependencies = [ [[package]] name = "frontier-consensus-primitives" version = "0.1.0" -source = "git+https://github.com/purestake/frontier?branch=v0.2-hotfixes#adb97b1d03209b2e3a357ec75a8207473a4934c3" +source = "git+https://github.com/purestake/frontier?branch=v0.3-hotfixes#5b8a2b3af8fffcd8c5a50429dc569987d3279899" dependencies = [ "parity-scale-codec", "sp-core", @@ -1710,27 +1756,28 @@ dependencies = [ [[package]] name = "frontier-rpc" version = "0.1.0" -source = "git+https://github.com/purestake/frontier?branch=v0.2-hotfixes#adb97b1d03209b2e3a357ec75a8207473a4934c3" +source = "git+https://github.com/purestake/frontier?branch=v0.3-hotfixes#5b8a2b3af8fffcd8c5a50429dc569987d3279899" dependencies = [ - "ethereum 0.3.3", + "ethereum", "ethereum-types", "frontier-consensus", "frontier-rpc-core", "frontier-rpc-primitives", - "futures 0.3.6", + "futures 0.3.7", "jsonrpc-core", "jsonrpc-core-client", "jsonrpc-derive", "jsonrpc-pubsub", "log 0.4.11", - "pallet-ethereum 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "pallet-ethereum", + "pallet-evm", "parity-scale-codec", "rlp", + "rustc-hex", "sc-client-api", "sc-network", "sc-rpc", "sc-service", - "sc-transaction-graph", "sha3 0.8.2", "sp-api", "sp-blockchain", @@ -1743,7 +1790,7 @@ dependencies = [ [[package]] name = "frontier-rpc-core" version = "0.1.0" -source = "git+https://github.com/purestake/frontier?branch=v0.2-hotfixes#adb97b1d03209b2e3a357ec75a8207473a4934c3" +source = "git+https://github.com/purestake/frontier?branch=v0.3-hotfixes#5b8a2b3af8fffcd8c5a50429dc569987d3279899" dependencies = [ "ethereum-types", "jsonrpc-core", @@ -1758,14 +1805,14 @@ dependencies = [ [[package]] name = "frontier-rpc-primitives" version = "0.1.0" -source = "git+https://github.com/purestake/frontier?branch=v0.2-hotfixes#adb97b1d03209b2e3a357ec75a8207473a4934c3" +source = "git+https://github.com/purestake/frontier?branch=v0.3-hotfixes#5b8a2b3af8fffcd8c5a50429dc569987d3279899" dependencies = [ - "ethereum 0.3.3", + "ethereum", "ethereum-types", - "pallet-evm", "parity-scale-codec", "sp-api", "sp-core", + "sp-evm", "sp-runtime", "sp-std", ] @@ -1812,9 +1859,9 @@ checksum = "4c7e4c2612746b0df8fed4ce0c69156021b704c9aefa360311c04e6e9e002eed" [[package]] name = "futures" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d8e3078b7b2a8a671cb7a3d17b4760e4181ea243227776ba83fd043b4ca034e" +checksum = "95314d38584ffbfda215621d723e0a3906f032e03ae5551e650058dac83d4797" dependencies = [ "futures-channel", "futures-core", @@ -1827,9 +1874,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a4d35f7401e948629c9c3d6638fb9bf94e0b2121e96c3b428cc4e631f3eb74" +checksum = "0448174b01148032eed37ac4aed28963aaaa8cfa93569a08e5b479bbc6c2c151" dependencies = [ "futures-core", "futures-sink", @@ -1846,9 +1893,9 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d674eaa0056896d5ada519900dbf97ead2e46a7b6621e8160d79e2f2e1e2784b" +checksum = "18eaa56102984bed2c88ea39026cff3ce3b4c7f508ca970cedf2450ea10d4e46" [[package]] name = "futures-core-preview" @@ -1873,7 +1920,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fdcef58a173af8148b182684c9f2d5250875adbcaff7b5794073894f9d8634a9" dependencies = [ "futures 0.1.30", - "futures 0.3.6", + "futures 0.3.7", "lazy_static", "log 0.4.11", "parking_lot 0.9.0", @@ -1884,9 +1931,9 @@ dependencies = [ [[package]] name = "futures-executor" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc709ca1da6f66143b8c9bec8e6260181869893714e9b5a490b169b0414144ab" +checksum = "f5f8e0c9258abaea85e78ebdda17ef9666d390e987f006be6080dfe354b708cb" dependencies = [ "futures-core", "futures-task", @@ -1896,15 +1943,15 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fc94b64bb39543b4e432f1790b6bf18e3ee3b74653c5449f63310e9a74b123c" +checksum = "6e1798854a4727ff944a7b12aa999f58ce7aa81db80d2dfaaf2ba06f065ddd2b" [[package]] name = "futures-lite" -version = "1.11.1" +version = "1.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "381a7ad57b1bad34693f63f6f377e1abded7a9c85c9d3eb6771e11c60aaadab9" +checksum = "5e6c079abfac3ab269e2927ec048dabc89d009ebfdda6b8ee86624f30c689658" dependencies = [ "fastrand", "futures-core", @@ -1917,27 +1964,27 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f57ed14da4603b2554682e9f2ff3c65d7567b53188db96cb71538217fc64581b" +checksum = "e36fccf3fc58563b4a14d265027c627c3b665d7fed489427e88e7cc929559efe" dependencies = [ "proc-macro-hack", "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.45", + "syn 1.0.48", ] [[package]] name = "futures-sink" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d8764258ed64ebc5d9ed185cf86a95db5cac810269c5d20ececb32e0088abbd" +checksum = "0e3ca3f17d6e8804ae5d3df7a7d35b2b3a6fe89dac84b31872720fc3060a0b11" [[package]] name = "futures-task" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dd26820a9f3637f1302da8bceba3ff33adbe53464b54ca24d4e2d4f1db30f94" +checksum = "96d502af37186c4fef99453df03e374683f8a1eec9dcc1e66b3b82dc8278ce3c" dependencies = [ "once_cell", ] @@ -1956,9 +2003,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" [[package]] name = "futures-util" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a894a0acddba51a2d49a6f4263b1e64b8c579ece8af50fa86503d52cd1eea34" +checksum = "abcb44342f62e6f3e8ac427b8aa815f724fd705dfad060b18ac7866c15bb8e34" dependencies = [ "futures 0.1.30", "futures-channel", @@ -1968,7 +2015,7 @@ dependencies = [ "futures-sink", "futures-task", "memchr", - "pin-project 0.4.27", + "pin-project 1.0.1", "pin-utils", "proc-macro-hack", "proc-macro-nested", @@ -1994,7 +2041,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce54d63f8b0c75023ed920d46fd71d0cbbb830b0ee012726b5b4f506fb6dea5b" dependencies = [ "bytes 0.5.6", - "futures 0.3.6", + "futures 0.3.7", "memchr", "pin-project 0.4.27", ] @@ -2090,9 +2137,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaf91faf136cb47367fa430cd46e37a788775e7fa104f8b4bcb3861dc389b724" +checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce" [[package]] name = "glob" @@ -2102,9 +2149,9 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" [[package]] name = "globset" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ad1da430bd7281dde2576f44c84cc3f0f7b475e7202cd503042dff01a8c8120" +checksum = "c152169ef1e421390738366d2f796655fec62621dabbd0fd476f905934061e4a" dependencies = [ "aho-corasick", "bstr", @@ -2146,9 +2193,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "993f9e0baeed60001cf565546b0d3dbe6a6ad23f2bd31644a133c641eccf6d53" +checksum = "5e4728fd124914ad25e99e3d15a9361a879f6620f63cb56bbb08f95abb97a535" dependencies = [ "bytes 0.5.6", "fnv", @@ -2161,6 +2208,7 @@ dependencies = [ "tokio 0.2.22", "tokio-util", "tracing", + "tracing-futures", ] [[package]] @@ -2371,21 +2419,21 @@ dependencies = [ [[package]] name = "hyper" -version = "0.13.8" +version = "0.13.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f3afcfae8af5ad0576a31e768415edb627824129e8e5a29b8bfccb2f234e835" +checksum = "f6ad767baac13b44d4529fcf58ba2cd0995e36e7b435bc5b039de6f47e880dbf" dependencies = [ "bytes 0.5.6", "futures-channel", "futures-core", "futures-util", - "h2 0.2.6", + "h2 0.2.7", "http 0.2.1", "http-body 0.3.1", "httparse", "httpdate", "itoa", - "pin-project 0.4.27", + "pin-project 1.0.1", "socket2", "tokio 0.2.22", "tower-service", @@ -2402,7 +2450,7 @@ dependencies = [ "bytes 0.5.6", "ct-logs", "futures-util", - "hyper 0.13.8", + "hyper 0.13.9", "log 0.4.11", "rustls", "rustls-native-certs", @@ -2477,7 +2525,7 @@ checksum = "7ef5550a42e3740a0e71f909d4c861056a284060af885ae7aa6242820f920d9d" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.45", + "syn 1.0.48", ] [[package]] @@ -2493,11 +2541,11 @@ dependencies = [ [[package]] name = "instant" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63312a18f7ea8760cdd0a7c5aac1a619752a246b833545e3e36d1f81f7cd9e66" +checksum = "cb1fc4429a33e1f80d41dc9fea4d108a88bec1de8053878898ae448a0b52f613" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", ] [[package]] @@ -2506,7 +2554,7 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "276ec31bcb4a9ee45f58bec6f9ec700ae4cf4f4f8f2fa7e06cb406bd5ffdd770" dependencies = [ - "num-traits 0.2.12", + "num-traits 0.2.14", ] [[package]] @@ -2515,7 +2563,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64fa110ec7b8f493f416eed552740d10e7030ad5f63b2308f82c9608ec2df275" dependencies = [ - "futures 0.3.6", + "futures 0.3.7", "futures-timer 2.0.2", ] @@ -2629,7 +2677,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.45", + "syn 1.0.48", ] [[package]] @@ -2854,15 +2902,15 @@ checksum = "3576a87f2ba00f6f106fdfcd16db1d698d648a26ad8e0573cad8537c3c362d2a" [[package]] name = "libc" -version = "0.2.79" +version = "0.2.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2448f6066e80e3bfc792e9c98bf705b4b0fc6e8ef5b43e5889aff0eaa9c58743" +checksum = "4d58d1b70b004888f764dfbf6a26a3b0342a1632d33968e4a179d8011c760614" [[package]] name = "libflate" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9bac9023e1db29c084f9f8cd9d3852e5e8fddf98fb47c4964a0ea4663d95949" +checksum = "389de7875e06476365974da3e7ff85d55f1972188ccd9f6020dd7c8156e17914" dependencies = [ "adler32", "crc32fast", @@ -2899,7 +2947,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0306a49ee6a89468f96089906f36b0eef82c988dcfc8acf3e2dcd6ad1c859f85" dependencies = [ "bytes 0.5.6", - "futures 0.3.6", + "futures 0.3.7", "lazy_static", "libp2p-core", "libp2p-core-derive", @@ -2930,11 +2978,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a694fd76d7c33a45a0e6e1525e9b9b5d11127c9c94e560ac0f8abba54ed80af" dependencies = [ "asn1_der", - "bs58", + "bs58 0.3.1", "ed25519-dalek", "either", "fnv", - "futures 0.3.6", + "futures 0.3.7", "futures-timer 3.0.2", "lazy_static", "libsecp256k1", @@ -2964,7 +3012,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f753d9324cd3ec14bf04b8a8cd0d269c87f294153d6bf2a84497a63a5ad22213" dependencies = [ "quote 1.0.7", - "syn 1.0.45", + "syn 1.0.48", ] [[package]] @@ -2973,7 +3021,7 @@ version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f751924b6b98e350005e0b87a822beb246792a3fb878c684e088f866158120ac" dependencies = [ - "futures 0.3.6", + "futures 0.3.7", "libp2p-core", "log 0.4.11", ] @@ -2984,7 +3032,7 @@ version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "912c00a7bf67e0e765daf0cc37e08f675ea26aba3d6d1fbfaee81f19a4c23049" dependencies = [ - "futures 0.3.6", + "futures 0.3.7", "libp2p-core", "libp2p-swarm", "log 0.4.11", @@ -3000,11 +3048,11 @@ version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44ed3a4c8111c570ab2bffb30c6353178d7603ce3787e3c5f2493c8d3d16d1f0" dependencies = [ - "arrayvec 0.5.1", + "arrayvec 0.5.2", "bytes 0.5.6", "either", "fnv", - "futures 0.3.6", + "futures 0.3.7", "futures_codec", "libp2p-core", "libp2p-swarm", @@ -3031,7 +3079,7 @@ dependencies = [ "data-encoding", "dns-parser", "either", - "futures 0.3.6", + "futures 0.3.7", "lazy_static", "libp2p-core", "libp2p-swarm", @@ -3051,7 +3099,7 @@ checksum = "14ae0ffacd30f073f96cd518b2c9cd2cb18ac27c3d136a4b23cf1af99f33e541" dependencies = [ "bytes 0.5.6", "fnv", - "futures 0.3.6", + "futures 0.3.7", "futures_codec", "libp2p-core", "log 0.4.11", @@ -3067,7 +3115,7 @@ checksum = "8f353f8966bbaaf7456535fffd3f366f153148773a0cf04b2ec3860955cb720e" dependencies = [ "bytes 0.5.6", "curve25519-dalek 2.1.0", - "futures 0.3.6", + "futures 0.3.7", "lazy_static", "libp2p-core", "log 0.4.11", @@ -3087,7 +3135,7 @@ version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70130cf130e4ba6dc177366e72dd9f86f9e3588fa1a0c4145247e676f16affad" dependencies = [ - "futures 0.3.6", + "futures 0.3.7", "libp2p-core", "libp2p-swarm", "log 0.4.11", @@ -3102,7 +3150,7 @@ version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f88d5e2a090a2aadf042cd33484e2f015c6dab212567406a59deece5dedbd133" dependencies = [ - "futures 0.3.6", + "futures 0.3.7", "libp2p-core", "log 0.4.11", "rand 0.7.3", @@ -3118,7 +3166,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b1fa2bbad054020cb875546a577a66a65a5bf42eff55ed5265f92ffee3cc052" dependencies = [ "async-std", - "futures 0.3.6", + "futures 0.3.7", "futures-timer 3.0.2", "get_if_addrs", "ipnet", @@ -3133,7 +3181,7 @@ version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0feb99e32fea20ffb1bbf56a6fb2614bff7325ff44a515728385170b3420d2c3" dependencies = [ - "futures 0.3.6", + "futures 0.3.7", "js-sys", "libp2p-core", "parity-send-wrapper", @@ -3149,14 +3197,14 @@ checksum = "046a5201f6e471f22b22b394e4d084269ed1e28cf7300f7b49874385db84c7bd" dependencies = [ "async-tls", "either", - "futures 0.3.6", + "futures 0.3.7", "libp2p-core", "log 0.4.11", "quicksink", "rustls", "rw-stream-sink", "soketto", - "url 2.1.1", + "url 2.2.0", "webpki", "webpki-roots 0.18.0", ] @@ -3167,7 +3215,7 @@ version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "46ae9bf2f7d8a4be9c7e9b61df9de9dc1bd66419d669098f22f81f8d9571029a" dependencies = [ - "futures 0.3.6", + "futures 0.3.7", "libp2p-core", "parking_lot 0.10.2", "thiserror", @@ -3316,9 +3364,9 @@ checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" [[package]] name = "memchr" -version = "2.3.3" +version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" +checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" [[package]] name = "memmap" @@ -3470,12 +3518,12 @@ dependencies = [ "frontier-consensus", "frontier-rpc", "frontier-rpc-primitives", - "futures 0.3.6", + "futures 0.3.7", "jsonrpc-core", "jsonrpc-pubsub", "log 0.4.11", "moonbeam-runtime", - "pallet-ethereum 0.1.0 (git+https://github.com/purestake/frontier?branch=v0.2-hotfixes)", + "pallet-ethereum", "pallet-evm", "pallet-transaction-payment-rpc", "sc-basic-authorship", @@ -3490,7 +3538,6 @@ dependencies = [ "sc-rpc", "sc-rpc-api", "sc-service", - "sc-transaction-graph", "sc-transaction-pool", "sp-api", "sp-block-builder", @@ -3527,7 +3574,7 @@ dependencies = [ "log 0.4.11", "pallet-aura", "pallet-balances", - "pallet-ethereum 0.1.0 (git+https://github.com/purestake/frontier?branch=v0.2-hotfixes)", + "pallet-ethereum", "pallet-evm", "pallet-grandpa", "pallet-randomness-collective-flip", @@ -3569,8 +3616,8 @@ dependencies = [ "blake2b_simd", "blake2s_simd", "digest 0.9.0", - "sha-1 0.9.1", - "sha2 0.9.1", + "sha-1 0.9.2", + "sha2 0.9.2", "sha3 0.9.1", "unsigned-varint 0.5.1", ] @@ -3583,12 +3630,12 @@ checksum = "1255076139a83bb467426e7f8d0134968a8118844faa755985e077cf31850333" [[package]] name = "multistream-select" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa0075eaaf3102b344f122e1a2e1cedf0f3d388c5fb27a0e31eb09c1151fbbd1" +checksum = "93faf2e41f9ee62fb01680ed48f3cc26652352327aa2e59869070358f6b7dd75" dependencies = [ "bytes 0.5.6", - "futures 0.3.6", + "futures 0.3.7", "log 0.4.11", "pin-project 1.0.1", "smallvec 1.4.2", @@ -3607,7 +3654,7 @@ dependencies = [ "matrixmultiply", "num-complex", "num-rational", - "num-traits 0.2.12", + "num-traits 0.2.14", "rand 0.6.5", "typenum", ] @@ -3652,7 +3699,7 @@ dependencies = [ "byteorder", "enum-primitive-derive", "libc", - "num-traits 0.2.12", + "num-traits 0.2.14", "thiserror", ] @@ -3707,9 +3754,9 @@ dependencies = [ [[package]] name = "ntapi" -version = "0.3.4" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a31937dea023539c72ddae0e3571deadc1414b300483fa7aaec176168cfa9d2" +checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44" dependencies = [ "winapi 0.3.9", ] @@ -3722,7 +3769,7 @@ checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304" dependencies = [ "autocfg 1.0.1", "num-integer", - "num-traits 0.2.12", + "num-traits 0.2.14", ] [[package]] @@ -3732,17 +3779,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95" dependencies = [ "autocfg 1.0.1", - "num-traits 0.2.12", + "num-traits 0.2.14", ] [[package]] name = "num-integer" -version = "0.1.43" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d59457e662d541ba17869cf51cf177c0b5f0cbf476c66bdc90bf1edac4f875b" +checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" dependencies = [ "autocfg 1.0.1", - "num-traits 0.2.12", + "num-traits 0.2.14", ] [[package]] @@ -3754,7 +3801,7 @@ dependencies = [ "autocfg 1.0.1", "num-bigint", "num-integer", - "num-traits 0.2.12", + "num-traits 0.2.14", ] [[package]] @@ -3763,14 +3810,14 @@ version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" dependencies = [ - "num-traits 0.2.12", + "num-traits 0.2.14", ] [[package]] name = "num-traits" -version = "0.2.12" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611" +checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" dependencies = [ "autocfg 1.0.1", "libm", @@ -3805,9 +3852,9 @@ dependencies = [ [[package]] name = "object" -version = "0.21.1" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37fd5004feb2ce328a52b0b3d01dbf4ffff72583493900ed15f22d4111c51693" +checksum = "8d3b63360ec3cb337817c2dbd47ab4a0f170d285d8e5a2064600f3def1402397" [[package]] name = "once_cell" @@ -3981,15 +4028,9 @@ dependencies = [ [[package]] name = "pallet-ethereum" version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd4556fb64842e71bb6e2f98b7541c0d310069eb607d432c6ac9bdaecbfd3118" - -[[package]] -name = "pallet-ethereum" -version = "0.1.0" -source = "git+https://github.com/purestake/frontier?branch=v0.2-hotfixes#adb97b1d03209b2e3a357ec75a8207473a4934c3" +source = "git+https://github.com/purestake/frontier?branch=v0.3-hotfixes#5b8a2b3af8fffcd8c5a50429dc569987d3279899" dependencies = [ - "ethereum 0.3.3", + "ethereum", "ethereum-types", "evm", "frame-support", @@ -4005,6 +4046,7 @@ dependencies = [ "rustc-hex", "serde", "sha3 0.8.2", + "sp-evm", "sp-io", "sp-runtime", "sp-std", @@ -4013,9 +4055,11 @@ dependencies = [ [[package]] name = "pallet-evm" version = "2.0.0-rc6" -source = "git+https://github.com/purestake/substrate?branch=tgmichel-rococo-branch#9c3a6b1d198cee2b542579752b096ef1968ef0c8" +source = "git+https://github.com/purestake/substrate?branch=v0.3-hotfixes#52b93fd397ee7a3900df8aaa2e207ac1e557e3e0" dependencies = [ "evm", + "evm-gasometer", + "evm-runtime", "frame-support", "frame-system", "impl-trait-for-tuples", @@ -4029,6 +4073,7 @@ dependencies = [ "serde", "sha3 0.8.2", "sp-core", + "sp-evm", "sp-io", "sp-runtime", "sp-std", @@ -4301,7 +4346,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.45", + "syn 1.0.48", ] [[package]] @@ -4453,12 +4498,12 @@ dependencies = [ [[package]] name = "parity-multiaddr" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c7ad66970bbab360c97179b60906e2dc4aef1f7fca8ab4e5c5db8c97b16814a" +checksum = "22fe99b938abd57507e37f8d4ef30cd74b33c71face2809b37b8beb71bab15ab" dependencies = [ "arrayref", - "bs58", + "bs58 0.4.0", "byteorder", "data-encoding", "multihash", @@ -4466,7 +4511,7 @@ dependencies = [ "serde", "static_assertions", "unsigned-varint 0.5.1", - "url 2.1.1", + "url 2.2.0", ] [[package]] @@ -4475,7 +4520,7 @@ version = "1.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c740e5fbcb6847058b40ac7e5574766c6388f585e184d769910fe0d3a2ca861" dependencies = [ - "arrayvec 0.5.1", + "arrayvec 0.5.2", "bitvec", "byte-slice-cast", "parity-scale-codec-derive", @@ -4491,7 +4536,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.45", + "syn 1.0.48", ] [[package]] @@ -4542,7 +4587,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f557c32c6d268a07c921471619c0295f5efad3a0e76d4f97a05c091a51d110b2" dependencies = [ "proc-macro2 1.0.24", - "syn 1.0.45", + "syn 1.0.48", "synstructure", ] @@ -4717,7 +4762,7 @@ checksum = "65ad2ae56b6abe3a1ee25f15ee605bacadb9a764edaba9c2bf4103800d4a1895" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.45", + "syn 1.0.48", ] [[package]] @@ -4728,14 +4773,14 @@ checksum = "81a4ffa594b66bff340084d4081df649a7dc049ac8d7fc458d8e628bfbbb2f86" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.45", + "syn 1.0.48", ] [[package]] name = "pin-project-lite" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e555d9e657502182ac97b539fb3dae8b79cda19e3e4f8ffb5e8de4f18df93c95" +checksum = "c917123afa01924fc84bb20c4c03f004d9c38e5127e3c039bbf7f4b9c76a2f6b" [[package]] name = "pin-utils" @@ -4772,7 +4817,7 @@ version = "0.8.22" source = "git+https://github.com/paritytech/polkadot?branch=rococo-branch#9d2324b24a8e616b67a96b862e048e75b0ec211b" dependencies = [ "derive_more", - "futures 0.3.6", + "futures 0.3.7", "log 0.4.11", "parity-scale-codec", "parking_lot 0.10.2", @@ -4974,9 +5019,9 @@ dependencies = [ [[package]] name = "ppv-lite86" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c36fa947111f5c62a733b652544dd0016a43ce89619538a8ef92724a6f501a20" +checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" [[package]] name = "precompiles" @@ -5021,7 +5066,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.45", + "syn 1.0.48", "version_check", ] @@ -5038,9 +5083,9 @@ dependencies = [ [[package]] name = "proc-macro-hack" -version = "0.5.18" +version = "0.5.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99c605b9a0adc77b7211c6b1f722dcb613d68d66859a44f3d485a6da332b0598" +checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" [[package]] name = "proc-macro-nested" @@ -5132,7 +5177,7 @@ dependencies = [ "itertools 0.8.2", "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.45", + "syn 1.0.48", ] [[package]] @@ -5404,25 +5449,25 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" [[package]] name = "rayon" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf6960dc9a5b4ee8d3e4c5787b4a112a8818e0290a42ff664ad60692fdf2032" +checksum = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674" dependencies = [ "autocfg 1.0.1", - "crossbeam-deque", + "crossbeam-deque 0.8.0", "either", "rayon-core", ] [[package]] name = "rayon-core" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8c4fec834fb6e6d2dd5eece3c7b432a52f0ba887cf40e595190c4107edc08bf" +checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a" dependencies = [ "crossbeam-channel", - "crossbeam-deque", - "crossbeam-utils", + "crossbeam-deque 0.8.0", + "crossbeam-utils 0.8.0", "lazy_static", "num_cpus", ] @@ -5455,22 +5500,22 @@ dependencies = [ [[package]] name = "ref-cast" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "745c1787167ddae5569661d5ffb8b25ae5fedbf46717eaa92d652221cec72623" +checksum = "e17626b2f4bcf35b84bf379072a66e28cfe5c3c6ae58b38e4914bb8891dabece" dependencies = [ "ref-cast-impl", ] [[package]] name = "ref-cast-impl" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d21b475ab879ef0e315ad99067fa25778c3b0377f57f1b00207448dac1a3144" +checksum = "0c523ccaed8ac4b0288948849a350b37d3035827413c458b6a40ddb614bb4f72" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.45", + "syn 1.0.48", ] [[package]] @@ -5486,9 +5531,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8963b85b8ce3074fecffde43b4b0dded83ce2f367dc8d363afc56679f3ee820b" +checksum = "38cf2c13ed4745de91a5eb834e11c00bcc3709e773173b2ce4c56c9fbde04b9c" dependencies = [ "aho-corasick", "memchr", @@ -5498,9 +5543,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.20" +version = "0.6.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cab7a364d15cde1e505267766a2d3c4e22a843e1a601f0fa7564c0f82ced11c" +checksum = "3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189" [[package]] name = "region" @@ -5541,7 +5586,7 @@ checksum = "475e68978dc5b743f2f40d8e0a8fdc83f1c5e78cbf4b8fa5e74e73beebc340de" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.45", + "syn 1.0.48", ] [[package]] @@ -5599,7 +5644,7 @@ checksum = "e33d7b2abe0c340d8797fe2907d3f20d3b5ea5908683618bfe80df7f621f672a" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.45", + "syn 1.0.48", ] [[package]] @@ -5700,14 +5745,14 @@ dependencies = [ "base64", "blake2b_simd", "constant_time_eq", - "crossbeam-utils", + "crossbeam-utils 0.7.2", ] [[package]] name = "rustc-demangle" -version = "0.1.17" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2610b7f643d18c87dff3b489950269617e6601a51f1f05aa5daefee36f64f0b" +checksum = "6e3bad0ee36814ca07d7968269dd4b7ec89ec2da10c4bb613928d3077083c232" [[package]] name = "rustc-hash" @@ -5767,7 +5812,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4da5fcb054c46f5a5dff833b129285a93d3f0179531735e6c866e8cc307d2020" dependencies = [ - "futures 0.3.6", + "futures 0.3.7", "pin-project 0.4.27", "static_assertions", ] @@ -5792,7 +5837,7 @@ name = "sc-basic-authorship" version = "0.8.0-rc5" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ - "futures 0.3.6", + "futures 0.3.7", "futures-timer 3.0.2", "log 0.4.11", "parity-scale-codec", @@ -5852,7 +5897,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.45", + "syn 1.0.48", ] [[package]] @@ -5866,7 +5911,7 @@ dependencies = [ "derive_more", "env_logger", "fdlimit", - "futures 0.3.6", + "futures 0.3.7", "lazy_static", "log 0.4.11", "names", @@ -5903,7 +5948,7 @@ source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#8 dependencies = [ "derive_more", "fnv", - "futures 0.3.6", + "futures 0.3.7", "hash-db", "hex-literal 0.2.1", "kvdb", @@ -5979,7 +6024,7 @@ version = "0.8.0-rc5" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "derive_more", - "futures 0.3.6", + "futures 0.3.7", "futures-timer 3.0.2", "log 0.4.11", "parity-scale-codec", @@ -6011,7 +6056,7 @@ source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#8 dependencies = [ "assert_matches", "derive_more", - "futures 0.3.6", + "futures 0.3.7", "jsonrpc-core", "jsonrpc-core-client", "jsonrpc-derive", @@ -6034,7 +6079,7 @@ name = "sc-consensus-slots" version = "0.8.0-rc5" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ - "futures 0.3.6", + "futures 0.3.7", "futures-timer 3.0.2", "log 0.4.11", "parity-scale-codec", @@ -6142,7 +6187,7 @@ dependencies = [ "derive_more", "finality-grandpa", "fork-tree", - "futures 0.3.6", + "futures 0.3.7", "futures-timer 3.0.2", "log 0.4.11", "parity-scale-codec", @@ -6177,7 +6222,7 @@ version = "0.8.0-rc5" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "ansi_term 0.12.1", - "futures 0.3.6", + "futures 0.3.7", "log 0.4.11", "parity-util-mem", "sc-client-api", @@ -6230,14 +6275,14 @@ version = "0.8.0-rc5" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "bitflags", - "bs58", + "bs58 0.3.1", "bytes 0.5.6", "derive_more", "either", "erased-serde", "fnv", "fork-tree", - "futures 0.3.6", + "futures 0.3.7", "futures-timer 3.0.2", "futures_codec", "hex", @@ -6281,7 +6326,7 @@ name = "sc-network-gossip" version = "0.8.0-rc5" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ - "futures 0.3.6", + "futures 0.3.7", "futures-timer 3.0.2", "libp2p", "log 0.4.11", @@ -6298,9 +6343,9 @@ source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#8 dependencies = [ "bytes 0.5.6", "fnv", - "futures 0.3.6", + "futures 0.3.7", "futures-timer 3.0.2", - "hyper 0.13.8", + "hyper 0.13.9", "hyper-rustls", "log 0.4.11", "num_cpus", @@ -6323,7 +6368,7 @@ name = "sc-peerset" version = "2.0.0-rc5" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ - "futures 0.3.6", + "futures 0.3.7", "libp2p", "log 0.4.11", "serde_json", @@ -6345,7 +6390,7 @@ name = "sc-rpc" version = "2.0.0-rc5" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ - "futures 0.3.6", + "futures 0.3.7", "hash-db", "jsonrpc-core", "jsonrpc-pubsub", @@ -6378,7 +6423,7 @@ version = "0.8.0-rc5" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "derive_more", - "futures 0.3.6", + "futures 0.3.7", "jsonrpc-core", "jsonrpc-core-client", "jsonrpc-derive", @@ -6421,7 +6466,7 @@ dependencies = [ "directories", "exit-future", "futures 0.1.30", - "futures 0.3.6", + "futures 0.3.7", "futures-timer 3.0.2", "hash-db", "jsonrpc-pubsub", @@ -6494,7 +6539,7 @@ name = "sc-telemetry" version = "2.0.0-rc5" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ - "futures 0.3.6", + "futures 0.3.7", "futures-timer 3.0.2", "libp2p", "log 0.4.11", @@ -6533,7 +6578,7 @@ version = "2.0.0-rc5" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "derive_more", - "futures 0.3.6", + "futures 0.3.7", "linked-hash-map", "log 0.4.11", "parity-util-mem", @@ -6554,7 +6599,7 @@ version = "2.0.0-rc5" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "derive_more", - "futures 0.3.6", + "futures 0.3.7", "futures-diagnose", "intervalier", "log 0.4.11", @@ -6591,7 +6636,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "021b403afe70d81eea68f6ea12f6b3c9588e5d536a94c3bf80f15e7faa267862" dependencies = [ "arrayref", - "arrayvec 0.5.1", + "arrayvec 0.5.2", "curve25519-dalek 2.1.0", "getrandom 0.1.15", "merlin", @@ -6625,13 +6670,13 @@ dependencies = [ [[package]] name = "scroll_derive" -version = "0.10.3" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dfde5d1531034db129e95c76ac857e2baecea3443579d493d02224950b0fb6d" +checksum = "b12bd20b94c7cdfda8c7ba9b92ad0d9a56e3fa018c25fca83b51aa664c9b4c0d" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.45", + "syn 1.0.48", ] [[package]] @@ -6708,7 +6753,7 @@ checksum = "cbd1ae72adb44aab48f325a02444a5fc079349a8d804c1fc922aed3f7454c74e" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.45", + "syn 1.0.48", ] [[package]] @@ -6736,12 +6781,12 @@ dependencies = [ [[package]] name = "sha-1" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "170a36ea86c864a3f16dd2687712dd6646f7019f301e57537c7f4dc9f5916770" +checksum = "ce3cdf1b5e620a498ee6f2a171885ac7e22f0e12089ec4b3d22b84921792507c" dependencies = [ "block-buffer 0.9.0", - "cfg-if 0.1.10", + "cfg-if 1.0.0", "cpuid-bool", "digest 0.9.0", "opaque-debug 0.3.0", @@ -6761,12 +6806,12 @@ dependencies = [ [[package]] name = "sha2" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2933378ddfeda7ea26f48c555bdad8bb446bf8a3d17832dc83e380d444cfb8c1" +checksum = "6e7aab86fe2149bad8c507606bdb3f4ef5e7b2380eb92350f56122cca72a42a8" dependencies = [ "block-buffer 0.9.0", - "cfg-if 0.1.10", + "cfg-if 1.0.0", "cpuid-bool", "digest 0.9.0", "opaque-debug 0.3.0", @@ -6835,11 +6880,10 @@ checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" [[package]] name = "signal-hook-registry" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e12110bc539e657a646068aaf5eb5b63af9d0c1f7b29c97113fad80e15f035" +checksum = "ce32ea0c6c56d5eacaeb814fbed9960547021d3edd010ded1425f180536b20ab" dependencies = [ - "arc-swap", "libc", ] @@ -6896,7 +6940,7 @@ checksum = "a945ec7f7ce853e89ffa36be1e27dce9a43e82ff9093bf3461c30d5da74ed11b" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.45", + "syn 1.0.48", ] [[package]] @@ -6927,7 +6971,7 @@ dependencies = [ "rand_core 0.5.1", "ring", "rustc_version", - "sha2 0.9.1", + "sha2 0.9.2", "subtle 2.3.0", "x25519-dalek 1.1.0", ] @@ -6953,11 +6997,11 @@ dependencies = [ "base64", "bytes 0.5.6", "flate2", - "futures 0.3.6", + "futures 0.3.7", "httparse", "log 0.4.11", "rand 0.7.3", - "sha-1 0.9.1", + "sha-1 0.9.2", ] [[package]] @@ -6996,7 +7040,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.45", + "syn 1.0.48", ] [[package]] @@ -7017,7 +7061,7 @@ version = "2.0.0-rc5" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "integer-sqrt", - "num-traits 0.2.12", + "num-traits 0.2.14", "parity-scale-codec", "serde", "sp-debug-derive", @@ -7091,7 +7135,7 @@ version = "0.8.0-rc5" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "derive_more", - "futures 0.3.6", + "futures 0.3.7", "futures-timer 3.0.2", "libp2p", "log 0.4.11", @@ -7176,7 +7220,7 @@ dependencies = [ "derive_more", "dyn-clonable", "ed25519-dalek", - "futures 0.3.6", + "futures 0.3.7", "hash-db", "hash256-std-hasher", "hex", @@ -7185,7 +7229,7 @@ dependencies = [ "libsecp256k1", "log 0.4.11", "merlin", - "num-traits 0.2.12", + "num-traits 0.2.14", "parity-scale-codec", "parity-util-mem", "parking_lot 0.10.2", @@ -7225,7 +7269,19 @@ source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#8 dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.45", + "syn 1.0.48", +] + +[[package]] +name = "sp-evm" +version = "0.8.0" +source = "git+https://github.com/purestake/substrate?branch=v0.3-hotfixes#52b93fd397ee7a3900df8aaa2e207ac1e557e3e0" +dependencies = [ + "evm", + "parity-scale-codec", + "serde", + "sp-core", + "sp-std", ] [[package]] @@ -7282,7 +7338,7 @@ name = "sp-io" version = "2.0.0-rc5" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ - "futures 0.3.6", + "futures 0.3.7", "hash-db", "libsecp256k1", "log 0.4.11", @@ -7329,7 +7385,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.45", + "syn 1.0.48", ] [[package]] @@ -7406,7 +7462,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.45", + "syn 1.0.48", ] [[package]] @@ -7449,7 +7505,7 @@ dependencies = [ "hash-db", "itertools 0.9.0", "log 0.4.11", - "num-traits 0.2.12", + "num-traits 0.2.14", "parity-scale-codec", "parking_lot 0.10.2", "rand 0.7.3", @@ -7509,7 +7565,7 @@ version = "2.0.0-rc5" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "derive_more", - "futures 0.3.6", + "futures 0.3.7", "log 0.4.11", "parity-scale-codec", "serde", @@ -7537,7 +7593,7 @@ name = "sp-utils" version = "2.0.0-rc5" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ - "futures 0.3.6", + "futures 0.3.7", "futures-core", "futures-timer 3.0.2", "lazy_static", @@ -7640,7 +7696,7 @@ dependencies = [ "proc-macro-error", "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.45", + "syn 1.0.48", ] [[package]] @@ -7661,7 +7717,7 @@ dependencies = [ "heck", "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.45", + "syn 1.0.48", ] [[package]] @@ -7691,7 +7747,7 @@ version = "2.0.0-rc5" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-branch#83544d41abcc0e3d3cbbd6aa510e04dc50863e5c" dependencies = [ "frame-system-rpc-runtime-api", - "futures 0.3.6", + "futures 0.3.7", "jsonrpc-core", "jsonrpc-core-client", "jsonrpc-derive", @@ -7716,7 +7772,7 @@ dependencies = [ "async-std", "derive_more", "futures-util", - "hyper 0.13.8", + "hyper 0.13.9", "log 0.4.11", "prometheus", "tokio 0.2.22", @@ -7794,9 +7850,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.45" +version = "1.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea9c5432ff16d6152371f808fb5a871cd67368171b09bb21b43df8e4a47a3556" +checksum = "cc371affeffc477f42a221a1e4297aedcea33d47d19b61455588bd9d8f6b19ac" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", @@ -7820,7 +7876,7 @@ checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.45", + "syn 1.0.48", "unicode-xid 0.2.1", ] @@ -7896,22 +7952,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.21" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "318234ffa22e0920fe9a40d7b8369b5f649d490980cf7aadcf1eb91594869b42" +checksum = "0e9ae34b84616eedaaf1e9dd6026dbe00dcafa92aa0c8077cb69df1fcfe5e53e" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.21" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cae2447b6282786c3493999f40a9be2a6ad20cb8bd268b0a0dbf5a065535c0ab" +checksum = "9ba20f23e85b10754cd195504aebf6a27e2e6cbe28c17778a0c930724628dd56" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.45", + "syn 1.0.48", ] [[package]] @@ -8058,7 +8114,7 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb2d1b8f4548dbf5e1f7818512e9c406860678f29c300cdf0ebac72d1a3a1671" dependencies = [ - "crossbeam-utils", + "crossbeam-utils 0.7.2", "futures 0.1.30", ] @@ -8114,7 +8170,7 @@ version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09bc590ec4ba8ba87652da2068d150dcada2cfa2e07faae270a5e0409aa51351" dependencies = [ - "crossbeam-utils", + "crossbeam-utils 0.7.2", "futures 0.1.30", "lazy_static", "log 0.4.11", @@ -8189,9 +8245,9 @@ version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df720b6581784c118f0eb4310796b12b1d242a7eb95f716a8367855325c25f89" dependencies = [ - "crossbeam-deque", + "crossbeam-deque 0.7.3", "crossbeam-queue", - "crossbeam-utils", + "crossbeam-utils 0.7.2", "futures 0.1.30", "lazy_static", "log 0.4.11", @@ -8206,7 +8262,7 @@ version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93044f2d313c95ff1cb7809ce9a7a05735b012288a888b62d4434fd58c94f296" dependencies = [ - "crossbeam-utils", + "crossbeam-utils 0.7.2", "futures 0.1.30", "slab", "tokio-executor 0.1.10", @@ -8295,7 +8351,7 @@ checksum = "80e0ccfc3378da0cce270c946b676a376943f5cd16aeba64568e7939806f4ada" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.45", + "syn 1.0.48", ] [[package]] @@ -8307,6 +8363,16 @@ dependencies = [ "lazy_static", ] +[[package]] +name = "tracing-futures" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab7bb6f14721aa00656086e9335d363c5c8747bae02ebe32ea2c7dece5689b4c" +dependencies = [ + "pin-project 0.4.27", + "tracing", +] + [[package]] name = "trie-db" version = "0.22.1" @@ -8329,6 +8395,16 @@ dependencies = [ "hash-db", ] +[[package]] +name = "triehash" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f490aa7aa4e4d07edeba442c007e42e3e7f43aafb5112c5b047fff0b1aa5449c" +dependencies = [ + "hash-db", + "rlp", +] + [[package]] name = "try-lock" version = "0.2.3" @@ -8468,10 +8544,11 @@ dependencies = [ [[package]] name = "url" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "829d4a8476c35c9bf0bbce5a3b23f4106f79728039b726d292bb93bc106787cb" +checksum = "5909f2b0817350449ed73e8bcd81c8c3c8d9a7a5d8acba4b27db277f1868976e" dependencies = [ + "form_urlencoded", "idna 0.2.0", "matches", "percent-encoding 2.1.0", @@ -8567,7 +8644,7 @@ dependencies = [ "log 0.4.11", "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.45", + "syn 1.0.48", "wasm-bindgen-shared", ] @@ -8601,7 +8678,7 @@ checksum = "f249f06ef7ee334cc3b8ff031bfc11ec99d00f34d86da7498396dc1e3b1498fe" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.45", + "syn 1.0.48", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -8618,7 +8695,7 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f" dependencies = [ - "futures 0.3.6", + "futures 0.3.7", "js-sys", "parking_lot 0.11.0", "pin-utils", @@ -8636,7 +8713,7 @@ dependencies = [ "libc", "memory_units", "num-rational", - "num-traits 0.2.12", + "num-traits 0.2.14", "parity-wasm", "wasmi-validation", ] @@ -8794,18 +8871,18 @@ dependencies = [ [[package]] name = "wast" -version = "25.0.2" +version = "27.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "000df4e05cdb4cbc1d0bb1e7e5ea86adb3f1295850c9effb9a47b1086a346895" +checksum = "c2c3ef5f6a72dffa44c24d5811123f704e18a1dbc83637d347b1852b41d3835c" dependencies = [ "leb128", ] [[package]] name = "wat" -version = "1.0.26" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4766d466249e23279e92c52033429eb91141c5efea1c4478138fa6f6ef4efe3e" +checksum = "835cf59c907f67e2bbc20f50157e08f35006fe2a8444d8ec9f5683e22f937045" dependencies = [ "wast", ] @@ -8850,9 +8927,9 @@ dependencies = [ [[package]] name = "wepoll-sys" -version = "3.0.0" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "142bc2cba3fe88be1a8fcb55c727fa4cd5b0cf2d7438722792e22f26f04bc1e0" +checksum = "0fcb14dea929042224824779fbc82d9fab8d2e6d3cbc0ac404de8edf489e77ff" dependencies = [ "cc", ] @@ -8993,7 +9070,7 @@ dependencies = [ "rand 0.7.3", "sha-1 0.8.2", "slab", - "url 2.1.1", + "url 2.2.0", ] [[package]] @@ -9034,7 +9111,7 @@ version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "053585b18bca1a3d00e4b5ef93e72d4f49a10005374c455db7177e27149c899d" dependencies = [ - "futures 0.3.6", + "futures 0.3.7", "log 0.4.11", "nohash-hasher", "parking_lot 0.10.2", @@ -9059,7 +9136,7 @@ checksum = "c3f369ddb18862aba61aa49bf31e74d29f0f162dec753063200e1dc084345d16" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.45", + "syn 1.0.48", "synstructure", ] diff --git a/node/standalone/Cargo.toml b/node/standalone/Cargo.toml index 959bf8b52a..e9fc188851 100644 --- a/node/standalone/Cargo.toml +++ b/node/standalone/Cargo.toml @@ -24,8 +24,8 @@ exclude = [ futures = "0.3.4" log = "0.4.8" structopt = "0.3.8" -jsonrpc-core = "14.0.3" -jsonrpc-pubsub = "14.0.3" +jsonrpc-core = "14.2.0" +jsonrpc-pubsub = "14.2.0" sp-api = { git = "https://github.com/paritytech/substrate.git", branch = "rococo-branch" } sp-blockchain = { git = "https://github.com/paritytech/substrate.git", branch = "rococo-branch" } @@ -40,7 +40,6 @@ sc-service = { git = "https://github.com/paritytech/substrate.git", branch = "ro sp-inherents = { git = "https://github.com/paritytech/substrate.git", branch = "rococo-branch" } sc-transaction-pool = { git = "https://github.com/paritytech/substrate.git", branch = "rococo-branch" } sp-transaction-pool = { git = "https://github.com/paritytech/substrate.git", branch = "rococo-branch" } -sc-transaction-graph = { git = "https://github.com/paritytech/substrate", branch = "rococo-branch" } sc-network = { git = "https://github.com/paritytech/substrate.git", branch = "rococo-branch" } sc-consensus-aura = { git = "https://github.com/paritytech/substrate.git", branch = "rococo-branch" } sp-consensus-aura = { git = "https://github.com/paritytech/substrate.git", branch = "rococo-branch" } @@ -48,7 +47,7 @@ sc-consensus-manual-seal = { git = "https://github.com/paritytech/substrate.git" sp-consensus = { git = "https://github.com/paritytech/substrate.git", branch = "rococo-branch" } sc-consensus = { git = "https://github.com/paritytech/substrate.git", branch = "rococo-branch" } sp-timestamp = { git = "https://github.com/paritytech/substrate.git", branch = "rococo-branch" } -evm = { package = "pallet-evm", git = "https://github.com/purestake/substrate", branch = "tgmichel-rococo-branch" } +evm = { package = "pallet-evm", git = "https://github.com/purestake/substrate", branch = "v0.3-hotfixes" } sc-finality-grandpa = { git = "https://github.com/paritytech/substrate.git", branch = "rococo-branch" } sp-finality-grandpa = { git = "https://github.com/paritytech/substrate.git", branch = "rococo-branch" } sc-client-api = { git = "https://github.com/paritytech/substrate.git", branch = "rococo-branch" } @@ -58,10 +57,10 @@ sp-block-builder = { git = "https://github.com/paritytech/substrate.git", branch moonbeam-runtime = {path = "../../runtime", default-features = false, features = ["std", "standalone"] } -ethereum = { package = "pallet-ethereum", git = "https://github.com/purestake/frontier", branch = "v0.2-hotfixes" } -frontier-consensus = { git = "https://github.com/purestake/frontier", branch = "v0.2-hotfixes" } -frontier-rpc = { git = "https://github.com/purestake/frontier", branch = "v0.2-hotfixes" } -frontier-rpc-primitives = { git = "https://github.com/purestake/frontier", branch = "v0.2-hotfixes" } +ethereum = { package = "pallet-ethereum", git = "https://github.com/purestake/frontier", branch = "v0.3-hotfixes" } +frontier-consensus = { git = "https://github.com/purestake/frontier", branch = "v0.3-hotfixes" } +frontier-rpc = { git = "https://github.com/purestake/frontier", branch = "v0.3-hotfixes" } +frontier-rpc-primitives = { git = "https://github.com/purestake/frontier", branch = "v0.3-hotfixes" } [build-dependencies] substrate-build-script-utils = { git = "https://github.com/paritytech/substrate.git", branch = "rococo-branch" } diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index c1ad7336ba..1db446b4c8 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -40,13 +40,13 @@ pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-branch" } pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-branch" } -pallet-evm = { git = "https://github.com/purestake/substrate", default-features = false, branch = "tgmichel-rococo-branch" } +pallet-evm = { git = "https://github.com/purestake/substrate", default-features = false, branch = "v0.3-hotfixes" } sp-consensus-aura = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "rococo-branch", optional = true } pallet-grandpa = { default-features = false, package = "pallet-grandpa", git = "https://github.com/paritytech/substrate.git", branch = "rococo-branch", optional = true } -frontier-rpc-primitives = { default-features = false, git = "https://github.com/purestake/frontier", branch = "v0.2-hotfixes" } -pallet-ethereum = { default-features = false, package = "pallet-ethereum", git = "https://github.com/purestake/frontier", branch = "v0.2-hotfixes" } +frontier-rpc-primitives = { default-features = false, git = "https://github.com/purestake/frontier", branch = "v0.3-hotfixes" } +pallet-ethereum = { default-features = false, package = "pallet-ethereum", git = "https://github.com/purestake/frontier", branch = "v0.3-hotfixes" } # Cumulus dependencies diff --git a/runtime/precompiles/Cargo.toml b/runtime/precompiles/Cargo.toml index 5090975667..81c548acc6 100644 --- a/runtime/precompiles/Cargo.toml +++ b/runtime/precompiles/Cargo.toml @@ -11,7 +11,7 @@ ripemd160 = { version = "0.9", default-features = false } sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-branch" } sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-branch" } -pallet-evm = { git = "https://github.com/purestake/substrate", default-features = false, branch = "tgmichel-rococo-branch" } +pallet-evm = { git = "https://github.com/purestake/substrate", default-features = false, branch = "v0.3-hotfixes" } [features] default = [ "std" ] From 070860292ac9f7e818371e6d47d3277b71bce027 Mon Sep 17 00:00:00 2001 From: tgmichel Date: Tue, 10 Nov 2020 09:30:45 +0100 Subject: [PATCH 06/17] Add tests websocket provider --- tests/tests/util.ts | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/tests/tests/util.ts b/tests/tests/util.ts index 8b30c46287..db03dfeab2 100644 --- a/tests/tests/util.ts +++ b/tests/tests/util.ts @@ -47,9 +47,12 @@ export async function createAndFinalizeBlock(web3: Web3) { } export async function startMoonbeamNode( - specFilename: string + specFilename: string, provider?: string ): Promise<{ web3: Web3; binary: ChildProcess }> { - const web3 = new Web3(`http://localhost:${RPC_PORT}`); + var web3; + if (!provider || provider == 'http') { + web3 = new Web3(`http://localhost:${RPC_PORT}`); + } const cmd = BINARY_PATH; const args = [ @@ -64,7 +67,7 @@ export async function startMoonbeamNode( `-l${MOONBEAM_LOG}`, `--port=${PORT}`, `--rpc-port=${RPC_PORT}`, - `--ws-port=${WS_PORT}`, // not used + `--ws-port=${WS_PORT}`, `--tmp`, ]; const binary = spawn(cmd, args); @@ -96,8 +99,10 @@ export async function startMoonbeamNode( } binaryLogs.push(chunk); if (chunk.toString().match(/Manual Seal Ready/)) { - // This is needed as the EVM runtime needs to warmup with a first call - await web3.eth.getChainId(); + if (!provider || provider == "http") { + // This is needed as the EVM runtime needs to warmup with a first call + await web3.eth.getChainId(); + } clearTimeout(timer); if (!DISPLAY_LOG) { @@ -112,13 +117,17 @@ export async function startMoonbeamNode( binary.stdout.on("data", onData); }); + if (provider == 'ws') { + web3 = new Web3(`ws://localhost:${WS_PORT}`); + } + return { web3, binary }; } export function describeWithMoonbeam( title: string, specFilename: string, - cb: (context: { web3: Web3 }) => void + cb: (context: { web3: Web3 }) => void, provider?: string ) { describe(title, () => { let context: { web3: Web3 } = { web3: null }; @@ -127,7 +136,7 @@ export function describeWithMoonbeam( // Making sure the Moonbeam node has started before("Starting Moonbeam Test Node", async function () { this.timeout(SPAWNING_TIME); - const init = await startMoonbeamNode(specFilename); + const init = await startMoonbeamNode(specFilename, provider); context.web3 = init.web3; binary = init.binary; }); From 9330ae588e63f2188a4acdc80149fe62b556ecca Mon Sep 17 00:00:00 2001 From: tgmichel Date: Tue, 10 Nov 2020 09:34:59 +0100 Subject: [PATCH 07/17] Fix existing tests fields --- tests/tests/test-block.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/tests/test-block.ts b/tests/tests/test-block.ts index d79b62d84c..014f3a2ee8 100644 --- a/tests/tests/test-block.ts +++ b/tests/tests/test-block.ts @@ -19,7 +19,7 @@ describeWithMoonbeam("Moonbeam RPC (Block)", `simple-specs.json`, (context) => { expect(block).to.include({ author: "0x0000000000000000000000000000000000000000", difficulty: "0", - extraData: "0x0000000000000000000000000000000000000000000000000000000000000000", + extraData: "0x", gasLimit: 0, gasUsed: 0, //hash: "0x14fe6f7c93597f79b901f8b5d7a84277a90915b8d355959b587e18de34f1dc17", @@ -27,13 +27,13 @@ describeWithMoonbeam("Moonbeam RPC (Block)", `simple-specs.json`, (context) => { number: 0, //parentHash: "0x2cc74f91423ba20e9bb0b2c7d8924eacd14bc98aa1daad078f8844e529221cde", receiptsRoot: "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347", - sha3Uncles: "0x0000000000000000000000000000000000000000000000000000000000000000", - size: 533, + sha3Uncles: "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347", + // size: 533, stateRoot: "0x0000000000000000000000000000000000000000000000000000000000000000", //timestamp: 1595012243836, totalDifficulty: null, //transactions: [], - transactionsRoot: "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347", + transactionsRoot: "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", //uncles: [] }); @@ -72,7 +72,7 @@ describeWithMoonbeam("Moonbeam RPC (Block)", `simple-specs.json`, (context) => { expect(block).to.include({ author: "0x0000000000000000000000000000000000000000", difficulty: "0", - extraData: "0x0000000000000000000000000000000000000000000000000000000000000000", + extraData: "0x", gasLimit: 0, gasUsed: 0, //hash: "0x14fe6f7c93597f79b901f8b5d7a84277a90915b8d355959b587e18de34f1dc17", @@ -81,13 +81,13 @@ describeWithMoonbeam("Moonbeam RPC (Block)", `simple-specs.json`, (context) => { number: 1, //parentHash: "0x04540257811b46d103d9896e7807040e7de5080e285841c5430d1a81588a0ce4", receiptsRoot: "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347", - sha3Uncles: "0x0000000000000000000000000000000000000000000000000000000000000000", - size: 535, + sha3Uncles: "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347", + // size: 535, stateRoot: "0x0000000000000000000000000000000000000000000000000000000000000000", //timestamp: 1595012243836, totalDifficulty: null, //transactions: [], - transactionsRoot: "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347", + transactionsRoot: "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", //uncles: [] }); previousBlock = block; From 96b85541bcb7bd6246676ae774e57599a0718dc2 Mon Sep 17 00:00:00 2001 From: tgmichel Date: Tue, 10 Nov 2020 09:40:15 +0100 Subject: [PATCH 08/17] Add test subscriptions --- tests/tests/test-subscription.ts | 382 +++++++++++++++++++++++++++++++ 1 file changed, 382 insertions(+) create mode 100644 tests/tests/test-subscription.ts diff --git a/tests/tests/test-subscription.ts b/tests/tests/test-subscription.ts new file mode 100644 index 0000000000..927e977a75 --- /dev/null +++ b/tests/tests/test-subscription.ts @@ -0,0 +1,382 @@ +import { expect } from "chai"; +import { step } from "mocha-steps"; + +import { createAndFinalizeBlock, customRequest, describeWithMoonbeam } from "./util"; + +describeWithMoonbeam("Frontier RPC (Subscription)", `simple-specs.json`, (context) => { + + let subscription; + let logs_generated = 0; + + const GENESIS_ACCOUNT = "0x6be02d1d3665660d22ff9624b7be0551ee1ac91b"; + const GENESIS_ACCOUNT_PRIVATE_KEY = "0x99B3C12287537E38C90A9219D4CB074A89A16E9CDB20BF85728EBD97C343E342"; + + const TEST_CONTRACT_BYTECODE = + "0x608060405234801561001057600080fd5b50610041337fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff61004660201b60201c565b610291565b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff1614156100e9576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252601f8152602001807f45524332303a206d696e7420746f20746865207a65726f20616464726573730081525060200191505060405180910390fd5b6101028160025461020960201b610c7c1790919060201c565b60028190555061015d816000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205461020960201b610c7c1790919060201c565b6000808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff16600073ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a35050565b600080828401905083811015610287576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252601b8152602001807f536166654d6174683a206164646974696f6e206f766572666c6f77000000000081525060200191505060405180910390fd5b8091505092915050565b610e3a806102a06000396000f3fe608060405234801561001057600080fd5b50600436106100885760003560e01c806370a082311161005b57806370a08231146101fd578063a457c2d714610255578063a9059cbb146102bb578063dd62ed3e1461032157610088565b8063095ea7b31461008d57806318160ddd146100f357806323b872dd146101115780633950935114610197575b600080fd5b6100d9600480360360408110156100a357600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610399565b604051808215151515815260200191505060405180910390f35b6100fb6103b7565b6040518082815260200191505060405180910390f35b61017d6004803603606081101561012757600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803590602001909291905050506103c1565b604051808215151515815260200191505060405180910390f35b6101e3600480360360408110156101ad57600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291908035906020019092919050505061049a565b604051808215151515815260200191505060405180910390f35b61023f6004803603602081101561021357600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919050505061054d565b6040518082815260200191505060405180910390f35b6102a16004803603604081101561026b57600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610595565b604051808215151515815260200191505060405180910390f35b610307600480360360408110156102d157600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610662565b604051808215151515815260200191505060405180910390f35b6103836004803603604081101561033757600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610680565b6040518082815260200191505060405180910390f35b60006103ad6103a6610707565b848461070f565b6001905092915050565b6000600254905090565b60006103ce848484610906565b61048f846103da610707565b61048a85604051806060016040528060288152602001610d7060289139600160008b73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000610440610707565b73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610bbc9092919063ffffffff16565b61070f565b600190509392505050565b60006105436104a7610707565b8461053e85600160006104b8610707565b73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008973ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610c7c90919063ffffffff16565b61070f565b6001905092915050565b60008060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020549050919050565b60006106586105a2610707565b8461065385604051806060016040528060258152602001610de160259139600160006105cc610707565b73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008a73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610bbc9092919063ffffffff16565b61070f565b6001905092915050565b600061067661066f610707565b8484610906565b6001905092915050565b6000600160008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054905092915050565b600033905090565b600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff161415610795576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401808060200182810382526024815260200180610dbd6024913960400191505060405180910390fd5b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff16141561081b576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401808060200182810382526022815260200180610d286022913960400191505060405180910390fd5b80600160008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925836040518082815260200191505060405180910390a3505050565b600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff16141561098c576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401808060200182810382526025815260200180610d986025913960400191505060405180910390fd5b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff161415610a12576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401808060200182810382526023815260200180610d056023913960400191505060405180910390fd5b610a7d81604051806060016040528060268152602001610d4a602691396000808773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610bbc9092919063ffffffff16565b6000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610b10816000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610c7c90919063ffffffff16565b6000808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a3505050565b6000838311158290610c69576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825283818151815260200191508051906020019080838360005b83811015610c2e578082015181840152602081019050610c13565b50505050905090810190601f168015610c5b5780820380516001836020036101000a031916815260200191505b509250505060405180910390fd5b5060008385039050809150509392505050565b600080828401905083811015610cfa576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252601b8152602001807f536166654d6174683a206164646974696f6e206f766572666c6f77000000000081525060200191505060405180910390fd5b809150509291505056fe45524332303a207472616e7366657220746f20746865207a65726f206164647265737345524332303a20617070726f766520746f20746865207a65726f206164647265737345524332303a207472616e7366657220616d6f756e7420657863656564732062616c616e636545524332303a207472616e7366657220616d6f756e74206578636565647320616c6c6f77616e636545524332303a207472616e736665722066726f6d20746865207a65726f206164647265737345524332303a20617070726f76652066726f6d20746865207a65726f206164647265737345524332303a2064656372656173656420616c6c6f77616e63652062656c6f77207a65726fa265627a7a72315820c7a5ffabf642bda14700b2de42f8c57b36621af020441df825de45fd2b3e1c5c64736f6c63430005100032"; + + async function sendTransaction(context) { + const tx = await context.web3.eth.accounts.signTransaction( + { + from: GENESIS_ACCOUNT, + data: TEST_CONTRACT_BYTECODE, + value: "0x00", + gasPrice: "0x01", + gas: "0x4F930", + }, + GENESIS_ACCOUNT_PRIVATE_KEY + ); + + await customRequest(context.web3, "eth_sendRawTransaction", [tx.rawTransaction]); + return tx; + } + + step("should connect", async function () { + await createAndFinalizeBlock(context.web3); + // @ts-ignore + const connected = context.web3.currentProvider.connected; + expect(connected).to.equal(true); + }); + + step("should subscribe", async function () { + subscription = context.web3.eth.subscribe("newBlockHeaders", function(error, result){}); + + let connected = false; + let subscriptionId = ""; + await new Promise((resolve) => { + subscription.on("connected", function (d: any) { + connected = true; + subscriptionId = d; + resolve(); + }); + }); + + expect(connected).to.equal(true); + expect(subscriptionId).to.have.lengthOf(16); + }); + + step("should get newHeads stream", async function (done) { + await createAndFinalizeBlock(context.web3); + let data = null; + await new Promise((resolve) => { + subscription.on("data", function (d: any) { + data = d; + resolve(); + }); + }); + expect(data).to.include({ + author: '0x0000000000000000000000000000000000000000', + difficulty: '0', + extraData: '0x', + logsBloom: '0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000', + miner: '0x0000000000000000000000000000000000000000', + number: 2, + receiptsRoot: '0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347', + sha3Uncles: '0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347', + stateRoot: '0x0000000000000000000000000000000000000000000000000000000000000000', + transactionsRoot: '0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421' + }); + expect((data as any).sealFields).to.eql([ + "0x0000000000000000000000000000000000000000000000000000000000000000", + "0x0000000000000000", + ]); + setTimeout(done,10000); + }).timeout(20000); + + step("should get newPendingTransactions stream", async function (done) { + subscription = context.web3.eth.subscribe("pendingTransactions", function(error, result){}); + + await new Promise((resolve) => { + subscription.on("connected", function (d: any) { + resolve(); + }); + }); + + const tx = await sendTransaction(context); + let data = null; + await new Promise((resolve) => { + createAndFinalizeBlock(context.web3); + subscription.on("data", function (d: any) { + data = d; + logs_generated += 1; + resolve(); + }); + }); + subscription.unsubscribe(); + + expect(data).to.be.not.null; + expect(tx["transactionHash"]).to.be.eq(data); + setTimeout(done,10000); + }).timeout(20000); + + step("should subscribe to all logs", async function (done) { + subscription = context.web3.eth.subscribe("logs", {}, function(error, result){}); + + await new Promise((resolve) => { + subscription.on("connected", function (d: any) { + resolve(); + }); + }); + + const tx = await sendTransaction(context); + let data = null; + await new Promise((resolve) => { + createAndFinalizeBlock(context.web3); + subscription.on("data", function (d: any) { + data = d; + logs_generated += 1; + resolve(); + }); + }); + subscription.unsubscribe(); + + const block = await context.web3.eth.getBlock("latest"); + expect(data).to.include({ + blockHash: block.hash, + blockNumber: block.number, + data: '0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff', + logIndex: 0, + removed: false, + transactionHash: block.transactions[0], + transactionIndex: 0, + transactionLogIndex: '0x0' + }); + setTimeout(done,10000); + }).timeout(20000); + + step("should subscribe to logs by address", async function (done) { + subscription = context.web3.eth.subscribe("logs", { + address: "0x42e2EE7Ba8975c473157634Ac2AF4098190fc741" + }, function(error, result){}); + + await new Promise((resolve) => { + subscription.on("connected", function (d: any) { + resolve(); + }); + }); + + const tx = await sendTransaction(context); + let data = null; + await new Promise((resolve) => { + createAndFinalizeBlock(context.web3); + subscription.on("data", function (d: any) { + data = d; + logs_generated += 1; + resolve(); + }); + }); + subscription.unsubscribe(); + + expect(data).to.not.be.null; + setTimeout(done,10000); + }).timeout(20000); + + step("should subscribe to logs by topic", async function (done) { + subscription = context.web3.eth.subscribe("logs", { + topics: ["0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef"] + }, function(error, result){}); + + await new Promise((resolve) => { + subscription.on("connected", function (d: any) { + resolve(); + }); + }); + + const tx = await sendTransaction(context); + let data = null; + await new Promise((resolve) => { + createAndFinalizeBlock(context.web3); + subscription.on("data", function (d: any) { + data = d; + logs_generated += 1; + resolve(); + }); + }); + subscription.unsubscribe(); + + expect(data).to.not.be.null; + setTimeout(done,10000); + }).timeout(20000); + + step("should get past events on subscription", async function (done) { + subscription = context.web3.eth.subscribe("logs", { + fromBlock: "0x0" + }, function(error, result){}); + + let data = []; + await new Promise((resolve) => { + subscription.on("data", function (d: any) { + data.push(d); + if (data.length == logs_generated) { + resolve(); + } + }); + }); + + expect(data).to.not.be.empty; + setTimeout(done,10000); + }).timeout(20000); + + step("should support topic wildcards", async function (done) { + subscription = context.web3.eth.subscribe("logs", { + topics: [ + null, + "0x0000000000000000000000000000000000000000000000000000000000000000" + ] + }, function(error, result){}); + + await new Promise((resolve) => { + subscription.on("connected", function (d: any) { + resolve(); + }); + }); + + const tx = await sendTransaction(context); + let data = null; + await new Promise((resolve) => { + createAndFinalizeBlock(context.web3); + subscription.on("data", function (d: any) { + data = d; + logs_generated += 1; + resolve(); + }); + }); + subscription.unsubscribe(); + + expect(data).to.not.be.null; + setTimeout(done,10000); + }).timeout(20000); + + step("should support single values wrapped around a sequence", async function (done) { + subscription = context.web3.eth.subscribe("logs", { + topics: [ + ["0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef"], + ["0x0000000000000000000000000000000000000000000000000000000000000000"] + ] + }, function(error, result){}); + + await new Promise((resolve) => { + subscription.on("connected", function (d: any) { + resolve(); + }); + }); + + const tx = await sendTransaction(context); + let data = null; + await new Promise((resolve) => { + createAndFinalizeBlock(context.web3); + subscription.on("data", function (d: any) { + data = d; + logs_generated += 1; + resolve(); + }); + }); + subscription.unsubscribe(); + + expect(data).to.not.be.null; + setTimeout(done,10000); + }).timeout(20000); + + step("should support topic conditional parameters", async function (done) { + subscription = context.web3.eth.subscribe("logs", { + topics: [ + "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef", + [ + "0x0000000000000000000000006be02d1d3665660d22ff9624b7be0551ee1ac91b", + "0x0000000000000000000000000000000000000000000000000000000000000000" + ] + ] + }, function(error, result){}); + + await new Promise((resolve) => { + subscription.on("connected", function (d: any) { + resolve(); + }); + }); + + const tx = await sendTransaction(context); + let data = null; + await new Promise((resolve) => { + createAndFinalizeBlock(context.web3); + subscription.on("data", function (d: any) { + data = d; + logs_generated += 1; + resolve(); + }); + }); + subscription.unsubscribe(); + + expect(data).to.not.be.null; + setTimeout(done,10000); + }).timeout(20000); + + step("should support multiple topic conditional parameters", async function (done) { + subscription = context.web3.eth.subscribe("logs", { + topics: [ + "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef", + [ + "0x0000000000000000000000000000000000000000000000000000000000000000", + "0x0000000000000000000000006be02d1d3665660d22ff9624b7be0551ee1ac91b" + ], + [ + "0x0000000000000000000000006be02d1d3665660d22ff9624b7be0551ee1ac91b", + "0x0000000000000000000000000000000000000000000000000000000000000000" + ] + ] + }, function(error, result){}); + + await new Promise((resolve) => { + subscription.on("connected", function (d: any) { + resolve(); + }); + }); + + const tx = await sendTransaction(context); + let data = null; + await new Promise((resolve) => { + createAndFinalizeBlock(context.web3); + subscription.on("data", function (d: any) { + data = d; + logs_generated += 1; + resolve(); + }); + }); + subscription.unsubscribe(); + + expect(data).to.not.be.null; + setTimeout(done,10000); + }).timeout(20000); + + step("should combine topic wildcards and conditional parameters", async function (done) { + subscription = context.web3.eth.subscribe("logs", { + topics: [ + null, + [ + "0x0000000000000000000000006be02d1d3665660d22ff9624b7be0551ee1ac91b", + "0x0000000000000000000000000000000000000000000000000000000000000000" + ], + null + ] + }, function(error, result){}); + + await new Promise((resolve) => { + subscription.on("connected", function (d: any) { + resolve(); + }); + }); + + const tx = await sendTransaction(context); + let data = null; + await new Promise((resolve) => { + createAndFinalizeBlock(context.web3); + subscription.on("data", function (d: any) { + data = d; + logs_generated += 1; + resolve(); + }); + }); + subscription.unsubscribe(); + + expect(data).to.not.be.null; + setTimeout(done,10000); + }).timeout(20000); +}, "ws"); \ No newline at end of file From e0d6667d741c912b50c18e37e9d567c8dd7bfb4d Mon Sep 17 00:00:00 2001 From: tgmichel Date: Tue, 10 Nov 2020 11:23:16 +0100 Subject: [PATCH 09/17] Fix checker --- tests/tests/test-subscription.ts | 844 +++++++++++++++++-------------- tests/tests/util.ts | 18 +- 2 files changed, 478 insertions(+), 384 deletions(-) diff --git a/tests/tests/test-subscription.ts b/tests/tests/test-subscription.ts index 927e977a75..7b8649a10e 100644 --- a/tests/tests/test-subscription.ts +++ b/tests/tests/test-subscription.ts @@ -5,378 +5,472 @@ import { createAndFinalizeBlock, customRequest, describeWithMoonbeam } from "./u describeWithMoonbeam("Frontier RPC (Subscription)", `simple-specs.json`, (context) => { - let subscription; - let logs_generated = 0; - - const GENESIS_ACCOUNT = "0x6be02d1d3665660d22ff9624b7be0551ee1ac91b"; - const GENESIS_ACCOUNT_PRIVATE_KEY = "0x99B3C12287537E38C90A9219D4CB074A89A16E9CDB20BF85728EBD97C343E342"; - - const TEST_CONTRACT_BYTECODE = - "0x608060405234801561001057600080fd5b50610041337fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff61004660201b60201c565b610291565b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff1614156100e9576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252601f8152602001807f45524332303a206d696e7420746f20746865207a65726f20616464726573730081525060200191505060405180910390fd5b6101028160025461020960201b610c7c1790919060201c565b60028190555061015d816000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205461020960201b610c7c1790919060201c565b6000808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff16600073ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a35050565b600080828401905083811015610287576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252601b8152602001807f536166654d6174683a206164646974696f6e206f766572666c6f77000000000081525060200191505060405180910390fd5b8091505092915050565b610e3a806102a06000396000f3fe608060405234801561001057600080fd5b50600436106100885760003560e01c806370a082311161005b57806370a08231146101fd578063a457c2d714610255578063a9059cbb146102bb578063dd62ed3e1461032157610088565b8063095ea7b31461008d57806318160ddd146100f357806323b872dd146101115780633950935114610197575b600080fd5b6100d9600480360360408110156100a357600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610399565b604051808215151515815260200191505060405180910390f35b6100fb6103b7565b6040518082815260200191505060405180910390f35b61017d6004803603606081101561012757600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803590602001909291905050506103c1565b604051808215151515815260200191505060405180910390f35b6101e3600480360360408110156101ad57600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291908035906020019092919050505061049a565b604051808215151515815260200191505060405180910390f35b61023f6004803603602081101561021357600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919050505061054d565b6040518082815260200191505060405180910390f35b6102a16004803603604081101561026b57600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610595565b604051808215151515815260200191505060405180910390f35b610307600480360360408110156102d157600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610662565b604051808215151515815260200191505060405180910390f35b6103836004803603604081101561033757600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610680565b6040518082815260200191505060405180910390f35b60006103ad6103a6610707565b848461070f565b6001905092915050565b6000600254905090565b60006103ce848484610906565b61048f846103da610707565b61048a85604051806060016040528060288152602001610d7060289139600160008b73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000610440610707565b73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610bbc9092919063ffffffff16565b61070f565b600190509392505050565b60006105436104a7610707565b8461053e85600160006104b8610707565b73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008973ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610c7c90919063ffffffff16565b61070f565b6001905092915050565b60008060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020549050919050565b60006106586105a2610707565b8461065385604051806060016040528060258152602001610de160259139600160006105cc610707565b73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008a73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610bbc9092919063ffffffff16565b61070f565b6001905092915050565b600061067661066f610707565b8484610906565b6001905092915050565b6000600160008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054905092915050565b600033905090565b600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff161415610795576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401808060200182810382526024815260200180610dbd6024913960400191505060405180910390fd5b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff16141561081b576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401808060200182810382526022815260200180610d286022913960400191505060405180910390fd5b80600160008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925836040518082815260200191505060405180910390a3505050565b600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff16141561098c576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401808060200182810382526025815260200180610d986025913960400191505060405180910390fd5b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff161415610a12576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401808060200182810382526023815260200180610d056023913960400191505060405180910390fd5b610a7d81604051806060016040528060268152602001610d4a602691396000808773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610bbc9092919063ffffffff16565b6000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610b10816000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610c7c90919063ffffffff16565b6000808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a3505050565b6000838311158290610c69576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825283818151815260200191508051906020019080838360005b83811015610c2e578082015181840152602081019050610c13565b50505050905090810190601f168015610c5b5780820380516001836020036101000a031916815260200191505b509250505060405180910390fd5b5060008385039050809150509392505050565b600080828401905083811015610cfa576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252601b8152602001807f536166654d6174683a206164646974696f6e206f766572666c6f77000000000081525060200191505060405180910390fd5b809150509291505056fe45524332303a207472616e7366657220746f20746865207a65726f206164647265737345524332303a20617070726f766520746f20746865207a65726f206164647265737345524332303a207472616e7366657220616d6f756e7420657863656564732062616c616e636545524332303a207472616e7366657220616d6f756e74206578636565647320616c6c6f77616e636545524332303a207472616e736665722066726f6d20746865207a65726f206164647265737345524332303a20617070726f76652066726f6d20746865207a65726f206164647265737345524332303a2064656372656173656420616c6c6f77616e63652062656c6f77207a65726fa265627a7a72315820c7a5ffabf642bda14700b2de42f8c57b36621af020441df825de45fd2b3e1c5c64736f6c63430005100032"; - - async function sendTransaction(context) { - const tx = await context.web3.eth.accounts.signTransaction( - { - from: GENESIS_ACCOUNT, - data: TEST_CONTRACT_BYTECODE, - value: "0x00", - gasPrice: "0x01", - gas: "0x4F930", - }, - GENESIS_ACCOUNT_PRIVATE_KEY - ); - - await customRequest(context.web3, "eth_sendRawTransaction", [tx.rawTransaction]); - return tx; - } - - step("should connect", async function () { - await createAndFinalizeBlock(context.web3); - // @ts-ignore - const connected = context.web3.currentProvider.connected; - expect(connected).to.equal(true); - }); - - step("should subscribe", async function () { - subscription = context.web3.eth.subscribe("newBlockHeaders", function(error, result){}); - - let connected = false; - let subscriptionId = ""; - await new Promise((resolve) => { - subscription.on("connected", function (d: any) { - connected = true; - subscriptionId = d; - resolve(); - }); - }); - - expect(connected).to.equal(true); - expect(subscriptionId).to.have.lengthOf(16); - }); - - step("should get newHeads stream", async function (done) { - await createAndFinalizeBlock(context.web3); - let data = null; - await new Promise((resolve) => { - subscription.on("data", function (d: any) { - data = d; - resolve(); - }); - }); - expect(data).to.include({ - author: '0x0000000000000000000000000000000000000000', - difficulty: '0', - extraData: '0x', - logsBloom: '0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000', - miner: '0x0000000000000000000000000000000000000000', - number: 2, - receiptsRoot: '0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347', - sha3Uncles: '0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347', - stateRoot: '0x0000000000000000000000000000000000000000000000000000000000000000', - transactionsRoot: '0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421' - }); - expect((data as any).sealFields).to.eql([ - "0x0000000000000000000000000000000000000000000000000000000000000000", - "0x0000000000000000", - ]); - setTimeout(done,10000); - }).timeout(20000); - - step("should get newPendingTransactions stream", async function (done) { - subscription = context.web3.eth.subscribe("pendingTransactions", function(error, result){}); - - await new Promise((resolve) => { - subscription.on("connected", function (d: any) { - resolve(); - }); - }); - - const tx = await sendTransaction(context); - let data = null; - await new Promise((resolve) => { - createAndFinalizeBlock(context.web3); - subscription.on("data", function (d: any) { - data = d; - logs_generated += 1; - resolve(); - }); - }); - subscription.unsubscribe(); - - expect(data).to.be.not.null; - expect(tx["transactionHash"]).to.be.eq(data); - setTimeout(done,10000); - }).timeout(20000); - - step("should subscribe to all logs", async function (done) { - subscription = context.web3.eth.subscribe("logs", {}, function(error, result){}); - - await new Promise((resolve) => { - subscription.on("connected", function (d: any) { - resolve(); - }); - }); - - const tx = await sendTransaction(context); - let data = null; - await new Promise((resolve) => { - createAndFinalizeBlock(context.web3); - subscription.on("data", function (d: any) { - data = d; - logs_generated += 1; - resolve(); - }); - }); - subscription.unsubscribe(); - - const block = await context.web3.eth.getBlock("latest"); - expect(data).to.include({ - blockHash: block.hash, - blockNumber: block.number, - data: '0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff', - logIndex: 0, - removed: false, - transactionHash: block.transactions[0], - transactionIndex: 0, - transactionLogIndex: '0x0' - }); - setTimeout(done,10000); - }).timeout(20000); - - step("should subscribe to logs by address", async function (done) { - subscription = context.web3.eth.subscribe("logs", { - address: "0x42e2EE7Ba8975c473157634Ac2AF4098190fc741" - }, function(error, result){}); - - await new Promise((resolve) => { - subscription.on("connected", function (d: any) { - resolve(); - }); - }); - - const tx = await sendTransaction(context); - let data = null; - await new Promise((resolve) => { - createAndFinalizeBlock(context.web3); - subscription.on("data", function (d: any) { - data = d; - logs_generated += 1; - resolve(); - }); - }); - subscription.unsubscribe(); - - expect(data).to.not.be.null; - setTimeout(done,10000); - }).timeout(20000); - - step("should subscribe to logs by topic", async function (done) { - subscription = context.web3.eth.subscribe("logs", { - topics: ["0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef"] - }, function(error, result){}); - - await new Promise((resolve) => { - subscription.on("connected", function (d: any) { - resolve(); - }); - }); - - const tx = await sendTransaction(context); - let data = null; - await new Promise((resolve) => { - createAndFinalizeBlock(context.web3); - subscription.on("data", function (d: any) { - data = d; - logs_generated += 1; - resolve(); - }); - }); - subscription.unsubscribe(); - - expect(data).to.not.be.null; - setTimeout(done,10000); - }).timeout(20000); - - step("should get past events on subscription", async function (done) { - subscription = context.web3.eth.subscribe("logs", { - fromBlock: "0x0" - }, function(error, result){}); - - let data = []; - await new Promise((resolve) => { - subscription.on("data", function (d: any) { - data.push(d); - if (data.length == logs_generated) { - resolve(); - } - }); - }); - - expect(data).to.not.be.empty; - setTimeout(done,10000); - }).timeout(20000); - - step("should support topic wildcards", async function (done) { - subscription = context.web3.eth.subscribe("logs", { - topics: [ - null, - "0x0000000000000000000000000000000000000000000000000000000000000000" - ] - }, function(error, result){}); - - await new Promise((resolve) => { - subscription.on("connected", function (d: any) { - resolve(); - }); - }); - - const tx = await sendTransaction(context); - let data = null; - await new Promise((resolve) => { - createAndFinalizeBlock(context.web3); - subscription.on("data", function (d: any) { - data = d; - logs_generated += 1; - resolve(); - }); - }); - subscription.unsubscribe(); - - expect(data).to.not.be.null; - setTimeout(done,10000); - }).timeout(20000); - - step("should support single values wrapped around a sequence", async function (done) { - subscription = context.web3.eth.subscribe("logs", { - topics: [ - ["0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef"], - ["0x0000000000000000000000000000000000000000000000000000000000000000"] - ] - }, function(error, result){}); - - await new Promise((resolve) => { - subscription.on("connected", function (d: any) { - resolve(); - }); - }); - - const tx = await sendTransaction(context); - let data = null; - await new Promise((resolve) => { - createAndFinalizeBlock(context.web3); - subscription.on("data", function (d: any) { - data = d; - logs_generated += 1; - resolve(); - }); - }); - subscription.unsubscribe(); - - expect(data).to.not.be.null; - setTimeout(done,10000); - }).timeout(20000); - - step("should support topic conditional parameters", async function (done) { - subscription = context.web3.eth.subscribe("logs", { - topics: [ - "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef", - [ - "0x0000000000000000000000006be02d1d3665660d22ff9624b7be0551ee1ac91b", - "0x0000000000000000000000000000000000000000000000000000000000000000" - ] - ] - }, function(error, result){}); - - await new Promise((resolve) => { - subscription.on("connected", function (d: any) { - resolve(); - }); - }); - - const tx = await sendTransaction(context); - let data = null; - await new Promise((resolve) => { - createAndFinalizeBlock(context.web3); - subscription.on("data", function (d: any) { - data = d; - logs_generated += 1; - resolve(); - }); - }); - subscription.unsubscribe(); - - expect(data).to.not.be.null; - setTimeout(done,10000); - }).timeout(20000); - - step("should support multiple topic conditional parameters", async function (done) { - subscription = context.web3.eth.subscribe("logs", { - topics: [ - "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef", - [ - "0x0000000000000000000000000000000000000000000000000000000000000000", - "0x0000000000000000000000006be02d1d3665660d22ff9624b7be0551ee1ac91b" - ], - [ - "0x0000000000000000000000006be02d1d3665660d22ff9624b7be0551ee1ac91b", - "0x0000000000000000000000000000000000000000000000000000000000000000" - ] - ] - }, function(error, result){}); - - await new Promise((resolve) => { - subscription.on("connected", function (d: any) { - resolve(); - }); - }); - - const tx = await sendTransaction(context); - let data = null; - await new Promise((resolve) => { - createAndFinalizeBlock(context.web3); - subscription.on("data", function (d: any) { - data = d; - logs_generated += 1; - resolve(); - }); - }); - subscription.unsubscribe(); - - expect(data).to.not.be.null; - setTimeout(done,10000); - }).timeout(20000); - - step("should combine topic wildcards and conditional parameters", async function (done) { - subscription = context.web3.eth.subscribe("logs", { - topics: [ - null, - [ - "0x0000000000000000000000006be02d1d3665660d22ff9624b7be0551ee1ac91b", - "0x0000000000000000000000000000000000000000000000000000000000000000" - ], - null - ] - }, function(error, result){}); - - await new Promise((resolve) => { - subscription.on("connected", function (d: any) { - resolve(); - }); - }); - - const tx = await sendTransaction(context); - let data = null; - await new Promise((resolve) => { - createAndFinalizeBlock(context.web3); - subscription.on("data", function (d: any) { - data = d; - logs_generated += 1; - resolve(); - }); - }); - subscription.unsubscribe(); - - expect(data).to.not.be.null; - setTimeout(done,10000); - }).timeout(20000); -}, "ws"); \ No newline at end of file + let subscription; + let logs_generated = 0; + + const GENESIS_ACCOUNT = "0x6be02d1d3665660d22ff9624b7be0551ee1ac91b"; + const GENESIS_ACCOUNT_PRIVATE_KEY = + "0x99B3C12287537E38C90A9219D4CB074A89A16E9CDB20BF85728EBD97C343E342"; + + const TEST_CONTRACT_BYTECODE = + "0x608060405234801561001057600080fd5b50610041337fffffffffffffffffffffffffffffffffffffffffff" + + "ffffffffffffffffffffff61004660201b60201c565b610291565b600073ffffffffffffffffffffffffffffff" + + "ffffffffff168273ffffffffffffffffffffffffffffffffffffffff1614156100e9576040517f08c379a00000" + + "0000000000000000000000000000000000000000000000000000815260040180806020018281038252601f8152" + + "602001807f45524332303a206d696e7420746f20746865207a65726f2061646472657373008152506020019150" + + "5060405180910390fd5b6101028160025461020960201b610c7c1790919060201c565b60028190555061015d81" + + "6000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffff" + + "ffff1681526020019081526020016000205461020960201b610c7c1790919060201c565b6000808473ffffffff" + + "ffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190" + + "8152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff16600073ffffffffffffff" + + "ffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523" + + "b3ef836040518082815260200191505060405180910390a35050565b6000808284019050838110156102875760" + + "40517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001" + + "8281038252601b8152602001807f536166654d6174683a206164646974696f6e206f766572666c6f7700000000" + + "0081525060200191505060405180910390fd5b8091505092915050565b610e3a806102a06000396000f3fe6080" + + "60405234801561001057600080fd5b50600436106100885760003560e01c806370a082311161005b57806370a0" + + "8231146101fd578063a457c2d714610255578063a9059cbb146102bb578063dd62ed3e1461032157610088565b" + + "8063095ea7b31461008d57806318160ddd146100f357806323b872dd146101115780633950935114610197575b" + + "600080fd5b6100d9600480360360408110156100a357600080fd5b81019080803573ffffffffffffffffffffff" + + "ffffffffffffffffff16906020019092919080359060200190929190505050610399565b604051808215151515" + + "815260200191505060405180910390f35b6100fb6103b7565b6040518082815260200191505060405180910390" + + "f35b61017d6004803603606081101561012757600080fd5b81019080803573ffffffffffffffffffffffffffff" + + "ffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff16906020019092" + + "9190803590602001909291905050506103c1565b604051808215151515815260200191505060405180910390f3" + + "5b6101e3600480360360408110156101ad57600080fd5b81019080803573ffffffffffffffffffffffffffffff" + + "ffffffffff1690602001909291908035906020019092919050505061049a565b60405180821515151581526020" + + "0191505060405180910390f35b61023f6004803603602081101561021357600080fd5b81019080803573ffffff" + + "ffffffffffffffffffffffffffffffffff16906020019092919050505061054d565b6040518082815260200191" + + "505060405180910390f35b6102a16004803603604081101561026b57600080fd5b81019080803573ffffffffff" + + "ffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610595565b604051" + + "808215151515815260200191505060405180910390f35b610307600480360360408110156102d157600080fd5b" + + "81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803590602001909291" + + "90505050610662565b604051808215151515815260200191505060405180910390f35b61038360048036036040" + + "81101561033757600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190" + + "929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610680565b6040" + + "518082815260200191505060405180910390f35b60006103ad6103a6610707565b848461070f565b6001905092" + + "915050565b6000600254905090565b60006103ce848484610906565b61048f846103da610707565b61048a8560" + + "4051806060016040528060288152602001610d7060289139600160008b73ffffffffffffffffffffffffffffff" + + "ffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600061" + + "0440610707565b73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffff" + + "ffffffffff16815260200190815260200160002054610bbc9092919063ffffffff16565b61070f565b60019050" + + "9392505050565b60006105436104a7610707565b8461053e85600160006104b8610707565b73ffffffffffffff" + + "ffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260" + + "200160002060008973ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffff" + + "ffffffffffff16815260200190815260200160002054610c7c90919063ffffffff16565b61070f565b60019050" + + "92915050565b60008060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffff" + + "ffffffffffffffffffff168152602001908152602001600020549050919050565b60006106586105a261070756" + + "5b8461065385604051806060016040528060258152602001610de160259139600160006105cc610707565b73ff" + + "ffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260" + + "200190815260200160002060008a73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffff" + + "ffffffffffffffffffffffff16815260200190815260200160002054610bbc9092919063ffffffff16565b6107" + + "0f565b6001905092915050565b600061067661066f610707565b8484610906565b6001905092915050565b6000" + + "600160008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffff" + + "ffffff16815260200190815260200160002060008373ffffffffffffffffffffffffffffffffffffffff1673ff" + + "ffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054905092915050565b6000" + + "33905090565b600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffff" + + "ffffffffffffff161415610795576040517f08c379a00000000000000000000000000000000000000000000000" + + "00000000008152600401808060200182810382526024815260200180610dbd6024913960400191505060405180" + + "910390fd5b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffff" + + "ffffffffffff16141561081b576040517f08c379a0000000000000000000000000000000000000000000000000" + + "000000008152600401808060200182810382526022815260200180610d28602291396040019150506040518091" + + "0390fd5b80600160008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffff" + + "ffffffffffffffff16815260200190815260200160002060008473ffffffffffffffffffffffffffffffffffff" + + "ffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173" + + "ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff167f" + + "8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b92583604051808281526020019150" + + "5060405180910390a3505050565b600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffff" + + "ffffffffffffffffffffffffffffff16141561098c576040517f08c379a0000000000000000000000000000000" + + "000000000000000000000000008152600401808060200182810382526025815260200180610d98602591396040" + + "0191505060405180910390fd5b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffff" + + "ffffffffffffffffffffffffffff161415610a12576040517f08c379a000000000000000000000000000000000" + + "0000000000000000000000008152600401808060200182810382526023815260200180610d0560239139604001" + + "91505060405180910390fd5b610a7d81604051806060016040528060268152602001610d4a6026913960008087" + + "73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681" + + "5260200190815260200160002054610bbc9092919063ffffffff16565b6000808573ffffffffffffffffffffff" + + "ffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000" + + "2081905550610b10816000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffff" + + "ffffffffffffffffffffff16815260200190815260200160002054610c7c90919063ffffffff16565b60008084" + + "73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681" + + "52602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff168373ffffff" + + "ffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f5" + + "5a4df523b3ef836040518082815260200191505060405180910390a3505050565b6000838311158290610c6957" + + "6040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020" + + "01828103825283818151815260200191508051906020019080838360005b83811015610c2e5780820151818401" + + "52602081019050610c13565b50505050905090810190601f168015610c5b578082038051600183602003610100" + + "0a031916815260200191505b509250505060405180910390fd5b5060008385039050809150509392505050565b" + + "600080828401905083811015610cfa576040517f08c379a0000000000000000000000000000000000000000000" + + "00000000000000815260040180806020018281038252601b8152602001807f536166654d6174683a2061646469" + + "74696f6e206f766572666c6f77000000000081525060200191505060405180910390fd5b809150509291505056" + + "fe45524332303a207472616e7366657220746f20746865207a65726f206164647265737345524332303a206170" + + "70726f766520746f20746865207a65726f206164647265737345524332303a207472616e7366657220616d6f75" + + "6e7420657863656564732062616c616e636545524332303a207472616e7366657220616d6f756e742065786365" + + "65647320616c6c6f77616e636545524332303a207472616e736665722066726f6d20746865207a65726f206164" + + "647265737345524332303a20617070726f76652066726f6d20746865207a65726f206164647265737345524332" + + "303a2064656372656173656420616c6c6f77616e63652062656c6f77207a65726fa265627a7a72315820c7a5ff" + + "abf642bda14700b2de42f8c57b36621af020441df825de45fd2b3e1c5c64736f6c63430005100032"; + async function sendTransaction(context) { + const tx = await context.web3.eth.accounts.signTransaction( + { + from: GENESIS_ACCOUNT, + data: TEST_CONTRACT_BYTECODE, + value: "0x00", + gasPrice: "0x01", + gas: "0x4F930", + }, + GENESIS_ACCOUNT_PRIVATE_KEY + ); + await customRequest(context.web3, "eth_sendRawTransaction", [tx.rawTransaction]); + return tx; + } + + step("should connect", async function () { + await createAndFinalizeBlock(context.web3); + // @ts-ignore + const connected = context.web3.currentProvider.connected; + expect(connected).to.equal(true); + }); + + step("should subscribe", async function () { + subscription = context.web3.eth.subscribe("newBlockHeaders", function(error, result){}); + + let connected = false; + let subscriptionId = ""; + await new Promise((resolve) => { + subscription.on("connected", function (d: any) { + connected = true; + subscriptionId = d; + resolve(); + }); + }); + + expect(connected).to.equal(true); + expect(subscriptionId).to.have.lengthOf(16); + }); + + step("should get newHeads stream", async function (done) { + await createAndFinalizeBlock(context.web3); + let data = null; + await new Promise((resolve) => { + subscription.on("data", function (d: any) { + data = d; + resolve(); + }); + }); + expect(data).to.include({ + author: '0x0000000000000000000000000000000000000000', + difficulty: '0', + extraData: '0x', + logsBloom: `0x${"0".repeat(512)}`,, + miner: '0x0000000000000000000000000000000000000000', + number: 2, + receiptsRoot: '0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347', + sha3Uncles: '0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347', + stateRoot: '0x0000000000000000000000000000000000000000000000000000000000000000', + transactionsRoot: '0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421' + }); + expect((data as any).sealFields).to.eql([ + "0x0000000000000000000000000000000000000000000000000000000000000000", + "0x0000000000000000", + ]); + setTimeout(done,10000); + }).timeout(20000); + + step("should get newPendingTransactions stream", async function (done) { + subscription = context.web3.eth.subscribe("pendingTransactions", function(error, result){}); + + await new Promise((resolve) => { + subscription.on("connected", function (d: any) { + resolve(); + }); + }); + + const tx = await sendTransaction(context); + let data = null; + await new Promise((resolve) => { + createAndFinalizeBlock(context.web3); + subscription.on("data", function (d: any) { + data = d; + logs_generated += 1; + resolve(); + }); + }); + subscription.unsubscribe(); + + expect(data).to.be.not.null; + expect(tx["transactionHash"]).to.be.eq(data); + setTimeout(done,10000); + }).timeout(20000); + + step("should subscribe to all logs", async function (done) { + subscription = context.web3.eth.subscribe("logs", {}, function(error, result){}); + + await new Promise((resolve) => { + subscription.on("connected", function (d: any) { + resolve(); + }); + }); + + const tx = await sendTransaction(context); + let data = null; + await new Promise((resolve) => { + createAndFinalizeBlock(context.web3); + subscription.on("data", function (d: any) { + data = d; + logs_generated += 1; + resolve(); + }); + }); + subscription.unsubscribe(); + + const block = await context.web3.eth.getBlock("latest"); + expect(data).to.include({ + blockHash: block.hash, + blockNumber: block.number, + data: '0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff', + logIndex: 0, + removed: false, + transactionHash: block.transactions[0], + transactionIndex: 0, + transactionLogIndex: '0x0' + }); + setTimeout(done,10000); + }).timeout(20000); + + step("should subscribe to logs by address", async function (done) { + subscription = context.web3.eth.subscribe("logs", { + address: "0x42e2EE7Ba8975c473157634Ac2AF4098190fc741" + }, function(error, result){}); + + await new Promise((resolve) => { + subscription.on("connected", function (d: any) { + resolve(); + }); + }); + + const tx = await sendTransaction(context); + let data = null; + await new Promise((resolve) => { + createAndFinalizeBlock(context.web3); + subscription.on("data", function (d: any) { + data = d; + logs_generated += 1; + resolve(); + }); + }); + subscription.unsubscribe(); + + expect(data).to.not.be.null; + setTimeout(done,10000); + }).timeout(20000); + + step("should subscribe to logs by topic", async function (done) { + subscription = context.web3.eth.subscribe("logs", { + topics: ["0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef"] + }, function(error, result){}); + + await new Promise((resolve) => { + subscription.on("connected", function (d: any) { + resolve(); + }); + }); + + const tx = await sendTransaction(context); + let data = null; + await new Promise((resolve) => { + createAndFinalizeBlock(context.web3); + subscription.on("data", function (d: any) { + data = d; + logs_generated += 1; + resolve(); + }); + }); + subscription.unsubscribe(); + + expect(data).to.not.be.null; + setTimeout(done,10000); + }).timeout(20000); + + step("should get past events on subscription", async function (done) { + subscription = context.web3.eth.subscribe("logs", { + fromBlock: "0x0" + }, function(error, result){}); + + let data = []; + await new Promise((resolve) => { + subscription.on("data", function (d: any) { + data.push(d); + if (data.length == logs_generated) { + resolve(); + } + }); + }); + + expect(data).to.not.be.empty; + setTimeout(done,10000); + }).timeout(20000); + + step("should support topic wildcards", async function (done) { + subscription = context.web3.eth.subscribe("logs", { + topics: [ + null, + "0x0000000000000000000000000000000000000000000000000000000000000000" + ] + }, function(error, result){}); + + await new Promise((resolve) => { + subscription.on("connected", function (d: any) { + resolve(); + }); + }); + + const tx = await sendTransaction(context); + let data = null; + await new Promise((resolve) => { + createAndFinalizeBlock(context.web3); + subscription.on("data", function (d: any) { + data = d; + logs_generated += 1; + resolve(); + }); + }); + subscription.unsubscribe(); + + expect(data).to.not.be.null; + setTimeout(done,10000); + }).timeout(20000); + + step("should support single values wrapped around a sequence", async function (done) { + subscription = context.web3.eth.subscribe("logs", { + topics: [ + ["0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef"], + ["0x0000000000000000000000000000000000000000000000000000000000000000"] + ] + }, function(error, result){}); + + await new Promise((resolve) => { + subscription.on("connected", function (d: any) { + resolve(); + }); + }); + + const tx = await sendTransaction(context); + let data = null; + await new Promise((resolve) => { + createAndFinalizeBlock(context.web3); + subscription.on("data", function (d: any) { + data = d; + logs_generated += 1; + resolve(); + }); + }); + subscription.unsubscribe(); + + expect(data).to.not.be.null; + setTimeout(done,10000); + }).timeout(20000); + + step("should support topic conditional parameters", async function (done) { + subscription = context.web3.eth.subscribe("logs", { + topics: [ + "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef", + [ + "0x0000000000000000000000006be02d1d3665660d22ff9624b7be0551ee1ac91b", + "0x0000000000000000000000000000000000000000000000000000000000000000" + ] + ] + }, function(error, result){}); + + await new Promise((resolve) => { + subscription.on("connected", function (d: any) { + resolve(); + }); + }); + + const tx = await sendTransaction(context); + let data = null; + await new Promise((resolve) => { + createAndFinalizeBlock(context.web3); + subscription.on("data", function (d: any) { + data = d; + logs_generated += 1; + resolve(); + }); + }); + subscription.unsubscribe(); + + expect(data).to.not.be.null; + setTimeout(done,10000); + }).timeout(20000); + + step("should support multiple topic conditional parameters", async function (done) { + subscription = context.web3.eth.subscribe("logs", { + topics: [ + "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef", + [ + "0x0000000000000000000000000000000000000000000000000000000000000000", + "0x0000000000000000000000006be02d1d3665660d22ff9624b7be0551ee1ac91b" + ], + [ + "0x0000000000000000000000006be02d1d3665660d22ff9624b7be0551ee1ac91b", + "0x0000000000000000000000000000000000000000000000000000000000000000" + ] + ] + }, function(error, result){}); + + await new Promise((resolve) => { + subscription.on("connected", function (d: any) { + resolve(); + }); + }); + + const tx = await sendTransaction(context); + let data = null; + await new Promise((resolve) => { + createAndFinalizeBlock(context.web3); + subscription.on("data", function (d: any) { + data = d; + logs_generated += 1; + resolve(); + }); + }); + subscription.unsubscribe(); + + expect(data).to.not.be.null; + setTimeout(done,10000); + }).timeout(20000); + + step("should combine topic wildcards and conditional parameters", async function (done) { + subscription = context.web3.eth.subscribe("logs", { + topics: [ + null, + [ + "0x0000000000000000000000006be02d1d3665660d22ff9624b7be0551ee1ac91b", + "0x0000000000000000000000000000000000000000000000000000000000000000" + ], + null + ] + }, function(error, result){}); + + await new Promise((resolve) => { + subscription.on("connected", function (d: any) { + resolve(); + }); + }); + + const tx = await sendTransaction(context); + let data = null; + await new Promise((resolve) => { + createAndFinalizeBlock(context.web3); + subscription.on("data", function (d: any) { + data = d; + logs_generated += 1; + resolve(); + }); + }); + subscription.unsubscribe(); + + expect(data).to.not.be.null; + setTimeout(done,10000); + }).timeout(20000); +}, "ws"); diff --git a/tests/tests/util.ts b/tests/tests/util.ts index db03dfeab2..7e623f64e0 100644 --- a/tests/tests/util.ts +++ b/tests/tests/util.ts @@ -50,9 +50,9 @@ export async function startMoonbeamNode( specFilename: string, provider?: string ): Promise<{ web3: Web3; binary: ChildProcess }> { var web3; - if (!provider || provider == 'http') { - web3 = new Web3(`http://localhost:${RPC_PORT}`); - } + if (!provider || provider == 'http') { + web3 = new Web3(`http://localhost:${RPC_PORT}`); + } const cmd = BINARY_PATH; const args = [ @@ -100,9 +100,9 @@ export async function startMoonbeamNode( binaryLogs.push(chunk); if (chunk.toString().match(/Manual Seal Ready/)) { if (!provider || provider == "http") { - // This is needed as the EVM runtime needs to warmup with a first call - await web3.eth.getChainId(); - } + // This is needed as the EVM runtime needs to warmup with a first call + await web3.eth.getChainId(); + } clearTimeout(timer); if (!DISPLAY_LOG) { @@ -117,9 +117,9 @@ export async function startMoonbeamNode( binary.stdout.on("data", onData); }); - if (provider == 'ws') { - web3 = new Web3(`ws://localhost:${WS_PORT}`); - } + if (provider == 'ws') { + web3 = new Web3(`ws://localhost:${WS_PORT}`); + } return { web3, binary }; } From 64978075fda00a62a6616a993d3c92e7ab9868bc Mon Sep 17 00:00:00 2001 From: tgmichel Date: Tue, 10 Nov 2020 11:56:08 +0100 Subject: [PATCH 10/17] Prettier format --- tests/tests/test-subscription.ts | 813 ++++++++++++++++--------------- tests/tests/util.ts | 24 +- 2 files changed, 436 insertions(+), 401 deletions(-) diff --git a/tests/tests/test-subscription.ts b/tests/tests/test-subscription.ts index 7b8649a10e..fe9d029031 100644 --- a/tests/tests/test-subscription.ts +++ b/tests/tests/test-subscription.ts @@ -3,474 +3,507 @@ import { step } from "mocha-steps"; import { createAndFinalizeBlock, customRequest, describeWithMoonbeam } from "./util"; -describeWithMoonbeam("Frontier RPC (Subscription)", `simple-specs.json`, (context) => { - +describeWithMoonbeam( + "Frontier RPC (Subscription)", + `simple-specs.json`, + (context) => { let subscription; let logs_generated = 0; const GENESIS_ACCOUNT = "0x6be02d1d3665660d22ff9624b7be0551ee1ac91b"; const GENESIS_ACCOUNT_PRIVATE_KEY = - "0x99B3C12287537E38C90A9219D4CB074A89A16E9CDB20BF85728EBD97C343E342"; + "0x99B3C12287537E38C90A9219D4CB074A89A16E9CDB20BF85728EBD97C343E342"; const TEST_CONTRACT_BYTECODE = - "0x608060405234801561001057600080fd5b50610041337fffffffffffffffffffffffffffffffffffffffffff" + - "ffffffffffffffffffffff61004660201b60201c565b610291565b600073ffffffffffffffffffffffffffffff" + - "ffffffffff168273ffffffffffffffffffffffffffffffffffffffff1614156100e9576040517f08c379a00000" + - "0000000000000000000000000000000000000000000000000000815260040180806020018281038252601f8152" + - "602001807f45524332303a206d696e7420746f20746865207a65726f2061646472657373008152506020019150" + - "5060405180910390fd5b6101028160025461020960201b610c7c1790919060201c565b60028190555061015d81" + - "6000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffff" + - "ffff1681526020019081526020016000205461020960201b610c7c1790919060201c565b6000808473ffffffff" + - "ffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190" + - "8152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff16600073ffffffffffffff" + - "ffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523" + - "b3ef836040518082815260200191505060405180910390a35050565b6000808284019050838110156102875760" + - "40517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001" + - "8281038252601b8152602001807f536166654d6174683a206164646974696f6e206f766572666c6f7700000000" + - "0081525060200191505060405180910390fd5b8091505092915050565b610e3a806102a06000396000f3fe6080" + - "60405234801561001057600080fd5b50600436106100885760003560e01c806370a082311161005b57806370a0" + - "8231146101fd578063a457c2d714610255578063a9059cbb146102bb578063dd62ed3e1461032157610088565b" + - "8063095ea7b31461008d57806318160ddd146100f357806323b872dd146101115780633950935114610197575b" + - "600080fd5b6100d9600480360360408110156100a357600080fd5b81019080803573ffffffffffffffffffffff" + - "ffffffffffffffffff16906020019092919080359060200190929190505050610399565b604051808215151515" + - "815260200191505060405180910390f35b6100fb6103b7565b6040518082815260200191505060405180910390" + - "f35b61017d6004803603606081101561012757600080fd5b81019080803573ffffffffffffffffffffffffffff" + - "ffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff16906020019092" + - "9190803590602001909291905050506103c1565b604051808215151515815260200191505060405180910390f3" + - "5b6101e3600480360360408110156101ad57600080fd5b81019080803573ffffffffffffffffffffffffffffff" + - "ffffffffff1690602001909291908035906020019092919050505061049a565b60405180821515151581526020" + - "0191505060405180910390f35b61023f6004803603602081101561021357600080fd5b81019080803573ffffff" + - "ffffffffffffffffffffffffffffffffff16906020019092919050505061054d565b6040518082815260200191" + - "505060405180910390f35b6102a16004803603604081101561026b57600080fd5b81019080803573ffffffffff" + - "ffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610595565b604051" + - "808215151515815260200191505060405180910390f35b610307600480360360408110156102d157600080fd5b" + - "81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803590602001909291" + - "90505050610662565b604051808215151515815260200191505060405180910390f35b61038360048036036040" + - "81101561033757600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190" + - "929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610680565b6040" + - "518082815260200191505060405180910390f35b60006103ad6103a6610707565b848461070f565b6001905092" + - "915050565b6000600254905090565b60006103ce848484610906565b61048f846103da610707565b61048a8560" + - "4051806060016040528060288152602001610d7060289139600160008b73ffffffffffffffffffffffffffffff" + - "ffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600061" + - "0440610707565b73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffff" + - "ffffffffff16815260200190815260200160002054610bbc9092919063ffffffff16565b61070f565b60019050" + - "9392505050565b60006105436104a7610707565b8461053e85600160006104b8610707565b73ffffffffffffff" + - "ffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260" + - "200160002060008973ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffff" + - "ffffffffffff16815260200190815260200160002054610c7c90919063ffffffff16565b61070f565b60019050" + - "92915050565b60008060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffff" + - "ffffffffffffffffffff168152602001908152602001600020549050919050565b60006106586105a261070756" + - "5b8461065385604051806060016040528060258152602001610de160259139600160006105cc610707565b73ff" + - "ffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260" + - "200190815260200160002060008a73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffff" + - "ffffffffffffffffffffffff16815260200190815260200160002054610bbc9092919063ffffffff16565b6107" + - "0f565b6001905092915050565b600061067661066f610707565b8484610906565b6001905092915050565b6000" + - "600160008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffff" + - "ffffff16815260200190815260200160002060008373ffffffffffffffffffffffffffffffffffffffff1673ff" + - "ffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054905092915050565b6000" + - "33905090565b600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffff" + - "ffffffffffffff161415610795576040517f08c379a00000000000000000000000000000000000000000000000" + - "00000000008152600401808060200182810382526024815260200180610dbd6024913960400191505060405180" + - "910390fd5b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffff" + - "ffffffffffff16141561081b576040517f08c379a0000000000000000000000000000000000000000000000000" + - "000000008152600401808060200182810382526022815260200180610d28602291396040019150506040518091" + - "0390fd5b80600160008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffff" + - "ffffffffffffffff16815260200190815260200160002060008473ffffffffffffffffffffffffffffffffffff" + - "ffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173" + - "ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff167f" + - "8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b92583604051808281526020019150" + - "5060405180910390a3505050565b600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffff" + - "ffffffffffffffffffffffffffffff16141561098c576040517f08c379a0000000000000000000000000000000" + - "000000000000000000000000008152600401808060200182810382526025815260200180610d98602591396040" + - "0191505060405180910390fd5b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffff" + - "ffffffffffffffffffffffffffff161415610a12576040517f08c379a000000000000000000000000000000000" + - "0000000000000000000000008152600401808060200182810382526023815260200180610d0560239139604001" + - "91505060405180910390fd5b610a7d81604051806060016040528060268152602001610d4a6026913960008087" + - "73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681" + - "5260200190815260200160002054610bbc9092919063ffffffff16565b6000808573ffffffffffffffffffffff" + - "ffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000" + - "2081905550610b10816000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffff" + - "ffffffffffffffffffffff16815260200190815260200160002054610c7c90919063ffffffff16565b60008084" + - "73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681" + - "52602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff168373ffffff" + - "ffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f5" + - "5a4df523b3ef836040518082815260200191505060405180910390a3505050565b6000838311158290610c6957" + - "6040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020" + - "01828103825283818151815260200191508051906020019080838360005b83811015610c2e5780820151818401" + - "52602081019050610c13565b50505050905090810190601f168015610c5b578082038051600183602003610100" + - "0a031916815260200191505b509250505060405180910390fd5b5060008385039050809150509392505050565b" + - "600080828401905083811015610cfa576040517f08c379a0000000000000000000000000000000000000000000" + - "00000000000000815260040180806020018281038252601b8152602001807f536166654d6174683a2061646469" + - "74696f6e206f766572666c6f77000000000081525060200191505060405180910390fd5b809150509291505056" + - "fe45524332303a207472616e7366657220746f20746865207a65726f206164647265737345524332303a206170" + - "70726f766520746f20746865207a65726f206164647265737345524332303a207472616e7366657220616d6f75" + - "6e7420657863656564732062616c616e636545524332303a207472616e7366657220616d6f756e742065786365" + - "65647320616c6c6f77616e636545524332303a207472616e736665722066726f6d20746865207a65726f206164" + - "647265737345524332303a20617070726f76652066726f6d20746865207a65726f206164647265737345524332" + - "303a2064656372656173656420616c6c6f77616e63652062656c6f77207a65726fa265627a7a72315820c7a5ff" + - "abf642bda14700b2de42f8c57b36621af020441df825de45fd2b3e1c5c64736f6c63430005100032"; + "0x608060405234801561001057600080fd5b50610041337fffffffffffffffffffffffffffffffffffffffffff" + + "ffffffffffffffffffffff61004660201b60201c565b610291565b600073ffffffffffffffffffffffffffffff" + + "ffffffffff168273ffffffffffffffffffffffffffffffffffffffff1614156100e9576040517f08c379a00000" + + "0000000000000000000000000000000000000000000000000000815260040180806020018281038252601f8152" + + "602001807f45524332303a206d696e7420746f20746865207a65726f2061646472657373008152506020019150" + + "5060405180910390fd5b6101028160025461020960201b610c7c1790919060201c565b60028190555061015d81" + + "6000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffff" + + "ffff1681526020019081526020016000205461020960201b610c7c1790919060201c565b6000808473ffffffff" + + "ffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190" + + "8152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff16600073ffffffffffffff" + + "ffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523" + + "b3ef836040518082815260200191505060405180910390a35050565b6000808284019050838110156102875760" + + "40517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001" + + "8281038252601b8152602001807f536166654d6174683a206164646974696f6e206f766572666c6f7700000000" + + "0081525060200191505060405180910390fd5b8091505092915050565b610e3a806102a06000396000f3fe6080" + + "60405234801561001057600080fd5b50600436106100885760003560e01c806370a082311161005b57806370a0" + + "8231146101fd578063a457c2d714610255578063a9059cbb146102bb578063dd62ed3e1461032157610088565b" + + "8063095ea7b31461008d57806318160ddd146100f357806323b872dd146101115780633950935114610197575b" + + "600080fd5b6100d9600480360360408110156100a357600080fd5b81019080803573ffffffffffffffffffffff" + + "ffffffffffffffffff16906020019092919080359060200190929190505050610399565b604051808215151515" + + "815260200191505060405180910390f35b6100fb6103b7565b6040518082815260200191505060405180910390" + + "f35b61017d6004803603606081101561012757600080fd5b81019080803573ffffffffffffffffffffffffffff" + + "ffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff16906020019092" + + "9190803590602001909291905050506103c1565b604051808215151515815260200191505060405180910390f3" + + "5b6101e3600480360360408110156101ad57600080fd5b81019080803573ffffffffffffffffffffffffffffff" + + "ffffffffff1690602001909291908035906020019092919050505061049a565b60405180821515151581526020" + + "0191505060405180910390f35b61023f6004803603602081101561021357600080fd5b81019080803573ffffff" + + "ffffffffffffffffffffffffffffffffff16906020019092919050505061054d565b6040518082815260200191" + + "505060405180910390f35b6102a16004803603604081101561026b57600080fd5b81019080803573ffffffffff" + + "ffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610595565b604051" + + "808215151515815260200191505060405180910390f35b610307600480360360408110156102d157600080fd5b" + + "81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803590602001909291" + + "90505050610662565b604051808215151515815260200191505060405180910390f35b61038360048036036040" + + "81101561033757600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190" + + "929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610680565b6040" + + "518082815260200191505060405180910390f35b60006103ad6103a6610707565b848461070f565b6001905092" + + "915050565b6000600254905090565b60006103ce848484610906565b61048f846103da610707565b61048a8560" + + "4051806060016040528060288152602001610d7060289139600160008b73ffffffffffffffffffffffffffffff" + + "ffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600061" + + "0440610707565b73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffff" + + "ffffffffff16815260200190815260200160002054610bbc9092919063ffffffff16565b61070f565b60019050" + + "9392505050565b60006105436104a7610707565b8461053e85600160006104b8610707565b73ffffffffffffff" + + "ffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260" + + "200160002060008973ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffff" + + "ffffffffffff16815260200190815260200160002054610c7c90919063ffffffff16565b61070f565b60019050" + + "92915050565b60008060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffff" + + "ffffffffffffffffffff168152602001908152602001600020549050919050565b60006106586105a261070756" + + "5b8461065385604051806060016040528060258152602001610de160259139600160006105cc610707565b73ff" + + "ffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260" + + "200190815260200160002060008a73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffff" + + "ffffffffffffffffffffffff16815260200190815260200160002054610bbc9092919063ffffffff16565b6107" + + "0f565b6001905092915050565b600061067661066f610707565b8484610906565b6001905092915050565b6000" + + "600160008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffff" + + "ffffff16815260200190815260200160002060008373ffffffffffffffffffffffffffffffffffffffff1673ff" + + "ffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054905092915050565b6000" + + "33905090565b600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffff" + + "ffffffffffffff161415610795576040517f08c379a00000000000000000000000000000000000000000000000" + + "00000000008152600401808060200182810382526024815260200180610dbd6024913960400191505060405180" + + "910390fd5b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffff" + + "ffffffffffff16141561081b576040517f08c379a0000000000000000000000000000000000000000000000000" + + "000000008152600401808060200182810382526022815260200180610d28602291396040019150506040518091" + + "0390fd5b80600160008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffff" + + "ffffffffffffffff16815260200190815260200160002060008473ffffffffffffffffffffffffffffffffffff" + + "ffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173" + + "ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff167f" + + "8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b92583604051808281526020019150" + + "5060405180910390a3505050565b600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffff" + + "ffffffffffffffffffffffffffffff16141561098c576040517f08c379a0000000000000000000000000000000" + + "000000000000000000000000008152600401808060200182810382526025815260200180610d98602591396040" + + "0191505060405180910390fd5b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffff" + + "ffffffffffffffffffffffffffff161415610a12576040517f08c379a000000000000000000000000000000000" + + "0000000000000000000000008152600401808060200182810382526023815260200180610d0560239139604001" + + "91505060405180910390fd5b610a7d81604051806060016040528060268152602001610d4a6026913960008087" + + "73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681" + + "5260200190815260200160002054610bbc9092919063ffffffff16565b6000808573ffffffffffffffffffffff" + + "ffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000" + + "2081905550610b10816000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffff" + + "ffffffffffffffffffffff16815260200190815260200160002054610c7c90919063ffffffff16565b60008084" + + "73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681" + + "52602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff168373ffffff" + + "ffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f5" + + "5a4df523b3ef836040518082815260200191505060405180910390a3505050565b6000838311158290610c6957" + + "6040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020" + + "01828103825283818151815260200191508051906020019080838360005b83811015610c2e5780820151818401" + + "52602081019050610c13565b50505050905090810190601f168015610c5b578082038051600183602003610100" + + "0a031916815260200191505b509250505060405180910390fd5b5060008385039050809150509392505050565b" + + "600080828401905083811015610cfa576040517f08c379a0000000000000000000000000000000000000000000" + + "00000000000000815260040180806020018281038252601b8152602001807f536166654d6174683a2061646469" + + "74696f6e206f766572666c6f77000000000081525060200191505060405180910390fd5b809150509291505056" + + "fe45524332303a207472616e7366657220746f20746865207a65726f206164647265737345524332303a206170" + + "70726f766520746f20746865207a65726f206164647265737345524332303a207472616e7366657220616d6f75" + + "6e7420657863656564732062616c616e636545524332303a207472616e7366657220616d6f756e742065786365" + + "65647320616c6c6f77616e636545524332303a207472616e736665722066726f6d20746865207a65726f206164" + + "647265737345524332303a20617070726f76652066726f6d20746865207a65726f206164647265737345524332" + + "303a2064656372656173656420616c6c6f77616e63652062656c6f77207a65726fa265627a7a72315820c7a5ff" + + "abf642bda14700b2de42f8c57b36621af020441df825de45fd2b3e1c5c64736f6c63430005100032"; async function sendTransaction(context) { - const tx = await context.web3.eth.accounts.signTransaction( - { - from: GENESIS_ACCOUNT, - data: TEST_CONTRACT_BYTECODE, - value: "0x00", - gasPrice: "0x01", - gas: "0x4F930", - }, - GENESIS_ACCOUNT_PRIVATE_KEY - ); - await customRequest(context.web3, "eth_sendRawTransaction", [tx.rawTransaction]); - return tx; + const tx = await context.web3.eth.accounts.signTransaction( + { + from: GENESIS_ACCOUNT, + data: TEST_CONTRACT_BYTECODE, + value: "0x00", + gasPrice: "0x01", + gas: "0x4F930", + }, + GENESIS_ACCOUNT_PRIVATE_KEY + ); + await customRequest(context.web3, "eth_sendRawTransaction", [tx.rawTransaction]); + return tx; } step("should connect", async function () { - await createAndFinalizeBlock(context.web3); - // @ts-ignore - const connected = context.web3.currentProvider.connected; - expect(connected).to.equal(true); + await createAndFinalizeBlock(context.web3); + // @ts-ignore + const connected = context.web3.currentProvider.connected; + expect(connected).to.equal(true); }); step("should subscribe", async function () { - subscription = context.web3.eth.subscribe("newBlockHeaders", function(error, result){}); - - let connected = false; - let subscriptionId = ""; - await new Promise((resolve) => { - subscription.on("connected", function (d: any) { - connected = true; - subscriptionId = d; - resolve(); - }); + subscription = context.web3.eth.subscribe("newBlockHeaders", function (error, result) {}); + + let connected = false; + let subscriptionId = ""; + await new Promise((resolve) => { + subscription.on("connected", function (d: any) { + connected = true; + subscriptionId = d; + resolve(); }); + }); - expect(connected).to.equal(true); - expect(subscriptionId).to.have.lengthOf(16); + expect(connected).to.equal(true); + expect(subscriptionId).to.have.lengthOf(16); }); step("should get newHeads stream", async function (done) { - await createAndFinalizeBlock(context.web3); - let data = null; - await new Promise((resolve) => { - subscription.on("data", function (d: any) { - data = d; - resolve(); - }); - }); - expect(data).to.include({ - author: '0x0000000000000000000000000000000000000000', - difficulty: '0', - extraData: '0x', - logsBloom: `0x${"0".repeat(512)}`,, - miner: '0x0000000000000000000000000000000000000000', - number: 2, - receiptsRoot: '0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347', - sha3Uncles: '0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347', - stateRoot: '0x0000000000000000000000000000000000000000000000000000000000000000', - transactionsRoot: '0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421' + await createAndFinalizeBlock(context.web3); + let data = null; + await new Promise((resolve) => { + subscription.on("data", function (d: any) { + data = d; + resolve(); }); - expect((data as any).sealFields).to.eql([ - "0x0000000000000000000000000000000000000000000000000000000000000000", - "0x0000000000000000", - ]); - setTimeout(done,10000); + }); + expect(data).to.include({ + author: "0x0000000000000000000000000000000000000000", + difficulty: "0", + extraData: "0x", + logsBloom: `0x${"0".repeat(512)}`, + miner: "0x0000000000000000000000000000000000000000", + number: 2, + receiptsRoot: "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347", + sha3Uncles: "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347", + stateRoot: "0x0000000000000000000000000000000000000000000000000000000000000000", + transactionsRoot: "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", + }); + expect((data as any).sealFields).to.eql([ + "0x0000000000000000000000000000000000000000000000000000000000000000", + "0x0000000000000000", + ]); + setTimeout(done, 10000); }).timeout(20000); step("should get newPendingTransactions stream", async function (done) { - subscription = context.web3.eth.subscribe("pendingTransactions", function(error, result){}); + subscription = context.web3.eth.subscribe("pendingTransactions", function (error, result) {}); - await new Promise((resolve) => { - subscription.on("connected", function (d: any) { - resolve(); - }); + await new Promise((resolve) => { + subscription.on("connected", function (d: any) { + resolve(); }); - - const tx = await sendTransaction(context); - let data = null; - await new Promise((resolve) => { - createAndFinalizeBlock(context.web3); - subscription.on("data", function (d: any) { - data = d; - logs_generated += 1; - resolve(); - }); + }); + + const tx = await sendTransaction(context); + let data = null; + await new Promise((resolve) => { + createAndFinalizeBlock(context.web3); + subscription.on("data", function (d: any) { + data = d; + logs_generated += 1; + resolve(); }); - subscription.unsubscribe(); + }); + subscription.unsubscribe(); - expect(data).to.be.not.null; - expect(tx["transactionHash"]).to.be.eq(data); - setTimeout(done,10000); + expect(data).to.be.not.null; + expect(tx["transactionHash"]).to.be.eq(data); + setTimeout(done, 10000); }).timeout(20000); step("should subscribe to all logs", async function (done) { - subscription = context.web3.eth.subscribe("logs", {}, function(error, result){}); + subscription = context.web3.eth.subscribe("logs", {}, function (error, result) {}); - await new Promise((resolve) => { - subscription.on("connected", function (d: any) { - resolve(); - }); + await new Promise((resolve) => { + subscription.on("connected", function (d: any) { + resolve(); }); - - const tx = await sendTransaction(context); - let data = null; - await new Promise((resolve) => { - createAndFinalizeBlock(context.web3); - subscription.on("data", function (d: any) { - data = d; - logs_generated += 1; - resolve(); - }); - }); - subscription.unsubscribe(); - - const block = await context.web3.eth.getBlock("latest"); - expect(data).to.include({ - blockHash: block.hash, - blockNumber: block.number, - data: '0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff', - logIndex: 0, - removed: false, - transactionHash: block.transactions[0], - transactionIndex: 0, - transactionLogIndex: '0x0' + }); + + const tx = await sendTransaction(context); + let data = null; + await new Promise((resolve) => { + createAndFinalizeBlock(context.web3); + subscription.on("data", function (d: any) { + data = d; + logs_generated += 1; + resolve(); }); - setTimeout(done,10000); + }); + subscription.unsubscribe(); + + const block = await context.web3.eth.getBlock("latest"); + expect(data).to.include({ + blockHash: block.hash, + blockNumber: block.number, + data: "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + logIndex: 0, + removed: false, + transactionHash: block.transactions[0], + transactionIndex: 0, + transactionLogIndex: "0x0", + }); + setTimeout(done, 10000); }).timeout(20000); step("should subscribe to logs by address", async function (done) { - subscription = context.web3.eth.subscribe("logs", { - address: "0x42e2EE7Ba8975c473157634Ac2AF4098190fc741" - }, function(error, result){}); - - await new Promise((resolve) => { - subscription.on("connected", function (d: any) { - resolve(); - }); + subscription = context.web3.eth.subscribe( + "logs", + { + address: "0x42e2EE7Ba8975c473157634Ac2AF4098190fc741", + }, + function (error, result) {} + ); + + await new Promise((resolve) => { + subscription.on("connected", function (d: any) { + resolve(); }); - - const tx = await sendTransaction(context); - let data = null; - await new Promise((resolve) => { - createAndFinalizeBlock(context.web3); - subscription.on("data", function (d: any) { - data = d; - logs_generated += 1; - resolve(); - }); + }); + + const tx = await sendTransaction(context); + let data = null; + await new Promise((resolve) => { + createAndFinalizeBlock(context.web3); + subscription.on("data", function (d: any) { + data = d; + logs_generated += 1; + resolve(); }); - subscription.unsubscribe(); + }); + subscription.unsubscribe(); - expect(data).to.not.be.null; - setTimeout(done,10000); + expect(data).to.not.be.null; + setTimeout(done, 10000); }).timeout(20000); step("should subscribe to logs by topic", async function (done) { - subscription = context.web3.eth.subscribe("logs", { - topics: ["0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef"] - }, function(error, result){}); - - await new Promise((resolve) => { - subscription.on("connected", function (d: any) { - resolve(); - }); + subscription = context.web3.eth.subscribe( + "logs", + { + topics: ["0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef"], + }, + function (error, result) {} + ); + + await new Promise((resolve) => { + subscription.on("connected", function (d: any) { + resolve(); }); - - const tx = await sendTransaction(context); - let data = null; - await new Promise((resolve) => { - createAndFinalizeBlock(context.web3); - subscription.on("data", function (d: any) { - data = d; - logs_generated += 1; - resolve(); - }); + }); + + const tx = await sendTransaction(context); + let data = null; + await new Promise((resolve) => { + createAndFinalizeBlock(context.web3); + subscription.on("data", function (d: any) { + data = d; + logs_generated += 1; + resolve(); }); - subscription.unsubscribe(); + }); + subscription.unsubscribe(); - expect(data).to.not.be.null; - setTimeout(done,10000); + expect(data).to.not.be.null; + setTimeout(done, 10000); }).timeout(20000); step("should get past events on subscription", async function (done) { - subscription = context.web3.eth.subscribe("logs", { - fromBlock: "0x0" - }, function(error, result){}); - - let data = []; - await new Promise((resolve) => { - subscription.on("data", function (d: any) { - data.push(d); - if (data.length == logs_generated) { - resolve(); - } - }); + subscription = context.web3.eth.subscribe( + "logs", + { + fromBlock: "0x0", + }, + function (error, result) {} + ); + + let data = []; + await new Promise((resolve) => { + subscription.on("data", function (d: any) { + data.push(d); + if (data.length == logs_generated) { + resolve(); + } }); + }); - expect(data).to.not.be.empty; - setTimeout(done,10000); + expect(data).to.not.be.empty; + setTimeout(done, 10000); }).timeout(20000); step("should support topic wildcards", async function (done) { - subscription = context.web3.eth.subscribe("logs", { - topics: [ - null, - "0x0000000000000000000000000000000000000000000000000000000000000000" - ] - }, function(error, result){}); - - await new Promise((resolve) => { - subscription.on("connected", function (d: any) { - resolve(); - }); + subscription = context.web3.eth.subscribe( + "logs", + { + topics: [null, "0x0000000000000000000000000000000000000000000000000000000000000000"], + }, + function (error, result) {} + ); + + await new Promise((resolve) => { + subscription.on("connected", function (d: any) { + resolve(); }); - - const tx = await sendTransaction(context); - let data = null; - await new Promise((resolve) => { - createAndFinalizeBlock(context.web3); - subscription.on("data", function (d: any) { - data = d; - logs_generated += 1; - resolve(); - }); + }); + + const tx = await sendTransaction(context); + let data = null; + await new Promise((resolve) => { + createAndFinalizeBlock(context.web3); + subscription.on("data", function (d: any) { + data = d; + logs_generated += 1; + resolve(); }); - subscription.unsubscribe(); + }); + subscription.unsubscribe(); - expect(data).to.not.be.null; - setTimeout(done,10000); + expect(data).to.not.be.null; + setTimeout(done, 10000); }).timeout(20000); step("should support single values wrapped around a sequence", async function (done) { - subscription = context.web3.eth.subscribe("logs", { - topics: [ - ["0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef"], - ["0x0000000000000000000000000000000000000000000000000000000000000000"] - ] - }, function(error, result){}); - - await new Promise((resolve) => { - subscription.on("connected", function (d: any) { - resolve(); - }); + subscription = context.web3.eth.subscribe( + "logs", + { + topics: [ + ["0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef"], + ["0x0000000000000000000000000000000000000000000000000000000000000000"], + ], + }, + function (error, result) {} + ); + + await new Promise((resolve) => { + subscription.on("connected", function (d: any) { + resolve(); }); - - const tx = await sendTransaction(context); - let data = null; - await new Promise((resolve) => { - createAndFinalizeBlock(context.web3); - subscription.on("data", function (d: any) { - data = d; - logs_generated += 1; - resolve(); - }); + }); + + const tx = await sendTransaction(context); + let data = null; + await new Promise((resolve) => { + createAndFinalizeBlock(context.web3); + subscription.on("data", function (d: any) { + data = d; + logs_generated += 1; + resolve(); }); - subscription.unsubscribe(); + }); + subscription.unsubscribe(); - expect(data).to.not.be.null; - setTimeout(done,10000); + expect(data).to.not.be.null; + setTimeout(done, 10000); }).timeout(20000); step("should support topic conditional parameters", async function (done) { - subscription = context.web3.eth.subscribe("logs", { - topics: [ - "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef", - [ - "0x0000000000000000000000006be02d1d3665660d22ff9624b7be0551ee1ac91b", - "0x0000000000000000000000000000000000000000000000000000000000000000" - ] - ] - }, function(error, result){}); - - await new Promise((resolve) => { - subscription.on("connected", function (d: any) { - resolve(); - }); + subscription = context.web3.eth.subscribe( + "logs", + { + topics: [ + "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef", + [ + "0x0000000000000000000000006be02d1d3665660d22ff9624b7be0551ee1ac91b", + "0x0000000000000000000000000000000000000000000000000000000000000000", + ], + ], + }, + function (error, result) {} + ); + + await new Promise((resolve) => { + subscription.on("connected", function (d: any) { + resolve(); }); - - const tx = await sendTransaction(context); - let data = null; - await new Promise((resolve) => { - createAndFinalizeBlock(context.web3); - subscription.on("data", function (d: any) { - data = d; - logs_generated += 1; - resolve(); - }); + }); + + const tx = await sendTransaction(context); + let data = null; + await new Promise((resolve) => { + createAndFinalizeBlock(context.web3); + subscription.on("data", function (d: any) { + data = d; + logs_generated += 1; + resolve(); }); - subscription.unsubscribe(); + }); + subscription.unsubscribe(); - expect(data).to.not.be.null; - setTimeout(done,10000); + expect(data).to.not.be.null; + setTimeout(done, 10000); }).timeout(20000); step("should support multiple topic conditional parameters", async function (done) { - subscription = context.web3.eth.subscribe("logs", { - topics: [ - "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef", - [ - "0x0000000000000000000000000000000000000000000000000000000000000000", - "0x0000000000000000000000006be02d1d3665660d22ff9624b7be0551ee1ac91b" - ], - [ - "0x0000000000000000000000006be02d1d3665660d22ff9624b7be0551ee1ac91b", - "0x0000000000000000000000000000000000000000000000000000000000000000" - ] - ] - }, function(error, result){}); - - await new Promise((resolve) => { - subscription.on("connected", function (d: any) { - resolve(); - }); + subscription = context.web3.eth.subscribe( + "logs", + { + topics: [ + "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef", + [ + "0x0000000000000000000000000000000000000000000000000000000000000000", + "0x0000000000000000000000006be02d1d3665660d22ff9624b7be0551ee1ac91b", + ], + [ + "0x0000000000000000000000006be02d1d3665660d22ff9624b7be0551ee1ac91b", + "0x0000000000000000000000000000000000000000000000000000000000000000", + ], + ], + }, + function (error, result) {} + ); + + await new Promise((resolve) => { + subscription.on("connected", function (d: any) { + resolve(); }); - - const tx = await sendTransaction(context); - let data = null; - await new Promise((resolve) => { - createAndFinalizeBlock(context.web3); - subscription.on("data", function (d: any) { - data = d; - logs_generated += 1; - resolve(); - }); + }); + + const tx = await sendTransaction(context); + let data = null; + await new Promise((resolve) => { + createAndFinalizeBlock(context.web3); + subscription.on("data", function (d: any) { + data = d; + logs_generated += 1; + resolve(); }); - subscription.unsubscribe(); + }); + subscription.unsubscribe(); - expect(data).to.not.be.null; - setTimeout(done,10000); + expect(data).to.not.be.null; + setTimeout(done, 10000); }).timeout(20000); step("should combine topic wildcards and conditional parameters", async function (done) { - subscription = context.web3.eth.subscribe("logs", { - topics: [ - null, - [ - "0x0000000000000000000000006be02d1d3665660d22ff9624b7be0551ee1ac91b", - "0x0000000000000000000000000000000000000000000000000000000000000000" - ], - null - ] - }, function(error, result){}); - - await new Promise((resolve) => { - subscription.on("connected", function (d: any) { - resolve(); - }); + subscription = context.web3.eth.subscribe( + "logs", + { + topics: [ + null, + [ + "0x0000000000000000000000006be02d1d3665660d22ff9624b7be0551ee1ac91b", + "0x0000000000000000000000000000000000000000000000000000000000000000", + ], + null, + ], + }, + function (error, result) {} + ); + + await new Promise((resolve) => { + subscription.on("connected", function (d: any) { + resolve(); }); - - const tx = await sendTransaction(context); - let data = null; - await new Promise((resolve) => { - createAndFinalizeBlock(context.web3); - subscription.on("data", function (d: any) { - data = d; - logs_generated += 1; - resolve(); - }); + }); + + const tx = await sendTransaction(context); + let data = null; + await new Promise((resolve) => { + createAndFinalizeBlock(context.web3); + subscription.on("data", function (d: any) { + data = d; + logs_generated += 1; + resolve(); }); - subscription.unsubscribe(); + }); + subscription.unsubscribe(); - expect(data).to.not.be.null; - setTimeout(done,10000); + expect(data).to.not.be.null; + setTimeout(done, 10000); }).timeout(20000); -}, "ws"); + }, + "ws" +); diff --git a/tests/tests/util.ts b/tests/tests/util.ts index 7e623f64e0..0bac6f49ec 100644 --- a/tests/tests/util.ts +++ b/tests/tests/util.ts @@ -47,12 +47,13 @@ export async function createAndFinalizeBlock(web3: Web3) { } export async function startMoonbeamNode( - specFilename: string, provider?: string + specFilename: string, + provider?: string ): Promise<{ web3: Web3; binary: ChildProcess }> { var web3; - if (!provider || provider == 'http') { - web3 = new Web3(`http://localhost:${RPC_PORT}`); - } + if (!provider || provider == "http") { + web3 = new Web3(`http://localhost:${RPC_PORT}`); + } const cmd = BINARY_PATH; const args = [ @@ -100,9 +101,9 @@ export async function startMoonbeamNode( binaryLogs.push(chunk); if (chunk.toString().match(/Manual Seal Ready/)) { if (!provider || provider == "http") { - // This is needed as the EVM runtime needs to warmup with a first call - await web3.eth.getChainId(); - } + // This is needed as the EVM runtime needs to warmup with a first call + await web3.eth.getChainId(); + } clearTimeout(timer); if (!DISPLAY_LOG) { @@ -117,9 +118,9 @@ export async function startMoonbeamNode( binary.stdout.on("data", onData); }); - if (provider == 'ws') { - web3 = new Web3(`ws://localhost:${WS_PORT}`); - } + if (provider == "ws") { + web3 = new Web3(`ws://localhost:${WS_PORT}`); + } return { web3, binary }; } @@ -127,7 +128,8 @@ export async function startMoonbeamNode( export function describeWithMoonbeam( title: string, specFilename: string, - cb: (context: { web3: Web3 }) => void, provider?: string + cb: (context: { web3: Web3 }) => void, + provider?: string ) { describe(title, () => { let context: { web3: Web3 } = { web3: null }; From 7d0c853dbce7e8a1e250a6d6dc198c29ca3ef9d4 Mon Sep 17 00:00:00 2001 From: tgmichel Date: Tue, 10 Nov 2020 14:32:24 +0100 Subject: [PATCH 11/17] Merge branch 'master' into tgmichel-v0.3 --- .vscode/settings.json | 2 +- Cargo.lock | 1 + node/parachain/Cargo.toml | 1 + node/parachain/src/chain_spec.rs | 14 +++++++++-- node/standalone/Cargo.lock | 1 + node/standalone/Cargo.toml | 1 + node/standalone/src/chain_spec.rs | 14 +++++++++-- polkadot-js/alphanet-types.json | 25 +++++++++++++++++++ polkadot-js/standalone-types.json | 25 +++++++++++++++++++ .../moonbase-alphanet-dev-specs-template.json | 4 ++- specs/moonbase-alphanet-specs-template.json | 4 ++- specs/rococo-alphanet-specs-template.json | 4 ++- tests/moonbeam-test-specs/simple-specs.json | 4 ++- .../templates/simple-specs-template.json | 4 ++- 14 files changed, 94 insertions(+), 10 deletions(-) create mode 100644 polkadot-js/alphanet-types.json create mode 100644 polkadot-js/standalone-types.json diff --git a/.vscode/settings.json b/.vscode/settings.json index 0281d35460..07c5d0ae14 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,5 +1,5 @@ { - "editor.formatOnSave": false, + "editor.formatOnSave": true, "editor.rulers": [100], "[typescript]": { "editor.defaultFormatter": "esbenp.prettier-vscode" diff --git a/Cargo.lock b/Cargo.lock index 38e56853bf..cd929428dd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3755,6 +3755,7 @@ dependencies = [ "sc-service", "sc-transaction-pool", "serde", + "serde_json", "sp-api", "sp-block-builder", "sp-blockchain", diff --git a/node/parachain/Cargo.toml b/node/parachain/Cargo.toml index 77dd22629a..5a6737d090 100644 --- a/node/parachain/Cargo.toml +++ b/node/parachain/Cargo.toml @@ -23,6 +23,7 @@ codec = { package = 'parity-scale-codec', version = '1.0.0' } structopt = "0.3.3" ansi_term = "0.12.1" serde = { version = "1.0.101", features = ["derive"] } +serde_json = "1.0" jsonrpc-core = "14.2.0" jsonrpc-pubsub = "14.2.0" diff --git a/node/parachain/src/chain_spec.rs b/node/parachain/src/chain_spec.rs index 62fdfb4a70..7272766c1b 100644 --- a/node/parachain/src/chain_spec.rs +++ b/node/parachain/src/chain_spec.rs @@ -93,7 +93,12 @@ pub fn get_chain_spec(id: ParaId) -> Result { vec![], None, None, - None, + Some( + serde_json::from_str( + "{\"tokenDecimals\": 18}" + ) + .expect("Provided valid json map") + ), Extensions { relay_chain: "local_testnet".into(), para_id: id.into(), @@ -118,7 +123,12 @@ pub fn staging_test_net(id: ParaId) -> Result { Vec::new(), None, None, - None, + Some( + serde_json::from_str( + "{\"tokenDecimals\": 18}" + ) + .expect("Provided valid json map") + ), Extensions { relay_chain: "rococo_local_testnet".into(), para_id: id.into(), diff --git a/node/standalone/Cargo.lock b/node/standalone/Cargo.lock index e137d5438a..7cffb94988 100644 --- a/node/standalone/Cargo.lock +++ b/node/standalone/Cargo.lock @@ -3539,6 +3539,7 @@ dependencies = [ "sc-rpc-api", "sc-service", "sc-transaction-pool", + "serde_json", "sp-api", "sp-block-builder", "sp-blockchain", diff --git a/node/standalone/Cargo.toml b/node/standalone/Cargo.toml index e9fc188851..2d3498f084 100644 --- a/node/standalone/Cargo.toml +++ b/node/standalone/Cargo.toml @@ -26,6 +26,7 @@ log = "0.4.8" structopt = "0.3.8" jsonrpc-core = "14.2.0" jsonrpc-pubsub = "14.2.0" +serde_json = "1.0" sp-api = { git = "https://github.com/paritytech/substrate.git", branch = "rococo-branch" } sp-blockchain = { git = "https://github.com/paritytech/substrate.git", branch = "rococo-branch" } diff --git a/node/standalone/src/chain_spec.rs b/node/standalone/src/chain_spec.rs index 88c31c04f4..2aa384e863 100644 --- a/node/standalone/src/chain_spec.rs +++ b/node/standalone/src/chain_spec.rs @@ -89,7 +89,12 @@ pub fn development_config() -> Result { // Protocol ID None, // Properties - None, + Some( + serde_json::from_str( + "{\"tokenDecimals\": 18}" + ) + .expect("Provided valid json map") + ), // Extensions None, )) @@ -137,7 +142,12 @@ pub fn local_testnet_config() -> Result { // Protocol ID None, // Properties - None, + Some( + serde_json::from_str( + "{\"tokenDecimals\": 18}" + ) + .expect("Provided valid json map") + ), // Extensions None, )) diff --git a/polkadot-js/alphanet-types.json b/polkadot-js/alphanet-types.json new file mode 100644 index 0000000000..40ba01d70a --- /dev/null +++ b/polkadot-js/alphanet-types.json @@ -0,0 +1,25 @@ +{ + "AccountId": "EthereumAccountId", + "Address": "AccountId", + "Balance": "u128", + "RefCount": "u8", + "LookupSource": "AccountId", + "Account": { + "nonce": "U256", + "balance": "u128" + }, + "Transaction": { + "nonce": "U256", + "action": "String", + "gas_price": "u64", + "gas_limit": "u64", + "value": "U256", + "input": "Vec", + "signature": "Signature" + }, + "Signature": { + "v": "u64", + "r": "H256", + "s": "H256" + } +} diff --git a/polkadot-js/standalone-types.json b/polkadot-js/standalone-types.json new file mode 100644 index 0000000000..40ba01d70a --- /dev/null +++ b/polkadot-js/standalone-types.json @@ -0,0 +1,25 @@ +{ + "AccountId": "EthereumAccountId", + "Address": "AccountId", + "Balance": "u128", + "RefCount": "u8", + "LookupSource": "AccountId", + "Account": { + "nonce": "U256", + "balance": "u128" + }, + "Transaction": { + "nonce": "U256", + "action": "String", + "gas_price": "u64", + "gas_limit": "u64", + "value": "U256", + "input": "Vec", + "signature": "Signature" + }, + "Signature": { + "v": "u64", + "r": "H256", + "s": "H256" + } +} diff --git a/specs/moonbase-alphanet-dev-specs-template.json b/specs/moonbase-alphanet-dev-specs-template.json index 0e448b844b..961c5f0ab9 100644 --- a/specs/moonbase-alphanet-dev-specs-template.json +++ b/specs/moonbase-alphanet-dev-specs-template.json @@ -5,7 +5,9 @@ "bootNodes": [], "telemetryEndpoints": null, "protocolId": null, - "properties": null, + "properties": { + "tokenDecimals": 18 + }, "relay_chain": "local_testnet", "para_id": 1000, "consensusEngine": null, diff --git a/specs/moonbase-alphanet-specs-template.json b/specs/moonbase-alphanet-specs-template.json index 534901a4d6..604ac4bdb0 100644 --- a/specs/moonbase-alphanet-specs-template.json +++ b/specs/moonbase-alphanet-specs-template.json @@ -5,7 +5,9 @@ "bootNodes": [], "telemetryEndpoints": null, "protocolId": null, - "properties": null, + "properties": { + "tokenDecimals": 18 + }, "relay_chain": "local_testnet", "para_id": 1000, "consensusEngine": null, diff --git a/specs/rococo-alphanet-specs-template.json b/specs/rococo-alphanet-specs-template.json index 998e912d87..a46a69d706 100755 --- a/specs/rococo-alphanet-specs-template.json +++ b/specs/rococo-alphanet-specs-template.json @@ -5,7 +5,9 @@ "bootNodes": [], "telemetryEndpoints": null, "protocolId": "dot", - "properties": null, + "properties": { + "tokenDecimals": 18 + }, "consensusEngine": null, "genesis": { "runtime": { diff --git a/tests/moonbeam-test-specs/simple-specs.json b/tests/moonbeam-test-specs/simple-specs.json index 148710eced..c280cf1458 100644 --- a/tests/moonbeam-test-specs/simple-specs.json +++ b/tests/moonbeam-test-specs/simple-specs.json @@ -5,7 +5,9 @@ "bootNodes": [], "telemetryEndpoints": null, "protocolId": null, - "properties": null, + "properties": { + "tokenDecimals": 18 + }, "consensusEngine": null, "genesis": { "runtime": { diff --git a/tests/moonbeam-test-specs/templates/simple-specs-template.json b/tests/moonbeam-test-specs/templates/simple-specs-template.json index a7cdd37ec4..45b331a07f 100644 --- a/tests/moonbeam-test-specs/templates/simple-specs-template.json +++ b/tests/moonbeam-test-specs/templates/simple-specs-template.json @@ -5,7 +5,9 @@ "bootNodes": [], "telemetryEndpoints": null, "protocolId": null, - "properties": null, + "properties": { + "tokenDecimals": 18 + }, "consensusEngine": null, "genesis": { "runtime": { From 6157b15ac8b8d688e870d08154aac71e892acb42 Mon Sep 17 00:00:00 2001 From: Joshy Orndorff Date: Tue, 10 Nov 2020 10:40:14 -0500 Subject: [PATCH 12/17] backport test-revert-receipt from frontier #184 --- tests/tests/test-revert-receipt.ts | 123 +++++++++++++++++++++++++++++ 1 file changed, 123 insertions(+) create mode 100644 tests/tests/test-revert-receipt.ts diff --git a/tests/tests/test-revert-receipt.ts b/tests/tests/test-revert-receipt.ts new file mode 100644 index 0000000000..a00a7041ae --- /dev/null +++ b/tests/tests/test-revert-receipt.ts @@ -0,0 +1,123 @@ +import { expect } from "chai"; + +import { createAndFinalizeBlock, customRequest, describeWithFrontier } from "./util"; + +describeWithFrontier("Frontier RPC (Constructor Revert)", `simple-specs.json`, (context) => { + const GENESIS_ACCOUNT = "0x6be02d1d3665660d22ff9624b7be0551ee1ac91b"; + const GENESIS_ACCOUNT_PRIVATE_KEY = + "0x99B3C12287537E38C90A9219D4CB074A89A16E9CDB20BF85728EBD97C343E342"; + + // ``` + // pragma solidity >=0.4.22 <0.7.0; + // + // contract WillFail { + // constructor() public { + // require(false); + // } + // } + // ``` + const FAIL_BYTECODE = + "6080604052348015600f57600080fd5b506000601a57600080fd5b603f8060276000396000f3fe60806040526000" + + "80fdfea26469706673582212209f2bb2a4cf155a0e7b26bd34bb01e9b645a92c82e55c5dbdb4b37f8c326edbee64" + + "736f6c63430006060033"; + const GOOD_BYTECODE = + "6080604052348015600f57600080fd5b506001601a57600080fd5b603f8060276000396000f3fe60806040526000" + + "80fdfea2646970667358221220c70bc8b03cdfdf57b5f6c4131b836f9c2c4df01b8202f530555333f2a00e4b8364" + + "736f6c63430006060033"; + + it("should provide a tx receipt after successful deployment", async function () { + this.timeout(15000); + const GOOD_TX_HASH = "0xae813c533aac0719fbca4db6e3bb05cfb5859bdeaaa7dc5c9dbd24083301be8d"; + + const tx = await context.web3.eth.accounts.signTransaction( + { + from: GENESIS_ACCOUNT, + data: GOOD_BYTECODE, + value: "0x00", + gasPrice: "0x01", + gas: "0x100000", + }, + GENESIS_ACCOUNT_PRIVATE_KEY + ); + + expect( + await customRequest(context.web3, "eth_sendRawTransaction", [tx.rawTransaction]) + ).to.deep.equal({ + id: 1, + jsonrpc: "2.0", + result: GOOD_TX_HASH, + }); + + // Verify the receipt exists after the block is created + //TODO Actually, why doesn't this receipt have a status in it? + // I guess because the RPC handler in eth.rs sets `status_code: None`?? + await createAndFinalizeBlock(context.web3); + expect( + await customRequest(context.web3, "eth_getTransactionReceipt", [GOOD_TX_HASH]) + ).to.deep.equal({ + id: 1, + jsonrpc: "2.0", + result: { + blockHash: "0xfe01d44b7f1c13e36819ecc6daf39fc28c57e6e4f6646036d7d8b79ed940fb91", + blockNumber: "0x1", + contractAddress: "0xc2bf5f29a4384b1ab0c063e1c666f02121b6084a", + cumulativeGasUsed: "0x1069f", + from: "0x6be02d1d3665660d22ff9624b7be0551ee1ac91b", + gasUsed: "0x1069f", + logs: [], + logsBloom: `0x${"0".repeat(512)}`, + root: "0x0000000000000000000000000000000000000000000000000000000000000000", + to: null, + transactionHash: GOOD_TX_HASH, + transactionIndex: "0x0", + }, + }); + }); + + it("should provide a tx receipt after failed deployment", async function () { + this.timeout(15000); + // Transaction hash depends on which nonce we're using. This hash is for nonce 2. + const FAIL_TX_HASH = "0x640df9deb183d565addc45bdc8f95b30c7c03ce7e69df49456be9929352e4347"; + + const tx = await context.web3.eth.accounts.signTransaction( + { + from: GENESIS_ACCOUNT, + data: FAIL_BYTECODE, + value: "0x00", + gasPrice: "0x01", + gas: "0x100000", + }, + GENESIS_ACCOUNT_PRIVATE_KEY + ); + + expect( + await customRequest(context.web3, "eth_sendRawTransaction", [tx.rawTransaction]) + ).to.deep.equal({ + id: 1, + jsonrpc: "2.0", + result: FAIL_TX_HASH, + }); + + await createAndFinalizeBlock(context.web3); + expect( + await customRequest(context.web3, "eth_getTransactionReceipt", [FAIL_TX_HASH]) + ).to.deep.equal({ + id: 1, + jsonrpc: "2.0", + result: { + blockHash: "0x8761d0bf47b6644e9e420d16b6fe046420c609a9d990e9432c30b254e02902d0", + blockNumber: "0x2", + contractAddress: "0x5c4242beb94de30b922f57241f1d02f36e906915", + cumulativeGasUsed: "0xd548", + from: "0x6be02d1d3665660d22ff9624b7be0551ee1ac91b", + gasUsed: "0xd548", + logs: [], + logsBloom: `0x${"0".repeat(512)}`, + root: "0x0000000000000000000000000000000000000000000000000000000000000000", + to: null, + transactionHash: FAIL_TX_HASH, + transactionIndex: "0x0", + }, + }); + }); +}); From a2cc65d3cc839cb89b77b97964949ee2fa6eb494 Mon Sep 17 00:00:00 2001 From: Alan Sapede Date: Tue, 10 Nov 2020 17:29:47 +0000 Subject: [PATCH 13/17] fixes test setup after merge --- tests/tests/test-revert-receipt.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/tests/test-revert-receipt.ts b/tests/tests/test-revert-receipt.ts index a00a7041ae..5db0b26a8d 100644 --- a/tests/tests/test-revert-receipt.ts +++ b/tests/tests/test-revert-receipt.ts @@ -1,8 +1,8 @@ import { expect } from "chai"; -import { createAndFinalizeBlock, customRequest, describeWithFrontier } from "./util"; +import { createAndFinalizeBlock, customRequest, describeWithMoonbeam } from "./util"; -describeWithFrontier("Frontier RPC (Constructor Revert)", `simple-specs.json`, (context) => { +describeWithMoonbeam("Frontier RPC (Constructor Revert)", `simple-specs.json`, (context) => { const GENESIS_ACCOUNT = "0x6be02d1d3665660d22ff9624b7be0551ee1ac91b"; const GENESIS_ACCOUNT_PRIVATE_KEY = "0x99B3C12287537E38C90A9219D4CB074A89A16E9CDB20BF85728EBD97C343E342"; From 5f28424c308f75c80ac8740c6ec9f8c223a5fca4 Mon Sep 17 00:00:00 2001 From: Joshy Orndorff Date: Tue, 10 Nov 2020 16:32:04 -0500 Subject: [PATCH 14/17] make test-revert-receipt pass --- tests/tests/test-revert-receipt.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/tests/test-revert-receipt.ts b/tests/tests/test-revert-receipt.ts index 5db0b26a8d..3cb17c9cab 100644 --- a/tests/tests/test-revert-receipt.ts +++ b/tests/tests/test-revert-receipt.ts @@ -27,7 +27,7 @@ describeWithMoonbeam("Frontier RPC (Constructor Revert)", `simple-specs.json`, ( it("should provide a tx receipt after successful deployment", async function () { this.timeout(15000); - const GOOD_TX_HASH = "0xae813c533aac0719fbca4db6e3bb05cfb5859bdeaaa7dc5c9dbd24083301be8d"; + const GOOD_TX_HASH = "0x4886592b3430d568e9a36a4654028da5d2bbeef474166879b579200b675b8ad5"; const tx = await context.web3.eth.accounts.signTransaction( { @@ -58,7 +58,7 @@ describeWithMoonbeam("Frontier RPC (Constructor Revert)", `simple-specs.json`, ( id: 1, jsonrpc: "2.0", result: { - blockHash: "0xfe01d44b7f1c13e36819ecc6daf39fc28c57e6e4f6646036d7d8b79ed940fb91", + blockHash: "0x7c78c047e89b2c8ca34026cd1b0a8b9eee582f16250f4c32c98dacca6bae76af", blockNumber: "0x1", contractAddress: "0xc2bf5f29a4384b1ab0c063e1c666f02121b6084a", cumulativeGasUsed: "0x1069f", @@ -77,7 +77,7 @@ describeWithMoonbeam("Frontier RPC (Constructor Revert)", `simple-specs.json`, ( it("should provide a tx receipt after failed deployment", async function () { this.timeout(15000); // Transaction hash depends on which nonce we're using. This hash is for nonce 2. - const FAIL_TX_HASH = "0x640df9deb183d565addc45bdc8f95b30c7c03ce7e69df49456be9929352e4347"; + const FAIL_TX_HASH = "0x2353300f83c9a1f174b31ca8f1857666e6667372238dc15e876df0a13b8139b2"; const tx = await context.web3.eth.accounts.signTransaction( { @@ -105,7 +105,7 @@ describeWithMoonbeam("Frontier RPC (Constructor Revert)", `simple-specs.json`, ( id: 1, jsonrpc: "2.0", result: { - blockHash: "0x8761d0bf47b6644e9e420d16b6fe046420c609a9d990e9432c30b254e02902d0", + blockHash: "0xb97d9bf925d8d5bff501e6d545f60d2a9881753a19dedf954b7d370c5bc436a3", blockNumber: "0x2", contractAddress: "0x5c4242beb94de30b922f57241f1d02f36e906915", cumulativeGasUsed: "0xd548", From b40411614d9d15cc60c702db4ecd682503b32a69 Mon Sep 17 00:00:00 2001 From: Joshy Orndorff Date: Tue, 10 Nov 2020 16:44:43 -0500 Subject: [PATCH 15/17] =?UTF-8?q?make=20test=20revert=20receipt=20pass=20o?= =?UTF-8?q?ne=20more=20time=20for=20good=20measure=20=F0=9F=98=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/tests/test-revert-receipt.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/tests/test-revert-receipt.ts b/tests/tests/test-revert-receipt.ts index 3cb17c9cab..4332752274 100644 --- a/tests/tests/test-revert-receipt.ts +++ b/tests/tests/test-revert-receipt.ts @@ -27,7 +27,7 @@ describeWithMoonbeam("Frontier RPC (Constructor Revert)", `simple-specs.json`, ( it("should provide a tx receipt after successful deployment", async function () { this.timeout(15000); - const GOOD_TX_HASH = "0x4886592b3430d568e9a36a4654028da5d2bbeef474166879b579200b675b8ad5"; + const GOOD_TX_HASH = "0x410f72144e2c0e8b48091f5675422b7a8013335cfdb5e83825c5f27cd991ac8c"; const tx = await context.web3.eth.accounts.signTransaction( { @@ -58,7 +58,7 @@ describeWithMoonbeam("Frontier RPC (Constructor Revert)", `simple-specs.json`, ( id: 1, jsonrpc: "2.0", result: { - blockHash: "0x7c78c047e89b2c8ca34026cd1b0a8b9eee582f16250f4c32c98dacca6bae76af", + blockHash: "0x4f8ae51b3c94d2969622e16c8c42382ab1ae86a396ec7710dc96e9a19a7bef09", blockNumber: "0x1", contractAddress: "0xc2bf5f29a4384b1ab0c063e1c666f02121b6084a", cumulativeGasUsed: "0x1069f", @@ -77,7 +77,7 @@ describeWithMoonbeam("Frontier RPC (Constructor Revert)", `simple-specs.json`, ( it("should provide a tx receipt after failed deployment", async function () { this.timeout(15000); // Transaction hash depends on which nonce we're using. This hash is for nonce 2. - const FAIL_TX_HASH = "0x2353300f83c9a1f174b31ca8f1857666e6667372238dc15e876df0a13b8139b2"; + const FAIL_TX_HASH = "0xe5ba0bd6229c3315cefa16312b6f3674a5f928aed1b7f397596b724fb259c5ba"; const tx = await context.web3.eth.accounts.signTransaction( { @@ -105,7 +105,7 @@ describeWithMoonbeam("Frontier RPC (Constructor Revert)", `simple-specs.json`, ( id: 1, jsonrpc: "2.0", result: { - blockHash: "0xb97d9bf925d8d5bff501e6d545f60d2a9881753a19dedf954b7d370c5bc436a3", + blockHash: "0x04949e1d949d2d60767a62b1cac172bf0d7c90013943de68ab42ce376c3fbf6d", blockNumber: "0x2", contractAddress: "0x5c4242beb94de30b922f57241f1d02f36e906915", cumulativeGasUsed: "0xd548", From c0856b8417f3ab6a1a8ba534b5c20f0b562f6168 Mon Sep 17 00:00:00 2001 From: tgmichel Date: Wed, 11 Nov 2020 10:34:20 +0100 Subject: [PATCH 16/17] Add required `unsubscribe` per test step --- tests/tests/test-subscription.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/tests/test-subscription.ts b/tests/tests/test-subscription.ts index fe9d029031..d4dfa55786 100644 --- a/tests/tests/test-subscription.ts +++ b/tests/tests/test-subscription.ts @@ -146,11 +146,13 @@ describeWithMoonbeam( }); }); + subscription.unsubscribe(); expect(connected).to.equal(true); expect(subscriptionId).to.have.lengthOf(16); }); step("should get newHeads stream", async function (done) { + subscription = context.web3.eth.subscribe("newBlockHeaders", function (error, result) {}); await createAndFinalizeBlock(context.web3); let data = null; await new Promise((resolve) => { @@ -159,6 +161,7 @@ describeWithMoonbeam( resolve(); }); }); + subscription.unsubscribe(); expect(data).to.include({ author: "0x0000000000000000000000000000000000000000", difficulty: "0", @@ -319,6 +322,7 @@ describeWithMoonbeam( } }); }); + subscription.unsubscribe(); expect(data).to.not.be.empty; setTimeout(done, 10000); From f5246aa52ab5ed9a7cd14067056d6110de768b73 Mon Sep 17 00:00:00 2001 From: tgmichel Date: Wed, 11 Nov 2020 11:33:37 +0100 Subject: [PATCH 17/17] Try to make tests work --- tests/tests/test-subscription.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/tests/test-subscription.ts b/tests/tests/test-subscription.ts index d4dfa55786..5e0bbadada 100644 --- a/tests/tests/test-subscription.ts +++ b/tests/tests/test-subscription.ts @@ -153,9 +153,9 @@ describeWithMoonbeam( step("should get newHeads stream", async function (done) { subscription = context.web3.eth.subscribe("newBlockHeaders", function (error, result) {}); - await createAndFinalizeBlock(context.web3); let data = null; await new Promise((resolve) => { + createAndFinalizeBlock(context.web3); subscription.on("data", function (d: any) { data = d; resolve();