diff --git a/Cargo.lock b/Cargo.lock index 6251f47050..4c3f7a7125 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1889,8 +1889,8 @@ dependencies = [ "dvm-ethereum", "dvm-rpc-core", "dvm-rpc-runtime-api", - "ethereum 0.6.0", - "ethereum-types 0.10.0", + "ethereum 0.7.1", + "ethereum-types 0.11.0", "futures 0.3.13", "jsonrpc-core", "jsonrpc-core-client", @@ -2010,7 +2010,7 @@ dependencies = [ name = "dp-rpc" version = "2.0.0" dependencies = [ - "ethereum-types 0.10.0", + "ethereum-types 0.11.0", "jsonrpc-core", "jsonrpc-core-client", "jsonrpc-derive", @@ -2174,8 +2174,8 @@ dependencies = [ "darwinia-evm", "dp-evm", "dp-rpc", - "ethereum 0.6.0", - "ethereum-types 0.10.0", + "ethereum 0.7.1", + "ethereum-types 0.11.0", "jsonrpc-core", "jsonrpc-derive", "jsonrpc-pubsub", @@ -2402,7 +2402,6 @@ dependencies = [ "fixed-hash 0.7.0", "impl-codec 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "impl-rlp 0.3.0", - "impl-serde 0.3.1", "tiny-keccak 2.0.2", ] @@ -2520,7 +2519,6 @@ dependencies = [ "fixed-hash 0.7.0", "impl-codec 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "impl-rlp 0.3.0", - "impl-serde 0.3.1", "primitive-types 0.8.0", "uint 0.9.0", ] @@ -6007,7 +6005,6 @@ dependencies = [ "fixed-hash 0.7.0", "impl-codec 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "impl-rlp 0.3.0", - "impl-serde 0.3.1", "uint 0.9.0", ] diff --git a/client/dvm/consensus/src/lib.rs b/client/dvm/consensus/src/lib.rs index edece2cdf0..051bf34f12 100644 --- a/client/dvm/consensus/src/lib.rs +++ b/client/dvm/consensus/src/lib.rs @@ -89,7 +89,7 @@ where I::Error: Into, C: ProvideRuntimeApi + Send + Sync + HeaderBackend + AuxStore + ProvideCache + BlockOf, C::Api: EthereumRuntimeRPCApi, - C::Api: BlockBuilderApi, + C::Api: BlockBuilderApi, { pub fn new(inner: I, client: Arc, backend: Arc>) -> Self { Self { @@ -108,7 +108,7 @@ where I::Error: Into, C: ProvideRuntimeApi + Send + Sync + HeaderBackend + AuxStore + ProvideCache + BlockOf, C::Api: EthereumRuntimeRPCApi, - C::Api: BlockBuilderApi, + C::Api: BlockBuilderApi, { type Error = ConsensusError; type Transaction = sp_api::TransactionFor; diff --git a/client/dvm/rpc/Cargo.toml b/client/dvm/rpc/Cargo.toml index a6bab1bb1c..33f7743858 100644 --- a/client/dvm/rpc/Cargo.toml +++ b/client/dvm/rpc/Cargo.toml @@ -13,8 +13,8 @@ version = "2.0.0" # crates array-bytes = { version = "1.1.0" } codec = { package = "parity-scale-codec", version = "2.0.1" } -ethereum = { version = "0.6.0", features = ["with-codec"] } -ethereum-types = { version = "0.10.0" } +ethereum = { version = "0.7.1", features = ["with-codec"] } +ethereum-types = { version = "0.11.0" } futures = { version = "0.3.13", features = ["compat"] } jsonrpc-core = { version = "15.1.0" } jsonrpc-core-client = { version = "15.1.0" } diff --git a/frame/dvm/rpc/Cargo.toml b/frame/dvm/rpc/Cargo.toml index 4a619f1c6b..6d1b3ede1f 100644 --- a/frame/dvm/rpc/Cargo.toml +++ b/frame/dvm/rpc/Cargo.toml @@ -12,8 +12,8 @@ version = "2.0.0" [dependencies] # crates codec = { package = "parity-scale-codec", version = "2.0.1", default-features = false } -ethereum = { version = "0.6.0", default-features = false, features = ["with-codec"] } -ethereum-types = { version = "0.10.0", default-features = false } +ethereum = { version = "0.7.1", default-features = false, features = ["with-codec"] } +ethereum-types = { version = "0.11.0", default-features = false } jsonrpc-core = { version = "15.1.0" } jsonrpc-derive = { version = "15.1.0" } jsonrpc-pubsub = { version = "15.1.0" } diff --git a/frame/dvm/src/mock.rs b/frame/dvm/src/mock.rs index fd1e8e4948..8a41687bbd 100644 --- a/frame/dvm/src/mock.rs +++ b/frame/dvm/src/mock.rs @@ -40,6 +40,18 @@ darwinia_support::impl_test_account_data! { deprecated } type Balance = u64; +pub struct PalletInfo; + +impl frame_support::traits::PalletInfo for PalletInfo { + fn index() -> Option { + return Some(0); + } + + fn name() -> Option<&'static str> { + return Some("TestName"); + } +} + // For testing the pallet, we construct most of a mock runtime. This means // first constructing a configuration type (`Test`) which `impl`s each of the // configuration traits of pallets we want to use. diff --git a/frame/evm/src/tests.rs b/frame/evm/src/tests.rs index e3b0589e93..14a7d699d0 100644 --- a/frame/evm/src/tests.rs +++ b/frame/evm/src/tests.rs @@ -25,6 +25,18 @@ impl_outer_dispatch! { darwinia_support::impl_test_account_data! { deprecated } +pub struct PalletInfo; + +impl frame_support::traits::PalletInfo for PalletInfo { + fn index() -> Option { + return Some(0); + } + + fn name() -> Option<&'static str> { + return Some("TestName"); + } +} + #[derive(Clone, Eq, PartialEq, Debug)] pub struct Test; diff --git a/primitives/rpc/Cargo.toml b/primitives/rpc/Cargo.toml index 7a2ff0a0ff..b630170137 100644 --- a/primitives/rpc/Cargo.toml +++ b/primitives/rpc/Cargo.toml @@ -11,7 +11,7 @@ version = "2.0.0" [dependencies] # crates -ethereum-types = { version = "0.10.0" } +ethereum-types = { version = "0.11.0" } jsonrpc-core = { version = "15.1.0" } jsonrpc-core-client = { version = "15.1.0" } jsonrpc-derive = { version = "15.1.0" }