Fix evm validate (#1553)

bifrost-io · Dec 17, 2024 · c7ef441 · c7ef441
1 parent 51bf31c
commit c7ef441
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/runtime/bifrost-polkadot/src/evm/runner.rs b/runtime/bifrost-polkadot/src/evm/runner.rs
@@ -121,11 +121,11 @@ where
 		let account_id = T::AddressMapping::into_account_id(source);
 		let account_nonce = frame_system::Pallet::<T>::account_nonce(&account_id);
 
-		let (balance, b_weight) = B::get_balance_in_currency(evm_currency, &account_id, base_fee)
-			.map_err(|_| RunnerError {
-			error: R::Error::from(TransactionValidationError::BalanceTooLow),
-			weight,
-		})?;
+		let (balance, b_weight) =
+			match B::get_balance_in_currency(evm_currency, &account_id, base_fee) {
+				Ok((balance, b_weight)) => (balance, b_weight),
+				Err(_) => (0, T::DbWeight::get().reads(2)),
+			};
 
 		let (source_account, inner_weight) = (
 			Account {

diff --git a/runtime/bifrost-polkadot/src/lib.rs b/runtime/bifrost-polkadot/src/lib.rs
@@ -2147,7 +2147,7 @@ impl fp_rpc::EthereumRuntimeRPCApi<Block> for Runtime {
 						};
 
 			// don't allow calling EVM RPC or Runtime API from a bound address
-			if EVMAccounts::bound_account_id(from).is_some() {
+			if !estimate && EVMAccounts::bound_account_id(from).is_some() {
 				return Err(pallet_evm_accounts::Error::<Runtime>::BoundAddressCannotBeUsed.into())
 			};
 
@@ -2228,9 +2228,9 @@ impl fp_rpc::EthereumRuntimeRPCApi<Block> for Runtime {
 				};
 
 			// don't allow calling EVM RPC or Runtime API from a bound address
-			if EVMAccounts::bound_account_id(from).is_some() {
+			if !estimate && EVMAccounts::bound_account_id(from).is_some() {
 				return Err(pallet_evm_accounts::Error::<Runtime>::BoundAddressCannotBeUsed.into())
-				};
+			};
 
 			// the address needs to have a permission to deploy smart contract
 			if !EVMAccounts::can_deploy_contracts(from) {