Merge branch 'master' into master

celo-org · Jan 20, 2025 · 65d565d · 65d565d
2 parents 19a3cec + 72f15f4
commit 65d565d
Show file tree

Hide file tree

Showing 19 changed files with 454 additions and 78 deletions.
diff --git a/.github/workflows/add-docker-tag.yaml b/.github/workflows/add-docker-tag.yaml
@@ -29,13 +29,12 @@ jobs:
       contents: 'read'
       id-token: 'write'
     steps:
-      - id: auth-gcp-master
-        name: Authenticate to Google Cloud
-        uses: google-github-actions/auth@v2
+      - name: Login at GCP Artifact Registry
+        uses: celo-org/reusable-workflows/.github/actions/[email protected]
         with:
-          workload_identity_provider: 'projects/1094498259535/locations/global/workloadIdentityPools/gh-celo-blockchain-add-tag/providers/github-by-repos'
-          service_account: '[email protected]'
-          access_token_lifetime: '10m'
+          workload-id-provider: 'projects/1094498259535/locations/global/workloadIdentityPools/gh-celo-blockchain-dev/providers/github-by-repos'
+          service-account: 'celo-blockchain-dev@devopsre.iam.gserviceaccount.com'
+          docker-gcp-registries: us-west1-docker.pkg.dev
 
       - name: Install regctl
         run: |
@@ -45,4 +44,4 @@ jobs:
 
       - name: Use regctl to copy images (add tags)
         run: |
-          regctl image copy {{ inputs.source-image }} {{ inputs.destination-image }}
+          regctl image copy ${{ inputs.source-image }} ${{ inputs.destination-image }}
diff --git a/.github/workflows/build-sign-commit-images.yaml b/.github/workflows/build-sign-commit-images.yaml
@@ -16,13 +16,13 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Login at GCP Artifact Registry
-        uses: celo-org/reusable-workflows/.github/actions/[email protected].4
+        uses: celo-org/reusable-workflows/.github/actions/[email protected].5
         with:
           workload-id-provider: 'projects/1094498259535/locations/global/workloadIdentityPools/gh-celo-blockchain-dev/providers/github-by-repos'
           service-account: '[email protected]'
           docker-gcp-registries: us-west1-docker.pkg.dev
       - name: Build and push container
-        uses: celo-org/reusable-workflows/.github/actions/[email protected].4
+        uses: celo-org/reusable-workflows/.github/actions/[email protected].5
         with:
           platforms: linux/amd64,linux/arm64
           registry: us-west1-docker.pkg.dev/devopsre/dev-images/geth
@@ -40,13 +40,13 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Login at GCP Artifact Registry
-        uses: celo-org/reusable-workflows/.github/actions/[email protected].4
+        uses: celo-org/reusable-workflows/.github/actions/[email protected].5
         with:
           workload-id-provider: 'projects/1094498259535/locations/global/workloadIdentityPools/gh-celo-blockchain-dev/providers/github-by-repos'
           service-account: '[email protected]'
           docker-gcp-registries: us-west1-docker.pkg.dev
       - name: Build and push container
-        uses: celo-org/reusable-workflows/.github/actions/[email protected].4
+        uses: celo-org/reusable-workflows/.github/actions/[email protected].5
         with:
           platforms: linux/amd64,linux/arm64
           registry: us-west1-docker.pkg.dev/devopsre/dev-images/geth-all

diff --git a/.github/workflows/build-sign-release-images.yaml b/.github/workflows/build-sign-release-images.yaml
@@ -53,7 +53,7 @@ jobs:
           echo "MAJOR_MINOR=${semver[0]}.${semver[1]}" >> $GITHUB_OUTPUT
 
   build-container-geth-dev:
-    uses: celo-org/reusable-workflows/.github/workflows/[email protected].4
+    uses: celo-org/reusable-workflows/.github/workflows/[email protected].5
     if: startsWith(github.ref, 'refs/heads/release')
     needs:
       - replace-branch-name
@@ -68,7 +68,7 @@ jobs:
       trivy: true
 
   build-container-geth-all-dev:
-    uses: celo-org/reusable-workflows/.github/workflows/[email protected].4
+    uses: celo-org/reusable-workflows/.github/workflows/[email protected].5
     if: startsWith(github.ref, 'refs/heads/release')
     needs:
       - replace-branch-name
@@ -83,7 +83,7 @@ jobs:
       trivy: true
 
   build-container-geth-devopsre:
-    uses: celo-org/reusable-workflows/.github/workflows/[email protected].4
+    uses: celo-org/reusable-workflows/.github/workflows/[email protected].5
     if: startsWith(github.ref, 'refs/tags/v') && false
     needs:
       - replace-tag-v
@@ -98,7 +98,7 @@ jobs:
       trivy: true
 
   build-container-geth-all-devopsre:
-    uses: celo-org/reusable-workflows/.github/workflows/[email protected].4
+    uses: celo-org/reusable-workflows/.github/workflows/[email protected].5
     if: startsWith(github.ref, 'refs/tags/v') && false
     needs:
       - replace-tag-v
@@ -113,7 +113,7 @@ jobs:
       trivy: true
 
   build-container-geth-celo-org:
-    uses: celo-org/reusable-workflows/.github/workflows/[email protected].4
+    uses: celo-org/reusable-workflows/.github/workflows/[email protected].5
     if: startsWith(github.ref, 'refs/tags/v')
     needs:
       - replace-tag-v
