Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

cip66 fixes #2310

Merged
merged 2 commits into from
Jun 11, 2024
Merged

cip66 fixes #2310

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
391549b
Fix rlp serailisation of cip66 tx to match cip definition
piersy Jun 4, 2024
5edfcc8
Ensure cip66 tx MaxFeeInFeeCurrency is copied
piersy Jun 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 13 additions & 9 deletions core/types/celo_denominated_tx.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ type CeloDenominatedTx struct {
GasTipCap *big.Int
GasFeeCap *big.Int
Gas uint64
FeeCurrency *common.Address `rlp:"nil"` // nil means native currency
To *common.Address `rlp:"nil"` // nil means contract creation
Value *big.Int
Data []byte
AccessList AccessList
FeeCurrency *common.Address `rlp:"nil"` // nil means native currency
MaxFeeInFeeCurrency *big.Int

// Signature values
Expand All @@ -39,14 +39,15 @@ func (tx *CeloDenominatedTx) copy() TxData {
Gas: tx.Gas,
FeeCurrency: copyAddressPtr(tx.FeeCurrency),
// These are copied below.
AccessList: make(AccessList, len(tx.AccessList)),
Value: new(big.Int),
ChainID: new(big.Int),
GasTipCap: new(big.Int),
GasFeeCap: new(big.Int),
V: new(big.Int),
R: new(big.Int),
S: new(big.Int),
AccessList: make(AccessList, len(tx.AccessList)),
Value: new(big.Int),
ChainID: new(big.Int),
GasTipCap: new(big.Int),
GasFeeCap: new(big.Int),
MaxFeeInFeeCurrency: new(big.Int),
V: new(big.Int),
R: new(big.Int),
S: new(big.Int),
}
copy(cpy.AccessList, tx.AccessList)
if tx.Value != nil {
Expand All @@ -61,6 +62,9 @@ func (tx *CeloDenominatedTx) copy() TxData {
if tx.GasFeeCap != nil {
cpy.GasFeeCap.Set(tx.GasFeeCap)
}
if tx.MaxFeeInFeeCurrency != nil {
cpy.MaxFeeInFeeCurrency.Set(tx.MaxFeeInFeeCurrency)
}
if tx.V != nil {
cpy.V.Set(tx.V)
}
Expand Down
Loading