forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-05-24 08:49:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 0268f2e03d into 12eabbd76d

Browse source
This commit is contained in:
Sushil-19 2026-05-21 21:55:05 -07:00 committed by GitHub
commit c7905374e4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 46 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
internal/ethapi/transaction_args.go
View file

@ -40,6 +40,8 @@ import (
// TransactionArgs represents the arguments to construct a new transaction
// or a message call.
type TransactionArgs struct {
Type *hexutil.Uint64 `json:"type,omitempty"`
From *common.Address `json:"from"`
To *common.Address `json:"to"`
Gas *hexutil.Uint64 `json:"gas"`
@ -72,6 +74,24 @@ type TransactionArgs struct {
AuthorizationList []types.SetCodeAuthorization `json:"authorizationList"`
}
func (args *TransactionArgs) inferTxType(defaultType int) int {
usedType := types.LegacyTxType
switch {
case args.AuthorizationList != nil || defaultType == types.SetCodeTxType:
usedType = types.SetCodeTxType
case args.BlobHashes != nil || defaultType == types.BlobTxType:
usedType = types.BlobTxType
case args.MaxFeePerGas != nil || defaultType == types.DynamicFeeTxType:
usedType = types.DynamicFeeTxType
case args.AccessList != nil || defaultType == types.AccessListTxType:
usedType = types.AccessListTxType
}
if args.GasPrice != nil {
usedType = types.LegacyTxType
}
return usedType
}
// from retrieves the transaction sender address.
func (args *TransactionArgs) from() common.Address {
if args.From == nil {
@ -176,6 +196,32 @@ func (args *TransactionArgs) setDefaults(ctx context.Context, b Backend, config
} else {
args.ChainID = (*hexutil.Big)(want)
}
// Validate explicit transaction type if provided
if args.Type != nil {
requested := int(*args.Type)
// Validate supported types
switch requested {
case types.LegacyTxType,
types.AccessListTxType,
types.DynamicFeeTxType,
types.BlobTxType,
types.SetCodeTxType:
// ok
default:
return fmt.Errorf("unsupported transaction type: %d", requested)
}
inferred := args.inferTxType(types.LegacyTxType)
if requested != inferred {
return fmt.Errorf(
"transaction type mismatch (requested=%d inferred=%d)",
requested, inferred,
)
}
}
return nil
}