Update evm crate version (#394)

* Companion for 230 * Format * Remove original withdraw
darwinia-network · Dec 9, 2020 · f225cd9 · f225cd9
1 parent 3d96114
commit f225cd9
Show file tree

Hide file tree

Showing 14 changed files with 116 additions and 63 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bin/node/runtime/pangolin/src/lib.rs b/bin/node/runtime/pangolin/src/lib.rs
@@ -1473,7 +1473,16 @@ impl_runtime_apis! {
 			gas_limit: U256,
 			gas_price: Option<U256>,
 			nonce: Option<U256>,
+			estimate: bool,
 		) -> Result<darwinia_evm::CallInfo, sp_runtime::DispatchError> {
+			let config = if estimate {
+				let mut config = <Runtime as darwinia_evm::Trait>::config().clone();
+				config.estimate = true;
+				Some(config)
+			} else {
+				None
+			};
+
 			<Runtime as darwinia_evm::Trait>::Runner::call(
 				from,
 				to,
@@ -1482,6 +1491,7 @@ impl_runtime_apis! {
 				gas_limit.low_u32(),
 				gas_price,
 				nonce,
+				config.as_ref().unwrap_or(<Runtime as darwinia_evm::Trait>::config()),
 			).map_err(|err| err.into())
 		}
 
@@ -1492,14 +1502,24 @@ impl_runtime_apis! {
 			gas_limit: U256,
 			gas_price: Option<U256>,
 			nonce: Option<U256>,
+			estimate: bool,
 		) -> Result<darwinia_evm::CreateInfo, sp_runtime::DispatchError> {
+			let config = if estimate {
+				let mut config = <Runtime as darwinia_evm::Trait>::config().clone();
+				config.estimate = true;
+				Some(config)
+			} else {
+				None
+			};
+
 			<Runtime as darwinia_evm::Trait>::Runner::create(
 				from,
 				data,
 				value,
 				gas_limit.low_u32(),
 				gas_price,
 				nonce,
+				config.as_ref().unwrap_or(<Runtime as darwinia_evm::Trait>::config()),
 			).map_err(|err| err.into())
 		}
 

diff --git a/client/dvm/rpc/src/eth.rs b/client/dvm/rpc/src/eth.rs
@@ -665,6 +665,7 @@ where
 						gas_limit,
 						gas_price,
 						nonce,
+						false,
 					)
 					.map_err(|err| internal_err(format!("runtime error: {:?}", err)))?
 					.map_err(|err| internal_err(format!("execution fatal: {:?}", err)))?;
@@ -683,6 +684,7 @@ where
 						gas_limit,
 						gas_price,
 						nonce,
+						false,
 					)
 					.map_err(|err| internal_err(format!("runtime error: {:?}", err)))?
 					.map_err(|err| internal_err(format!("execution fatal: {:?}", err)))?;
@@ -724,6 +726,7 @@ where
 						gas_limit,
 						gas_price,
 						nonce,
+						true,
 					)
 					.map_err(|err| internal_err(format!("runtime error: {:?}", err)))?
 					.map_err(|err| internal_err(format!("execution fatal: {:?}", err)))?;
@@ -744,6 +747,7 @@ where
 						gas_limit,
 						gas_price,
 						nonce,
+						true,
 					)
 					.map_err(|err| internal_err(format!("runtime error: {:?}", err)))?
 					.map_err(|err| internal_err(format!("execution fatal: {:?}", err)))?;

diff --git a/frame/dvm/Cargo.toml b/frame/dvm/Cargo.toml
@@ -14,7 +14,7 @@ version     = "1.2.2"
 codec          = { package = "parity-scale-codec", version = "1.3.5", default-features = false }
 ethereum       = { version = "0.5", default-features = false, features = ["with-codec"] }
 ethereum-types = { version = "0.9", default-features = false }
-evm            = { version = "0.18.0", features = ["with-codec"], default-features = false }
+evm            = { version = "0.19.0", features = ["with-codec"], default-features = false }
 libsecp256k1   = { version = "0.3", default-features = false }
 rlp            = { version = "0.4", default-features = false }
 rustc-hex      = { version = "2.1.0", default-features = false }

