Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 14 additions & 0 deletions core/types/l2trace.go
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,8 @@ type TransactionData struct {
GasPrice *hexutil.Big `json:"gasPrice"`
GasTipCap *hexutil.Big `json:"gasTipCap"`
GasFeeCap *hexutil.Big `json:"gasFeeCap"`
FeeTokenID *uint16 `json:"feeTokenID,omitempty"`
FeeLimit *hexutil.Big `json:"feeLimit,omitempty"`
From common.Address `json:"from"`
To *common.Address `json:"to"`
ChainId *hexutil.Big `json:"chainId"`
Expand Down Expand Up @@ -192,6 +194,18 @@ func NewTransactionData(tx *Transaction, blockNumber uint64, blockTime uint64, c
R: (*hexutil.Big)(r),
S: (*hexutil.Big)(s),
}

// Set FeeTokenID and FeeLimit for AltFeeTx
if tx.Type() == AltFeeTxType {
feeTokenID := tx.FeeTokenID()
if feeTokenID != 0 {
result.FeeTokenID = &feeTokenID
}
if feeLimit := tx.FeeLimit(); feeLimit != nil && feeLimit.Sign() > 0 {
result.FeeLimit = (*hexutil.Big)(feeLimit)
}
}

return result
}

Expand Down
8 changes: 7 additions & 1 deletion rollup/tracing/tracing.go
Original file line number Diff line number Diff line change
Expand Up @@ -536,7 +536,13 @@ func (env *TraceEnv) fillBlockTrace(block *types.Block) (*types.BlockTrace, erro
rcfg.IsCurieSlot,
},
rcfg.SequencerAddress: {rcfg.SequencerSetVerifyHashSlot},
// rcfg.L2ERC20RegistryAddress: {}, // TODO
rcfg.L2TokenRegistryAddress: {
rcfg.AllowListEnabledSlot,
rcfg.TokenRegistrySlot,
rcfg.TokenRegistrationSlot,
rcfg.PriceRatioSlot,
rcfg.AllowListSlot,
},
}

for addr, storages := range intrinsicStorageProofs {
Expand Down
Loading