@@ -128,7 +128,7 @@ jobs:
       trivy: true
 
   build-container-geth-all-celo-org:
-    uses: celo-org/reusable-workflows/.github/workflows/[email protected].4
+    uses: celo-org/reusable-workflows/.github/workflows/[email protected].5
     if: startsWith(github.ref, 'refs/tags/v')
     needs:
       - replace-tag-v

diff --git a/cmd/devp2p/nodesetcmd.go b/cmd/devp2p/nodesetcmd.go
@@ -181,7 +181,7 @@ func parseFilterLimit(args []string) (int, error) {
 	return limit, nil
 }
 
-// andFilter parses node filters in args and and returns a single filter that requires all
+// andFilter parses node filters in args and returns a single filter that requires all
 // of them to match.
 func andFilter(args []string) (nodeFilter, error) {
 	checks, err := parseFilters(args)

diff --git a/cmd/geth/main.go b/cmd/geth/main.go
@@ -74,6 +74,7 @@ var (
 		utils.USBFlag,
 		// utils.SmartCardDaemonPathFlag,
 		utils.OverrideHForkFlag,
+		utils.L2MigrationBlockFlag,
 		utils.TxPoolLocalsFlag,
 		utils.TxPoolNoLocalsFlag,
 		utils.TxPoolJournalFlag,

diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
@@ -243,6 +243,11 @@ var (
 		Usage: "Manually specify the hfork block, overriding the bundled setting",
 	}
 
+	L2MigrationBlockFlag = cli.Uint64Flag{
+		Name:  "l2migrationblock",
+		Usage: "Block number at which to halt the network for Celo L2 migration. This is the first block of Celo as an L2, and one after the last block of Celo as an L1. If unset or set to 0, no halt will occur.",
+	}
+
 	BloomFilterSizeFlag = cli.Uint64Flag{
 		Name:  "bloomfilter.size",
 		Usage: "Megabytes of memory allocated to bloom-filter for pruning",
@@ -1723,6 +1728,9 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *ethconfig.Config) {
 	log.Debug("Sanitizing Go's GC trigger", "percent", int(gogc))
 	godebug.SetGCPercent(int(gogc))
 
+	if ctx.GlobalIsSet(L2MigrationBlockFlag.Name) {
+		cfg.L2MigrationBlock = new(big.Int).SetUint64(ctx.GlobalUint64(L2MigrationBlockFlag.Name))
+	}
 	if ctx.GlobalIsSet(SyncModeFlag.Name) {
 		cfg.SyncMode = *GlobalTextMarshaler(ctx, SyncModeFlag.Name).(*downloader.SyncMode)
 	}

diff --git a/consensus/istanbul/backend/engine.go b/consensus/istanbul/backend/engine.go
@@ -125,6 +125,10 @@ func (sb *Backend) verifyHeader(chain consensus.ChainHeaderReader, header *types
 	if header.Number == nil {
 		return errUnknownBlock
 	}
+	if chain.Config().IsL2Migration(header.Number) {
+		sb.logger.Trace("Reject block after L2 migration", "num", header.Number)
+		return fmt.Errorf("Block number %d is after the L2 migration.", header.Number)
+	}
 
 	// If the full chain isn't available (as on mobile devices), don't reject future blocks
 	// This is due to potential clock skew

diff --git a/consensus/istanbul/core/handler.go b/consensus/istanbul/core/handler.go
@@ -36,7 +36,9 @@ func (c *core) Start() error {
 		return err
 	}
 
+	c.currentMu.Lock()
 	c.current = roundState
+	c.currentMu.Unlock()
 	c.roundChangeSetV2 = newRoundChangeSetV2(c.current.ValidatorSet())
 
 	// Reset the Round Change timer for the current round to timeout.

diff --git a/core/forkid/forkid.go b/core/forkid/forkid.go
@@ -224,6 +224,10 @@ func gatherForks(config *params.ChainConfig) []uint64 {
 		if !strings.HasSuffix(field.Name, "Block") {
 			continue
 		}
+		// Do not include L2MigrationBlock in forkid as doing so will prevent syncing with nodes that have not set the L2MigrationBlock flag
+		if field.Name == "L2MigrationBlock" {
+			continue
+		}
 		if field.Type != reflect.TypeOf(new(big.Int)) {
 			continue
 		}

diff --git a/e2e_test/e2e_bench_test.go b/e2e_test/e2e_bench_test.go
@@ -19,7 +19,7 @@ func BenchmarkNet100EmptyBlocks(b *testing.B) {
 			for i := 0; i < b.N; i++ {
 				ac := test.AccountConfig(n, 0)
 				gingerbreadBlock := common.Big0
-				gc, ec, err := test.BuildConfig(ac, gingerbreadBlock)
+				gc, ec, err := test.BuildConfig(ac, gingerbreadBlock, nil)
 				require.NoError(b, err)
 				network, shutdown, err := test.NewNetwork(ac, gc, ec)
 				require.NoError(b, err)
@@ -45,7 +45,7 @@ func BenchmarkNet1000Txs(b *testing.B) {
 
 				ac := test.AccountConfig(n, n)
 				gingerbreadBlock := common.Big0
-				gc, ec, err := test.BuildConfig(ac, gingerbreadBlock)
+				gc, ec, err := test.BuildConfig(ac, gingerbreadBlock, nil)
 				require.NoError(b, err)
 				accounts := test.Accounts(ac.DeveloperAccounts(), gc.ChainConfig())
 				network, shutdown, err := test.NewNetwork(ac, gc, ec)