Skip to content

Parametrise Op block time #116

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
merged 2 commits into from
Apr 26, 2025
+18 −4
Merged

Parametrise Op block time #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1825048
Leggo
ferranbt Apr 25, 2025
db7bfe7
Update
ferranbt Apr 25, 2025
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
16 changes: 12 additions & 4 deletions internal/artifacts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ import (
)

var (
opBlockTimeSeconds = uint64(2)
defaultDiscoveryPrivKey = "a11ac89899cd86e36b6fb881ec1255b8a92a688790b7d950f8b7d8dd626671fb"
defaultDiscoveryEnodeID = "3479db4d9217fb5d7a8ed4d61ac36e120b05d36c2eefb795dc42ff2e971f251a2315f5649ea1833271e020b9adc98d5db9973c7ed92d6b2f1f2223088c3d852f"
defaultOpBlockTimeSeconds = uint64(2)
defaultDiscoveryPrivKey = "a11ac89899cd86e36b6fb881ec1255b8a92a688790b7d950f8b7d8dd626671fb"
defaultDiscoveryEnodeID = "3479db4d9217fb5d7a8ed4d61ac36e120b05d36c2eefb795dc42ff2e971f251a2315f5649ea1833271e020b9adc98d5db9973c7ed92d6b2f1f2223088c3d852f"
)

// minimumGenesisDelay is the minimum delay for the genesis time. This is required
Expand Down Expand Up @@ -66,13 +66,15 @@ type ArtifactsBuilder struct {
applyLatestL1Fork bool
genesisDelay uint64
applyLatestL2Fork *uint64
OpblockTime uint64
}

func NewArtifactsBuilder() *ArtifactsBuilder {
return &ArtifactsBuilder{
outputDir: "",
applyLatestL1Fork: false,
genesisDelay: MinimumGenesisDelay,
OpblockTime: defaultOpBlockTimeSeconds,
}
}

Expand All @@ -96,6 +98,11 @@ func (b *ArtifactsBuilder) GenesisDelay(genesisDelaySeconds uint64) *ArtifactsBu
return b
}

func (b *ArtifactsBuilder) OpBlockTime(blockTimeSeconds uint64) *ArtifactsBuilder {
b.OpblockTime = blockTimeSeconds
return b
}

type Artifacts struct {
Out *output
}
Expand Down Expand Up @@ -258,7 +265,7 @@ func (b *ArtifactsBuilder) Build() (*Artifacts, error) {
forkTime = new(uint64)

if *b.applyLatestL2Fork != 0 {
*forkTime = opTimestamp + opBlockTimeSeconds*(*b.applyLatestL2Fork)
*forkTime = opTimestamp + b.OpblockTime*(*b.applyLatestL2Fork)
} else {
*forkTime = 0
}
Expand Down Expand Up @@ -317,6 +324,7 @@ func (b *ArtifactsBuilder) Build() (*Artifacts, error) {
"number": 0,
},
},
"block_time": b.OpblockTime,
"chain_op_config": map[string]interface{}{ // TODO: Read this from somewhere (genesis??)
"eip1559Elasticity": 6,
"eip1559Denominator": 50,
Expand Down
6 changes: 6 additions & 0 deletions internal/recipe_opstack.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ type OpRecipe struct {

// whether to enable the latest fork isthmus and when
enableLatestFork *uint64

// blockTime is the block time to use for the rollup
// (default is 2 seconds)
blockTime uint64
}

func (o *OpRecipe) Name() string {
Expand All @@ -28,12 +32,14 @@ func (o *OpRecipe) Flags() *flag.FlagSet {
flags := flag.NewFlagSet("opstack", flag.ContinueOnError)
flags.StringVar(&o.externalBuilder, "external-builder", "", "External builder URL")
flags.Var(&nullableUint64Value{&o.enableLatestFork}, "enable-latest-fork", "Enable latest fork isthmus (nil or empty = disabled, otherwise enabled at specified block)")
flags.Uint64Var(&o.blockTime, "block-time", defaultOpBlockTimeSeconds, "Block time to use for the rollup")
return flags
}

func (o *OpRecipe) Artifacts() *ArtifactsBuilder {
builder := NewArtifactsBuilder()
builder.ApplyLatestL2Fork(o.enableLatestFork)
builder.OpBlockTime(o.blockTime)
return builder
}

Expand Down