Parametrise Op block time (#116)

* Leggo

* Update

Author: ferranbt

internal/artifacts.go

@@ -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
@@ -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,
 	}
 }
 
@@ -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
 }
@@ -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
 			}
@@ -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,

internal/recipe_opstack.go

@@ -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 {
@@ -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
 }