Merge remote-tracking branch 'origin/optimism' into seb/geth-v1.15.0-fixup

Author: sebastianst

.circleci/ci-docker-tag-op-geth-release.sh

@@ -27,12 +27,11 @@ fi
 echo "Tagging $SOURCE_IMAGE_TAG with '$IMAGE_TAG'"
 gcloud container images add-tag -q "$SOURCE_IMAGE_TAG" "$TARGET_IMAGE_TAG"
 
-# Do not tag with latest if the release is a release candidate.
-if [[ "$IMAGE_TAG" == *"rc"* ]]; then
-  echo "Not tagging with 'latest' because the release is a release candidate."
+# Only tag finalized releases with 'latest'
+if ! [[ "$IMAGE_TAG" =~ ^v1\.[0-9]+\.[0-9]+$ ]]; then
+  echo "Not tagging with 'latest' because the release is not finalized."
   exit 0
 fi
 
 echo "Tagging $SOURCE_IMAGE_TAG with 'latest'"
 gcloud container images add-tag -q "$SOURCE_IMAGE_TAG" "$TARGET_IMAGE_TAG_LATEST"
-

.circleci/config.yml

@@ -3,7 +3,7 @@ version: 2.1
 orbs:
   gcp-cli: circleci/[email protected]
   slack: circleci/[email protected]
-  utils: ethereum-optimism/circleci-utils@0.0.8
+  utils: ethereum-optimism/circleci-utils@1.0.13
 
 parameters:
   go_version:
@@ -84,10 +84,6 @@ jobs:
             if [ "$CIRCLE_PROJECT_REPONAME" == "op-geth" ] && [ "$CIRCLE_PROJECT_USERNAME" == "ethereum-optimism" ]; then
               echo "op-geth.optimism.io" > /tmp/pages/CNAME
             fi
-      - utils/get-github-access-token:
-          private-key-str: GITHUB_APP_KEY
-          app-id: GITHUB_APP_ID
-          repo: $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME
       - utils/github-pages-deploy:
           src-pages-dir: /tmp/pages
   docker-release:

cmd/evm/internal/t8ntool/execution.go

@@ -367,6 +367,10 @@ func (pre *Prestate) Apply(vmConfig vm.Config, chainConfig *params.ChainConfig,
 		core.ProcessConsolidationQueue(&requests, evm)
 	}
 
+	if chainConfig.IsIsthmus(vmContext.Time) {
+		requests = [][]byte{}
+	}
+
 	// Commit block
 	root, err := statedb.Commit(vmContext.BlockNumber.Uint64(), chainConfig.IsEIP158(vmContext.BlockNumber), chainConfig.IsCancun(vmContext.BlockNumber, vmContext.Time))
 	if err != nil {

cmd/geth/config.go

@@ -218,6 +218,11 @@ func makeFullNode(ctx *cli.Context) *node.Node {
 		cfg.Eth.OverrideOptimismIsthmus = &v
 	}
 
+	if ctx.IsSet(utils.OverrideOptimismJovian.Name) {
+		v := ctx.Uint64(utils.OverrideOptimismJovian.Name)
+		cfg.Eth.OverrideOptimismJovian = &v
+	}
+
 	if ctx.IsSet(utils.OverrideOptimismInterop.Name) {
 		v := ctx.Uint64(utils.OverrideOptimismInterop.Name)
 		cfg.Eth.OverrideOptimismInterop = &v

cmd/geth/main.go

@@ -70,8 +70,9 @@ var (
 		utils.OverrideOptimismFjord,
 		utils.OverrideOptimismGranite,
 		utils.OverrideOptimismHolocene,
-		utils.OverrideOptimismInterop,
 		utils.OverrideOptimismIsthmus,
+		utils.OverrideOptimismJovian,
+		utils.OverrideOptimismInterop,
 		utils.EnablePersonal, // deprecated
 		utils.TxPoolLocalsFlag,
 		utils.TxPoolNoLocalsFlag,

cmd/utils/flags.go

@@ -273,14 +273,19 @@ var (
 		Usage:    "Manually specify the Optimism Granite fork timestamp, overriding the bundled setting",
 		Category: flags.EthCategory,
 	}
+	OverrideOptimismHolocene = &cli.Uint64Flag{
+		Name:     "override.holocene",
+		Usage:    "Manually specify the Optimism Holocene fork timestamp, overriding the bundled setting",
+		Category: flags.EthCategory,
+	}
 	OverrideOptimismIsthmus = &cli.Uint64Flag{
 		Name:     "override.isthmus",
 		Usage:    "Manually specify the Optimism Isthmus fork timestamp, overriding the bundled setting",
 		Category: flags.EthCategory,
 	}
-	OverrideOptimismHolocene = &cli.Uint64Flag{
-		Name:     "override.holocene",
-		Usage:    "Manually specify the Optimism Holocene fork timestamp, overriding the bundled setting",
+	OverrideOptimismJovian = &cli.Uint64Flag{
+		Name:     "override.jovian",
+		Usage:    "Manually specify the Optimism Jovian fork timestamp, overriding the bundled setting",
 		Category: flags.EthCategory,
 	}
 	OverrideOptimismInterop = &cli.Uint64Flag{

core/chain_makers.go

@@ -332,6 +332,11 @@ func (b *BlockGen) collectRequests(readonly bool) (requests [][]byte) {
 		// EIP-7251
 		ProcessConsolidationQueue(&requests, evm)
 	}
+
+	if b.cm.config.IsIsthmus(b.header.Time) {
+		requests = [][]byte{}
+	}
+
 	return requests
 }
 

core/genesis.go

@@ -298,6 +298,7 @@ type ChainOverrides struct {
 	OverrideOptimismGranite  *uint64
 	OverrideOptimismHolocene *uint64
 	OverrideOptimismIsthmus  *uint64
+	OverrideOptimismJovian   *uint64
 	OverrideOptimismInterop  *uint64
 	ApplySuperchainUpgrades  bool
 }
@@ -367,6 +368,9 @@ func (o *ChainOverrides) apply(cfg *params.ChainConfig) error {
 		cfg.IsthmusTime = o.OverrideOptimismIsthmus
 		cfg.PragueTime = o.OverrideOptimismIsthmus
 	}
+	if o.OverrideOptimismJovian != nil {
+		cfg.JovianTime = o.OverrideOptimismJovian
+	}
 	if o.OverrideOptimismInterop != nil {
 		cfg.InteropTime = o.OverrideOptimismInterop
 	}

core/rlp_test.go

@@ -207,6 +207,7 @@ func TestBlockRlpEncodeDecode(t *testing.T) {
 	config := *params.OptimismTestConfig
 	config.ShanghaiTime = &zeroTime
 	config.IsthmusTime = &zeroTime
+	config.CancunTime = &zeroTime
 	require.True(t, config.IsOptimismIsthmus(zeroTime))
 
 	block := getBlock(&config, 10, 2, 50)

core/state_processor.go

@@ -118,6 +118,10 @@ func (p *StateProcessor) Process(block *types.Block, statedb *state.StateDB, cfg
 		ProcessConsolidationQueue(&requests, evm)
 	}
 
+	if p.config.IsIsthmus(block.Time()) {
+		requests = [][]byte{}
+	}
+
 	// Finalize the block, applying any consensus engine specific extras (e.g. block rewards)
 	p.chain.engine.Finalize(p.chain, header, tracingStateDB, block.Body())