wip: update opstack for jovian fork

Author: akundaz

README.md

@@ -49,7 +49,7 @@ $ builder-playground cook opstack [flags]
 Flags:
 
 - `--external-builder`: URL of an external builder to use (enables rollup-boost)
-- `--enable-latest-fork` (int): Enables the latest fork (isthmus) at startup (0) or n blocks after genesis.
+- `--enable-latest-fork` (int): Enables the latest fork (jovian) at startup (0) or n blocks after genesis.
 
 ### Example Commands
 

playground/artifacts.go

@@ -277,6 +277,7 @@ func (b *ArtifactsBuilder) Build() (*Artifacts, error) {
 			input["config"] = map[string]interface{}{
 				"pragueTime":  *forkTime,
 				"isthmusTime": *forkTime,
+				"jovianTime":  *forkTime,
 			}
 		}
 
@@ -330,6 +331,7 @@ func (b *ArtifactsBuilder) Build() (*Artifacts, error) {
 		}
 		if forkTime != nil {
 			rollupInput["isthmus_time"] = *forkTime
+			rollupInput["jovian_time"] = *forkTime
 		}
 
 		newOpRollup, err := overrideJSON(opRollupConfig, rollupInput)

playground/components.go

@@ -27,7 +27,7 @@ type RollupBoost struct {
 func (r *RollupBoost) Run(service *Service, ctx *ExContext) {
 	service.
 		WithImage("docker.io/flashbots/rollup-boost").
-		WithTag("v0.7.5").
+		WithTag("v0.7.12").
 		WithArgs(
 			"--rpc-host", "0.0.0.0",
 			"--rpc-port", `{{Port "authrpc" 8551}}`,
@@ -61,7 +61,7 @@ type OpRbuilder struct {
 
 func (o *OpRbuilder) Run(service *Service, ctx *ExContext) {
 	service.WithImage("ghcr.io/flashbots/op-rbuilder").
-		WithTag("v0.2.8").
+		WithTag("v0.2.12").
 		WithArgs(
 			"node",
 			"--authrpc.port", `{{Port "authrpc" 8551}}`,
@@ -238,7 +238,7 @@ func (o *OpBatcher) Run(service *Service, ctx *ExContext) {
 	}
 	service.
 		WithImage("us-docker.pkg.dev/oplabs-tools-artifacts/images/op-batcher").
-		WithTag("v1.12.0-rc.1").
+		WithTag("v1.16.2").
 		WithEntrypoint("op-batcher").
 		WithArgs(
 			"--l1-eth-rpc", Connect(o.L1Node, "http"),
@@ -265,7 +265,7 @@ type OpNode struct {
 func (o *OpNode) Run(service *Service, ctx *ExContext) {
 	service.
 		WithImage("us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node").
-		WithTag("v1.13.0-rc.1").
+		WithTag("v1.16.2").
 		WithEntrypoint("op-node").
 		WithEnv("A", "B"). // this is just a placeholder to make sure env works since we e2e test with the recipes
 		WithArgs(
@@ -275,6 +275,7 @@ func (o *OpNode) Run(service *Service, ctx *ExContext) {
 			"--l1.http-poll-interval", "6s",
 			"--l2", Connect(o.L2Node, "authrpc"),
 			"--l2.jwt-secret", "/data/jwtsecret",
+			"--rollup.l1-chain-config", "/data/genesis.json",
 			"--sequencer.enabled",
 			"--sequencer.l1-confs", "0",
 			"--verifier.l1-confs", "0",
@@ -294,6 +295,7 @@ func (o *OpNode) Run(service *Service, ctx *ExContext) {
 			"--rpc.enable-admin",
 			"--safedb.path", "/data_db",
 		).
+		WithArtifact("/data/genesis.json", "genesis.json").
 		WithArtifact("/data/jwtsecret", "jwtsecret").
 		WithArtifact("/data/rollup.json", "rollup.json").
 		WithVolume("data", "/data_db")
@@ -335,7 +337,7 @@ func (o *OpGeth) Run(service *Service, ctx *ExContext) {
 
 	service.
 		WithImage("us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth").
-		WithTag("v1.101503.2-rc.5").
+		WithTag("v1.101603.5").
 		WithEntrypoint("/bin/sh").
 		WithLabel("metrics_path", "/debug/metrics/prometheus").
 		WithArgs(
@@ -404,7 +406,7 @@ func (r *RethEL) ReleaseArtifact() *release {
 	return &release{
 		Name:    "reth",
 		Org:     "paradigmxyz",
-		Version: "v1.4.8",
+		Version: "v1.9.3",
 		Arch: func(goos, goarch string) string {
 			if goos == "linux" {
 				return "x86_64-unknown-linux-gnu"
@@ -439,7 +441,7 @@ func (r *RethEL) Run(svc *Service, ctx *ExContext) {
 	// start the reth el client
 	svc.
 		WithImage("ghcr.io/paradigmxyz/reth").
-		WithTag("v1.8.2").
+		WithTag("v1.9.3").
 		WithEntrypoint("/usr/local/bin/reth").
 		WithArgs(
 			"node",

playground/recipe_opstack.go

@@ -12,7 +12,7 @@ type OpRecipe struct {
 	// rollup-boost on the sequencer and uses this URL as the external builder.
 	externalBuilder string
 
-	// whether to enable the latest fork isthmus and when
+	// whether to enable the latest fork jovian and when
 	enableLatestFork *uint64
 
 	// blockTime is the block time to use for the rollup
@@ -49,7 +49,7 @@ func (o *OpRecipe) Description() string {
 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.Var(&nullableUint64Value{&o.enableLatestFork}, "enable-latest-fork", "Enable latest fork jovian (nil or empty = disabled, otherwise enabled at specified block)")
 	flags.Uint64Var(&o.blockTime, "block-time", defaultOpBlockTimeSeconds, "Block time to use for the rollup")
 	flags.Uint64Var(&o.batcherMaxChannelDuration, "batcher-max-channel-duration", 2, "Maximum channel duration to use for the batcher")
 	flags.BoolVar(&o.flashblocks, "flashblocks", false, "Whether to enable flashblocks")

playground/testcases/l2_genesis_ishtmus.json

@@ -25,6 +25,7 @@
     "graniteTime": 0,
     "holoceneTime": 0,
     "isthmusTime": 0,
+    "jovianTime": 0,
     "terminalTotalDifficulty": 0,
     "terminalTotalDifficultyPassed": true,
     "depositContractAddress": "0x0000000000000000000000000000000000000000",
@@ -15338,4 +15339,4 @@
   "baseFeePerGas": "0x3b9aca00",
   "excessBlobGas": "0x0",
   "blobGasUsed": "0x0"
-}
+}

playground/utils/README.md

@@ -1,5 +1,8 @@
 ## Regenerating the Rollup Config
 
+TODO: Rewrite these instructions since this doc is out of date
+
+
 ```
 # Reset the state
 rm state.json

playground/utils/genesis.json

@@ -26,6 +26,7 @@
     "graniteTime": 0,
     "holoceneTime": 0,
     "isthmusTime": 0,
+    "jovianTime": 0,
     "terminalTotalDifficulty": 0,
     "depositContractAddress": "0x0000000000000000000000000000000000000000",
     "optimism": {
@@ -15353,4 +15354,3 @@
   "excessBlobGas": "0x0",
   "blobGasUsed": "0x0"
 }
-

playground/utils/intent.toml

@@ -2,8 +2,10 @@ configType = "custom"
 l1ChainID = 1337
 fundDevAccounts = false
 useInterop = false
-l1ContractsLocator = "https://storage.googleapis.com/oplabs-contract-artifacts/artifacts-v1-44f2b904c73df5d0e54ca6e51d081ada1e4d75ca5b136513b61ea1566459eaa5.tar.gz"
-l2ContractsLocator = "https://storage.googleapis.com/oplabs-contract-artifacts/artifacts-v1-44f2b904c73df5d0e54ca6e51d081ada1e4d75ca5b136513b61ea1566459eaa5.tar.gz"
+l1ContractsLocator = "tag://op-contracts/v5.0.0-rc.2"
+# l1ContractsLocator = "https://storage.googleapis.com/oplabs-contract-artifacts/artifacts-v1-44f2b904c73df5d0e54ca6e51d081ada1e4d75ca5b136513b61ea1566459eaa5.tar.gz"
+l2ContractsLocator = "tag://op-contracts/v5.0.0-rc.2"
+# l2ContractsLocator = "https://storage.googleapis.com/oplabs-contract-artifacts/artifacts-v1-44f2b904c73df5d0e54ca6e51d081ada1e4d75ca5b136513b61ea1566459eaa5.tar.gz"
 
 [superchainRoles]
 proxyAdminOwner = "0xa0Ee7A142d267C1f36714E4a8F75612F20a79720"
@@ -30,4 +32,3 @@ unsafeBlockSigner = "0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc"
 batcher = "0xa0Ee7A142d267C1f36714E4a8F75612F20a79720"
 proposer = "0xa0Ee7A142d267C1f36714E4a8F75612F20a79720"
 challenger = "0xa0Ee7A142d267C1f36714E4a8F75612F20a79720"
-

playground/utils/rollup.json

@@ -32,6 +32,7 @@
   "granite_time": 0,
   "holocene_time": 0,
   "isthmus_time": 0,
+  "jovian_time": 0,
   "batch_inbox_address": "0x00d7b6990105719101dabeb77144f2a3385c8033",
   "deposit_contract_address": "0xc6a541529277f51196e84341b6ff7e7ee6c26774",
   "l1_system_config_address": "0x2de5d372c3462dff83e9905f34d842016d5c2098",
@@ -42,4 +43,3 @@
     "eip1559DenominatorCanyon": 250
   }
 }
-