EVM Deps Updates (#536)

darwinia-network · Mar 16, 2021 · da00f57 · da00f57
1 parent 015053c
commit da00f57
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 15 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/client/dvm/consensus/src/lib.rs b/client/dvm/consensus/src/lib.rs
@@ -89,7 +89,7 @@ where
 	I::Error: Into<ConsensusError>,
 	C: ProvideRuntimeApi<B> + Send + Sync + HeaderBackend<B> + AuxStore + ProvideCache<B> + BlockOf,
 	C::Api: EthereumRuntimeRPCApi<B>,
-	C::Api: BlockBuilderApi<B, Error = sp_blockchain::Error>,
+	C::Api: BlockBuilderApi<B>,
 {
 	pub fn new(inner: I, client: Arc<C>, backend: Arc<dc_db::Backend<B>>) -> Self {
 		Self {
@@ -108,7 +108,7 @@ where
 	I::Error: Into<ConsensusError>,
 	C: ProvideRuntimeApi<B> + Send + Sync + HeaderBackend<B> + AuxStore + ProvideCache<B> + BlockOf,
 	C::Api: EthereumRuntimeRPCApi<B>,
-	C::Api: BlockBuilderApi<B, Error = sp_blockchain::Error>,
+	C::Api: BlockBuilderApi<B>,
 {
 	type Error = ConsensusError;
 	type Transaction = sp_api::TransactionFor<C, B>;

diff --git 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
@@ -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
@@ -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<P: 'static>() -> Option<usize> {
+		return Some(0);
+	}
+
+	fn name<P: 'static>() -> 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
@@ -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<P: 'static>() -> Option<usize> {
+		return Some(0);
+	}
+
+	fn name<P: 'static>() -> 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
@@ -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" }