core: fix pre-check for account balance under EIP-1559 (ethereum#23244)

gzliudan · Jun 25, 2024 · c64786a · c64786a
1 parent e4417d6
commit c64786a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/core/state_processor_test.go b/core/state_processor_test.go
@@ -120,7 +120,7 @@ func TestStateProcessorErrors(t *testing.T) {
 				txs: []*types.Transaction{
 					makeTx(0, common.Address{}, big.NewInt(1000000000000000000), params.TxGas, big.NewInt(875000000), nil),
 				},
-				want: "insufficient funds for transfer: address xdc71562b71999873DB5b286dF957af199Ec94617F7",
+				want: "insufficient funds for gas * price + value: address xdc71562b71999873DB5b286dF957af199Ec94617F7",
 			},
 			{ // ErrInsufficientFunds
 				txs: []*types.Transaction{

diff --git a/core/state_transition.go b/core/state_transition.go
@@ -195,6 +195,7 @@ func (st *StateTransition) buyGas() error {
 		if st.gasFeeCap != nil {
 			balanceCheck = new(big.Int).SetUint64(st.msg.Gas())
 			balanceCheck = balanceCheck.Mul(balanceCheck, st.gasFeeCap)
+			balanceCheck.Add(balanceCheck, st.value)
 		}
 		if have, want := st.state.GetBalance(st.msg.From()), balanceCheck; have.Cmp(want) < 0 {
 			return fmt.Errorf("%w: address %v have %v want %v", ErrInsufficientFunds, st.msg.From().Hex(), have, want)