2a6beb6a39
This PR removes the newly added txpool.Transaction wrapper type, and instead adds a way of keeping the blob sidecar within types.Transaction. It's better this way because most code in go-ethereum does not care about blob transactions, and probably never will. This will start mattering especially on the client side of RPC, where all APIs are based on types.Transaction. Users need to be able to use the same signing flows they already have. However, since blobs are only allowed in some places but not others, we will now need to add checks to avoid creating invalid blocks. I'm still trying to figure out the best place to do some of these. The way I have it currently is as follows: - In block validation (import), txs are verified not to have a blob sidecar. - In miner, we strip off the sidecar when committing the transaction into the block. - In TxPool validation, txs must have a sidecar to be added into the blobpool. - Note there is a special case here: when transactions are re-added because of a chain reorg, we cannot use the transactions gathered from the old chain blocks as-is, because they will be missing their blobs. This was previously handled by storing the blobs into the 'blobpool limbo'. The code has now changed to store the full transaction in the limbo instead, but it might be confusing for code readers why we're not simply adding the types.Transaction we already have. Code changes summary: - txpool.Transaction removed and all uses replaced by types.Transaction again - blobpool now stores types.Transaction instead of defining its own blobTx format for storage - the blobpool limbo now stores types.Transaction instead of storing only the blobs - checks to validate the presence/absence of the blob sidecar added in certain critical places
130 lines
4.1 KiB
Go
130 lines
4.1 KiB
Go
// Copyright 2021 The go-ethereum Authors
|
|
// This file is part of the go-ethereum library.
|
|
//
|
|
// The go-ethereum library is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU Lesser General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// The go-ethereum library is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU Lesser General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU Lesser General Public License
|
|
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
package types
|
|
|
|
import (
|
|
"bytes"
|
|
"math/big"
|
|
|
|
"github.com/ethereum/go-ethereum/common"
|
|
"github.com/ethereum/go-ethereum/rlp"
|
|
)
|
|
|
|
//go:generate go run github.com/fjl/gencodec -type AccessTuple -out gen_access_tuple.go
|
|
|
|
// AccessList is an EIP-2930 access list.
|
|
type AccessList []AccessTuple
|
|
|
|
// AccessTuple is the element type of an access list.
|
|
type AccessTuple struct {
|
|
Address common.Address `json:"address" gencodec:"required"`
|
|
StorageKeys []common.Hash `json:"storageKeys" gencodec:"required"`
|
|
}
|
|
|
|
// StorageKeys returns the total number of storage keys in the access list.
|
|
func (al AccessList) StorageKeys() int {
|
|
sum := 0
|
|
for _, tuple := range al {
|
|
sum += len(tuple.StorageKeys)
|
|
}
|
|
return sum
|
|
}
|
|
|
|
// AccessListTx is the data of EIP-2930 access list transactions.
|
|
type AccessListTx struct {
|
|
ChainID *big.Int // destination chain ID
|
|
Nonce uint64 // nonce of sender account
|
|
GasPrice *big.Int // wei per gas
|
|
Gas uint64 // gas limit
|
|
To *common.Address `rlp:"nil"` // nil means contract creation
|
|
Value *big.Int // wei amount
|
|
Data []byte // contract invocation input data
|
|
AccessList AccessList // EIP-2930 access list
|
|
V, R, S *big.Int // signature values
|
|
}
|
|
|
|
// copy creates a deep copy of the transaction data and initializes all fields.
|
|
func (tx *AccessListTx) copy() TxData {
|
|
cpy := &AccessListTx{
|
|
Nonce: tx.Nonce,
|
|
To: copyAddressPtr(tx.To),
|
|
Data: common.CopyBytes(tx.Data),
|
|
Gas: tx.Gas,
|
|
// These are copied below.
|
|
AccessList: make(AccessList, len(tx.AccessList)),
|
|
Value: new(big.Int),
|
|
ChainID: new(big.Int),
|
|
GasPrice: new(big.Int),
|
|
V: new(big.Int),
|
|
R: new(big.Int),
|
|
S: new(big.Int),
|
|
}
|
|
copy(cpy.AccessList, tx.AccessList)
|
|
if tx.Value != nil {
|
|
cpy.Value.Set(tx.Value)
|
|
}
|
|
if tx.ChainID != nil {
|
|
cpy.ChainID.Set(tx.ChainID)
|
|
}
|
|
if tx.GasPrice != nil {
|
|
cpy.GasPrice.Set(tx.GasPrice)
|
|
}
|
|
if tx.V != nil {
|
|
cpy.V.Set(tx.V)
|
|
}
|
|
if tx.R != nil {
|
|
cpy.R.Set(tx.R)
|
|
}
|
|
if tx.S != nil {
|
|
cpy.S.Set(tx.S)
|
|
}
|
|
return cpy
|
|
}
|
|
|
|
// accessors for innerTx.
|
|
func (tx *AccessListTx) txType() byte { return AccessListTxType }
|
|
func (tx *AccessListTx) chainID() *big.Int { return tx.ChainID }
|
|
func (tx *AccessListTx) accessList() AccessList { return tx.AccessList }
|
|
func (tx *AccessListTx) data() []byte { return tx.Data }
|
|
func (tx *AccessListTx) gas() uint64 { return tx.Gas }
|
|
func (tx *AccessListTx) gasPrice() *big.Int { return tx.GasPrice }
|
|
func (tx *AccessListTx) gasTipCap() *big.Int { return tx.GasPrice }
|
|
func (tx *AccessListTx) gasFeeCap() *big.Int { return tx.GasPrice }
|
|
func (tx *AccessListTx) value() *big.Int { return tx.Value }
|
|
func (tx *AccessListTx) nonce() uint64 { return tx.Nonce }
|
|
func (tx *AccessListTx) to() *common.Address { return tx.To }
|
|
|
|
func (tx *AccessListTx) effectiveGasPrice(dst *big.Int, baseFee *big.Int) *big.Int {
|
|
return dst.Set(tx.GasPrice)
|
|
}
|
|
|
|
func (tx *AccessListTx) rawSignatureValues() (v, r, s *big.Int) {
|
|
return tx.V, tx.R, tx.S
|
|
}
|
|
|
|
func (tx *AccessListTx) setSignatureValues(chainID, v, r, s *big.Int) {
|
|
tx.ChainID, tx.V, tx.R, tx.S = chainID, v, r, s
|
|
}
|
|
|
|
func (tx *AccessListTx) encode(b *bytes.Buffer) error {
|
|
return rlp.Encode(b, tx)
|
|
}
|
|
|
|
func (tx *AccessListTx) decode(input []byte) error {
|
|
return rlp.DecodeBytes(input, tx)
|
|
}
|