Skip to content

core: Log DA usage estimates #674

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

Draft
wants to merge 1 commit into
base: optimism
Choose a base branch
from
+22 −4
Draft

core: Log DA usage estimates #674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 10 additions & 4 deletions core/blockchain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,7 @@ var (
errInvalidNewChain = errors.New("invalid new chain")
)

var (
forkReadyInterval = 3 * time.Minute
)
var forkReadyInterval = 3 * time.Minute

const (
bodyCacheLimit = 256
Expand Down Expand Up @@ -2053,6 +2051,14 @@ func (bc *BlockChain) processBlock(parentRoot common.Hash, block *types.Block, s
}
ptime := time.Since(pstart)

// OP-Stack: DA usage logging
if res.EstDAUsage > 0 {
log.Info("Block processed with OP-Stack DA usage estimate",
"number", block.Number(), "hash", block.Hash(),
"da_usage", res.EstDAUsage, "tx_count", len(block.Transactions()),
)
}

vstart := time.Now()
if err := bc.validator.ValidateState(block, statedb, res, false); err != nil {
bc.reportBlock(block, res, err)
Expand Down Expand Up @@ -2153,7 +2159,7 @@ func (bc *BlockChain) processBlock(parentRoot common.Hash, block *types.Block, s
// switch over to the new chain if the TD exceeded the current chain.
// insertSideChain is only used pre-merge.
func (bc *BlockChain) insertSideChain(block *types.Block, it *insertIterator, makeWitness bool) (*stateless.Witness, int, error) {
var current = bc.CurrentBlock()
current := bc.CurrentBlock()

// The first sidechain block error is already verified to be ErrPrunedAncestor.
// Since we don't import them here, we expect ErrUnknownAncestor for the remaining
Expand Down
9 changes: 9 additions & 0 deletions core/state_processor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,9 @@ func (p *StateProcessor) Process(block *types.Block, statedb *state.StateDB, cfg
blockNumber = block.Number()
allLogs []*types.Log
gp = new(GasPool).AddGas(block.GasLimit())

// OP-Stack: DA usage logging
estDAUsage uint64
)

// Mutate the block and state according to any hard-fork specs
Expand Down Expand Up @@ -103,6 +106,10 @@ func (p *StateProcessor) Process(block *types.Block, statedb *state.StateDB, cfg
}
receipts = append(receipts, receipt)
allLogs = append(allLogs, receipt.Logs...)

if tx.Type() != types.DepositTxType {
estDAUsage += tx.RollupCostData().EstimatedDASize().Uint64()
}
}

isIsthmus := p.config.IsIsthmus(block.Time())
Expand Down Expand Up @@ -137,6 +144,8 @@ func (p *StateProcessor) Process(block *types.Block, statedb *state.StateDB, cfg
Requests: requests,
Logs: allLogs,
GasUsed: *usedGas,

EstDAUsage: estDAUsage,
}, nil
}

Expand Down
3 changes: 3 additions & 0 deletions core/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,7 @@ type ProcessResult struct {
Requests [][]byte
Logs []*types.Log
GasUsed uint64

// OP-Stack: DA usage logging
EstDAUsage uint64
}