diff --git a/frame/dvm/rpc/runtime-api/src/lib.rs b/frame/dvm/rpc/runtime-api/src/lib.rs
@@ -71,6 +71,7 @@ sp_api::decl_runtime_apis! {
 			gas_limit: U256,
 			gas_price: Option<U256>,
 			nonce: Option<U256>,
+			estimate: bool,
 		) -> Result<darwinia_evm_primitives::CallInfo, sp_runtime::DispatchError>;
 		/// Returns a frame_ethereum::create response.
 		fn create(
@@ -80,6 +81,7 @@ sp_api::decl_runtime_apis! {
 			gas_limit: U256,
 			gas_price: Option<U256>,
 			nonce: Option<U256>,
+			estimate: bool,
 		) -> Result<darwinia_evm_primitives::CreateInfo, sp_runtime::DispatchError>;
 		/// Return the current block.
 		fn current_block() -> Option<EthereumBlock>;

diff --git a/frame/dvm/src/lib.rs b/frame/dvm/src/lib.rs
@@ -146,6 +146,7 @@ decl_module! {
 				Some(transaction.gas_price),
 				Some(transaction.nonce),
 				transaction.action,
+				None,
 			)?;
 
 			let (reason, status, used_gas) = match info {
@@ -411,7 +412,7 @@ impl<T: Trait> Module<T> {
 		CurrentReceipts::get()
 	}
 
-	/// Execute an Ethereum transaction, ignoring transaction signatures.
+	/// Execute an Ethereum transaction
 	pub fn execute(
 		from: H160,
 		input: Vec<u8>,
@@ -420,6 +421,7 @@ impl<T: Trait> Module<T> {
 		gas_price: Option<U256>,
 		nonce: Option<U256>,
 		action: TransactionAction,
+		config: Option<evm::Config>,
 	) -> Result<(Option<H160>, CallOrCreateInfo), DispatchError> {
 		match action {
 			ethereum::TransactionAction::Call(target) => Ok((
@@ -433,6 +435,7 @@ impl<T: Trait> Module<T> {
 						gas_limit.low_u32(),
 						gas_price,
 						nonce,
+						config.as_ref().unwrap_or(T::config()),
 					)
 					.map_err(Into::into)?,
 				),
@@ -447,6 +450,7 @@ impl<T: Trait> Module<T> {
 						gas_limit.low_u32(),
 						gas_price,
 						nonce,
+						config.as_ref().unwrap_or(T::config()),
 					)
 					.map_err(Into::into)?,
 				),

diff --git a/frame/dvm/src/tests.rs b/frame/dvm/src/tests.rs
@@ -63,6 +63,7 @@ fn transaction_should_increment_nonce() {
 			Some(t.gas_price),
 			Some(t.nonce),
 			t.action,
+			None,
 		));
 		assert_eq!(
 			<Test as darwinia_evm::Trait>::AccountBasicMapping::account_basic(&alice.address).nonce,
@@ -117,6 +118,7 @@ fn transaction_with_invalid_nonce_should_not_work() {
 			Some(t.gas_price),
 			Some(t.nonce),
 			t.action,
+			None,
 		));
 
 		transaction.nonce = U256::from(0);
@@ -147,6 +149,7 @@ fn contract_constructor_should_get_executed() {
 			Some(t.gas_price),
 			Some(t.nonce),
 			t.action,
+			None,
 		));
 		assert_eq!(
 			Evm::account_storages(erc20_address, alice_storage_address),
@@ -214,6 +217,7 @@ fn contract_should_be_created_at_given_address() {
 			Some(t.gas_price),
 			Some(t.nonce),
 			t.action,
+			None,
 		));
 		assert_ne!(Evm::account_codes(erc20_address).len(), 0);
 	});
@@ -236,6 +240,7 @@ fn transaction_should_generate_correct_gas_used() {
 			Some(t.gas_price),
 			Some(t.nonce),
 			t.action,
+			None,
 		)
 		.unwrap();
 
@@ -282,6 +287,7 @@ fn call_should_handle_errors() {
 			Some(t.gas_price),
 			Some(t.nonce),
 			t.action,
+			None,
 		));
 
 		let contract_address: Vec<u8> =
