Skip to content

fix: use bedrock cost func for concurrent activation #2

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

Merged
danyalprout merged 1 commit into from
Apr 18, 2024
Merged

fix: use bedrock cost func for concurrent activation #2

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
31 changes: 18 additions & 13 deletions core/types/rollup_cost.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,21 @@ func NewL1CostFunc(config *params.ChainConfig, statedb StateGetter) L1CostFunc {
l1FeeScalars := statedb.GetState(L1BlockAddr, L1FeeScalarsSlot).Bytes()
l1BlobBaseFee := statedb.GetState(L1BlockAddr, L1BlobBaseFeeSlot).Big()
l1BaseFee := statedb.GetState(L1BlockAddr, L1BaseFeeSlot).Big()

if config.IsOptimismEcotone(blockTime) {
// Edge case: the very first Ecotone block requires we use the Bedrock cost
// function. We detect this scenario by checking if the Ecotone parameters are
// unset. Note here we rely on assumption that the scalar parameters are adjacent
// in the buffer and l1BaseFeeScalar comes first. We need to check this prior to
// other forks, as the first block of Fjord and Ecotone could be the same block.
firstEcotoneBlock := l1BlobBaseFee.BitLen() == 0 &&
bytes.Equal(emptyScalars, l1FeeScalars[scalarSectionStart:scalarSectionStart+8])
if firstEcotoneBlock {
log.Info("using bedrock l1 cost func for first Ecotone block", "time", blockTime)
return newL1CostFuncBedrock(config, statedb, blockTime)
}
}

if config.IsOptimismFjord(blockTime) {
l1BaseFeeScalar, l1BlobBaseFeeScalar := extractEcotoneFeeParams(l1FeeScalars)
return newL1CostFuncFjord(
Expand All @@ -139,19 +154,9 @@ func NewL1CostFunc(config *params.ChainConfig, statedb StateGetter) L1CostFunc {
l1CostFastlzCoef,
l1CostTxSizeCoef,
)
}
if config.IsOptimismEcotone(blockTime) {
// Edge case: the very first Ecotone block requires we use the Bedrock cost
// function. We detect this scenario by checking if the Ecotone parameters are
// unset. Note here we rely on assumption that the scalar parameters are adjacent
// in the buffer and l1BaseFeeScalar comes first.
firstEcotoneBlock := l1BlobBaseFee.BitLen() == 0 &&
bytes.Equal(emptyScalars, l1FeeScalars[scalarSectionStart:scalarSectionStart+8])
if !firstEcotoneBlock {
l1BaseFeeScalar, l1BlobBaseFeeScalar := extractEcotoneFeeParams(l1FeeScalars)
return newL1CostFuncEcotone(l1BaseFee, l1BlobBaseFee, l1BaseFeeScalar, l1BlobBaseFeeScalar)
}
log.Info("using bedrock l1 cost func for first Ecotone block", "time", blockTime)
} else if config.IsOptimismEcotone(blockTime) {
l1BaseFeeScalar, l1BlobBaseFeeScalar := extractEcotoneFeeParams(l1FeeScalars)
return newL1CostFuncEcotone(l1BaseFee, l1BlobBaseFee, l1BaseFeeScalar, l1BlobBaseFeeScalar)
}
return newL1CostFuncBedrock(config, statedb, blockTime)
}
Expand Down
12 changes: 12 additions & 0 deletions core/types/rollup_cost_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,18 @@ func TestNewL1CostFunc(t *testing.T) {
fee = costFunc(emptyTx.RollupCostData(), time)
require.NotNil(t, fee)
require.Equal(t, regolithFee, fee)

// emptyTx fee w/ fjord config, but simulate first ecotone block by blowing away the ecotone
// params. Should result in regolith fee.
config.EcotoneTime = &time
config.FjordTime = &time
statedb.baseFeeScalar = 0
statedb.blobBaseFeeScalar = 0
statedb.blobBaseFee = new(big.Int)
costFunc = NewL1CostFunc(config, statedb)
fee = costFunc(emptyTx.RollupCostData(), time)
require.NotNil(t, fee)
require.Equal(t, regolithFee, fee)
}

func TestFlzCompressLen(t *testing.T) {
Expand Down