fix estimateGas (handle ErrInsufficientBalanceWitness). Return proper…

… error message when ErrInsufficientBalanceWitness is encountered (ethereum#81)
jwasinger · Feb 11, 2022 · 94b2e58 · 94b2e58
1 parent 7af62ef
commit 94b2e58
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/core/state_transition.go b/core/state_transition.go
@@ -324,7 +324,7 @@ func (st *StateTransition) TransitionDb() (*ExecutionResult, error) {
 
 		statelessGasOrigin := st.evm.Accesses.TouchTxOriginAndComputeGas(originAddr.Bytes(), msg.Value().Sign() != 0)
 		if !tryConsumeGas(&st.gas, statelessGasOrigin) {
-			return nil, ErrInsufficientBalanceWitness
+			return nil, fmt.Errorf("%w: Insufficient funds to cover witness access costs for transaction: have %d, want %d", ErrInsufficientBalanceWitness, st.gas, gas)
 		}
 		originBalance = st.evm.StateDB.GetBalanceLittleEndian(originAddr)
 		originNonce := st.evm.StateDB.GetNonce(originAddr)
@@ -334,7 +334,7 @@ func (st *StateTransition) TransitionDb() (*ExecutionResult, error) {
 		if msg.To() != nil {
 			statelessGasDest := st.evm.Accesses.TouchTxExistingAndComputeGas(targetAddr.Bytes(), msg.Value().Sign() != 0)
 			if !tryConsumeGas(&st.gas, statelessGasDest) {
-				return nil, ErrInsufficientBalanceWitness
+				return nil, fmt.Errorf("%w: Insufficient funds to cover witness access costs for transaction: have %d, want %d", ErrInsufficientBalanceWitness, st.gas, gas)
 			}
 			targetBalance = st.evm.StateDB.GetBalanceLittleEndian(*targetAddr)
 			targetNonce = st.evm.StateDB.GetNonceLittleEndian(*targetAddr)
@@ -347,12 +347,12 @@ func (st *StateTransition) TransitionDb() (*ExecutionResult, error) {
 		} else {
 			contractAddr := crypto.CreateAddress(originAddr, originNonce)
 			if !tryConsumeGas(&st.gas, st.evm.Accesses.TouchAndChargeContractCreateInit(contractAddr.Bytes(), msg.Value().Sign() != 0)) {
-				return nil, ErrInsufficientBalanceWitness
+				return nil, fmt.Errorf("%w: Insufficient funds to cover witness access costs for transaction: have %d, want %d", ErrInsufficientBalanceWitness, st.gas, gas)
 			}
 		}
 
 		if st.gas < gas {
-			return nil, fmt.Errorf("Insufficient funds to cover witness access costs for transaction: have %d, want %d", st.gas, gas)
+			return nil, fmt.Errorf("%w: Insufficient funds to cover witness access costs for transaction: have %d, want %d", ErrInsufficientBalanceWitness, st.gas, gas)
 		}
 	}
 	st.gas -= gas

diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go
@@ -1070,7 +1070,7 @@ func DoEstimateGas(ctx context.Context, b Backend, args TransactionArgs, blockNr
 
 		result, err := DoCall(ctx, b, args, blockNrOrHash, nil, 0, gasCap)
 		if err != nil {
-			if errors.Is(err, core.ErrIntrinsicGas) {
+			if errors.Is(err, core.ErrIntrinsicGas) || errors.Is(err, core.ErrInsufficientBalanceWitness) {
 				return true, nil, nil // Special case, raise gas limit
 			}
 			return true, nil, err // Bail out