internal/ethapi: fix panic in accesslist creation (ethereum#23225)

gzliudan · Jul 2, 2024 · d05a6c3 · d05a6c3
1 parent 0b5313e
commit d05a6c3
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/core/types/transaction.go b/core/types/transaction.go
@@ -859,3 +859,7 @@ func (m *Message) SetBalanceTokenFeeForCall() {
 	m.balanceTokenFee = big.NewInt(0).SetUint64(m.gasLimit)
 	m.balanceTokenFee.Mul(m.balanceTokenFee, m.gasPrice)
 }
+
+func (m *Message) SetBalanceTokenFee(balanceTokenFee *big.Int) {
+	m.balanceTokenFee = balanceTokenFee
+}
diff --git a/core/vm/access_list_tracer.go b/core/vm/access_list_tracer.go
@@ -96,7 +96,7 @@ func (al accessList) equal(other accessList) bool {
 func (al accessList) accessList() types.AccessList {
 	acl := make(types.AccessList, 0, len(al))
 	for addr, slots := range al {
-		tuple := types.AccessTuple{Address: addr}
+		tuple := types.AccessTuple{Address: addr, StorageKeys: []common.Hash{}}
 		for slot := range slots {
 			tuple.StorageKeys = append(tuple.StorageKeys, slot)
 		}

diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go
@@ -2036,12 +2036,19 @@ func AccessList(ctx context.Context, b Backend, blockNrOrHash rpc.BlockNumberOrH
 		}
 		// Copy the original db so we don't modify it
 		statedb := db.Copy()
+		// Set the accesslist to the last al
+		args.AccessList = &accessList
+		msg, err := args.ToMessage(b, block.Number(), b.RPCGasCap(), header.BaseFee)
+		if err != nil {
+			return nil, 0, nil, err
+		}
+
 		feeCapacity := state.GetTRC21FeeCapacityFromState(statedb)
 		var balanceTokenFee *big.Int
 		if value, ok := feeCapacity[to]; ok {
 			balanceTokenFee = value
 		}
-		msg := types.NewMessage(args.from(), args.To, uint64(*args.Nonce), args.Value.ToInt(), uint64(*args.Gas), args.GasPrice.ToInt(), big.NewInt(0), big.NewInt(0), args.data(), accessList, false, balanceTokenFee, header.Number)
+		msg.SetBalanceTokenFee(balanceTokenFee)
 
 		// Apply the transaction with the access list tracer
 		tracer := vm.NewAccessListTracer(accessList, args.from(), to, precompiles)