@@ -298,6 +304,7 @@ fn call_should_handle_errors() {
 			Some(U256::from(1)),
 			Some(U256::from(1)),
 			TransactionAction::Call(H160::from_slice(&contract_address)),
+			None,
 		)
 		.unwrap();
 		match info {
@@ -319,6 +326,7 @@ fn call_should_handle_errors() {
 			Some(U256::from(1)),
 			Some(U256::from(2)),
 			TransactionAction::Call(H160::from_slice(&contract_address)),
+			None,
 		)
 		.ok()
 		.unwrap();

diff --git a/frame/evm/Cargo.toml b/frame/evm/Cargo.toml
@@ -12,9 +12,9 @@ version     = "1.2.2"
 [dependencies]
 # crates
 codec                 = { package = "parity-scale-codec", version = "1.3.5", default-features = false }
-evm                   = { version = "0.18", default-features = false, features = ["with-codec"] }
-evm-gasometer         = { version = "0.18", default-features = false }
-evm-runtime           = { version = "0.18", default-features = false }
+evm                   = { version = "0.19.0", default-features = false, features = ["with-codec"] }
+evm-gasometer         = { version = "0.19.0", default-features = false }
+evm-runtime           = { version = "0.19.0", default-features = false }
 impl-trait-for-tuples = { version = "0.1" }
 primitive-types       = { version = "0.7.0", default-features = false, features = ["rlp", "byteorder"] }
 ripemd160             = { version = "0.9", default-features = false }

diff --git a/frame/evm/src/lib.rs b/frame/evm/src/lib.rs
@@ -357,20 +357,6 @@ decl_module! {
 
 		fn deposit_event() = default;
 
-		/// Withdraw balance from EVM into currency/balances module.
-		#[weight = 0]
-		fn withdraw(origin, address: H160, value: BalanceOf<T>) {
-			let destination = T::WithdrawOrigin::ensure_address_origin(&address, origin)?;
-			let address_account_id = T::AddressMapping::into_account_id(address);
-
-			T::Currency::transfer(
-				&address_account_id,
-				&destination,
-				value,
-				ExistenceRequirement::AllowDeath
-			)?;
-		}
-
 		/// Issue an EVM call operation. This is similar to a message call transaction in Ethereum.
 		#[weight = T::GasToWeight::gas_to_weight(*gas_limit)]
 		fn call(
@@ -393,6 +379,7 @@ decl_module! {
 				gas_limit,
 				Some(gas_price),
 				nonce,
+				T::config(),
 			)?;
 
 			match info.exit_reason {
@@ -431,6 +418,7 @@ decl_module! {
 				gas_limit,
 				Some(gas_price),
 				nonce,
+				T::config(),
 			)?;
 			match info {
 				CreateInfo {
@@ -477,6 +465,7 @@ decl_module! {
 				gas_limit,
 				Some(gas_price),
 				nonce,
+				T::config(),
 			)?;
 			match info {
 				CreateInfo {

diff --git a/frame/evm/src/runner/builtin.rs b/frame/evm/src/runner/builtin.rs
@@ -57,6 +57,7 @@ impl<T: Trait> RunnerT<T> for Runner<T> {
 		gas_limit: u32,
 		gas_price: Option<U256>,
 		nonce: Option<U256>,
+		config: &evm::Config,
 	) -> Result<CallInfo, Self::Error> {
 		let gas_price = match gas_price {
 			Some(gas_price) => {
@@ -85,8 +86,6 @@ impl<T: Trait> RunnerT<T> for Runner<T> {
 				origin: source,
 			};
 
-			let config = T::config();
-
 			let mut substate = Handler::<T>::new_with_precompile(
 				&vicinity,
 				gas_limit as usize,
@@ -125,6 +124,7 @@ impl<T: Trait> RunnerT<T> for Runner<T> {
 		gas_limit: u32,
 		gas_price: Option<U256>,
 		nonce: Option<U256>,
+		config: &evm::Config,
 	) -> Result<CreateInfo, Self::Error> {
 		let gas_price = match gas_price {
 			Some(gas_price) => {
@@ -153,8 +153,6 @@ impl<T: Trait> RunnerT<T> for Runner<T> {
 				origin: source,
 			};
 
-			let config = T::config();
-
 			let mut substate = Handler::<T>::new_with_precompile(
 				&vicinity,
 				gas_limit as usize,
@@ -203,6 +201,7 @@ impl<T: Trait> RunnerT<T> for Runner<T> {
 		gas_limit: u32,
 		gas_price: Option<U256>,
 		nonce: Option<U256>,
+		config: &evm::Config,
 	) -> Result<CreateInfo, Self::Error> {
 		let gas_price = match gas_price {
 			Some(gas_price) => {
@@ -231,8 +230,6 @@ impl<T: Trait> RunnerT<T> for Runner<T> {
 				origin: source,
 			};
 
-			let config = T::config();
-
 			let mut substate = Handler::<T>::new_with_precompile(
 				&vicinity,
 				gas_limit as usize,

diff --git a/frame/evm/src/runner/mod.rs b/frame/evm/src/runner/mod.rs
@@ -34,6 +34,7 @@ pub trait Runner<T: Trait> {
 		gas_limit: u32,
 		gas_price: Option<U256>,
 		nonce: Option<U256>,
+		config: &evm::Config,
 	) -> Result<CallInfo, Self::Error>;
 
 	fn create(
@@ -43,6 +44,7 @@ pub trait Runner<T: Trait> {
 		gas_limit: u32,
 		gas_price: Option<U256>,
 		nonce: Option<U256>,
+		config: &evm::Config,
 	) -> Result<CreateInfo, Self::Error>;
 
 	fn create2(
@@ -53,5 +55,6 @@ pub trait Runner<T: Trait> {
 		gas_limit: u32,
 		gas_price: Option<U256>,
 		nonce: Option<U256>,
+		config: &evm::Config,
 	) -> Result<CreateInfo, Self::Error>;
 }