L1 smart contract verification

.circleci/config.yml

@@ -152,8 +152,8 @@ commands:
 
 jobs:
   cannon-go-lint-and-test:
-    machine: true
-    resource_class: ethereum-optimism/latitude-1
+    docker:
+      - image: <<pipeline.parameters.ci_builder_image>>
     parameters:
       skip_slow_tests:
         type: boolean
@@ -240,8 +240,8 @@ jobs:
           working_directory: cannon/mipsevm/tests/open_mips_tests
 
   contracts-bedrock-build:
-    machine: true
-    resource_class: ethereum-optimism/latitude-1
+    docker:
+      - image: <<pipeline.parameters.ci_builder_image>>
     parameters:
       skip_pattern:
         description: Glob pattern of tests to skip
@@ -751,23 +751,29 @@ jobs:
         description: should load in foundry artifacts
         type: boolean
         default: false
-    machine: true
-    resource_class: ethereum-optimism/latitude-1
+    docker:
+      - image: <<pipeline.parameters.ci_builder_image>>
     steps:
       - checkout
       - check-changed:
           patterns: "<<parameters.package_name>>"
       - attach_workspace:
           at: "."
           if: ${{ uses_artifacts }}
+      - run:
+          name: Install dependencies
+          command: |
+            apt update
+            apt install -y parallel
+          working_directory: .
       - run:
           name: Fuzz
           command: make fuzz
           working_directory: "<<parameters.package_name>>"
 
   go-lint:
-    machine: true
-    resource_class: ethereum-optimism/latitude-1
+    docker:
+      - image: <<pipeline.parameters.ci_builder_image>>
     steps:
       - checkout
       - run:
@@ -834,8 +840,8 @@ jobs:
           when: always
 
   go-test:
-    machine: true
-    resource_class: ethereum-optimism/latitude-1
+    docker:
+      - image: <<pipeline.parameters.ci_builder_image>>
     steps:
       - checkout
       - attach_workspace:
@@ -893,16 +899,12 @@ jobs:
         description: Slack user or group to mention when notifying of failures
         type: string
         default: ""
-      resource_class:
-        description: Machine resource class
-        type: string
-        default: ethereum-optimism/latitude-1
       skip_slow_tests:
         description: Indicates that slow tests should be skipped
         type: boolean
         default: false
-    machine: true
-    resource_class: <<parameters.resource_class>>
+    docker:
+      - image: <<pipeline.parameters.ci_builder_image>>
     steps:
       - checkout
       - attach_workspace:
@@ -949,8 +951,8 @@ jobs:
                 mentions: "<<parameters.mentions>>"
 
   cannon-prestate:
-    machine: true
-    resource_class: ethereum-optimism/latitude-1
+    docker:
+      - image: <<pipeline.parameters.ci_builder_image>>
     steps:
       - checkout
       - run:

Makefile

@@ -1,3 +1,5 @@
+include celo.mk
+
 COMPOSEFLAGS=-d
 ITESTS_L2_HOST=http://localhost:9545
 BEDROCK_TAGS_REMOTE?=origin

README_CELO.md

@@ -0,0 +1,73 @@
+# Celo devnet + mainnet deployment scripts
+
+## Generate Devnet L1 and L2 Allocations
+
+1. Run
+    ```bash
+    make devnet-clean && DEVNET_CELO=true SAFE_AS_OWNER=true make devnet-up
+    ```
+    This will generate and run full devnet in local docker
+2. Copy `.devnet/genesis-L1.json`, `.devnet/genesis-L2.json`, and `.devnet/rollup.json` to the `.devnet` folder in other branch
+3. Run on other branch
+    ```bash
+    DEVNET_CELO=true SAFE_AS_OWNER=true make devnet-up
+    ```
+4. To double check that everything is working correctly, search for
+
+    ``` L1 genesis already generated.```
+
+    ``` L2 genesis and rollup configs already generated.```
+
+    in logs
+
+
+## Generate L2 Allocations for real network (Alfajores, Baklava, Mainnet)
+
+### Environment Variables
+
+- `CELO_MONOREPO_DIR`
+  Root directory of the monorepo. Defaults to current directory.
+
+- **Directory Paths**
+  - `CELO_OP_NODE_DIR`: `$(CELO_MONOREPO_DIR)/op-node`
+  - `CELO_DEVNET_CONFIG_PATH`: `packages/contracts-bedrock/deploy-config/devnetL1.json`
+  - `CELO_L2_ALLOCS_PATH`: `packages/contracts-bedrock/.devnet/allocs-l2.json`
+  - `CELO_ADDRESSES_JSON_PATH`: `packages/contracts-bedrock/.devnet/addresses.json`
+  - `CELO_GENESIS_L2_PATH`: `packages/contracts-bedrock/.devnet/genesis-l2.json`
+  - `CELO_ROLLUP_CONFIG_PATH`: `packages/contracts-bedrock/.devnet/rollup.json`
+  - `CELO_CONTRACTS_BEDROCK_DIR`: `packages/contracts-bedrock`
+
+- **RPC**
+  - `CELO_L1_RPC_URL`: `http://localhost:8545`
+
+- **Deployment**
+  - `CELO_DEPLOYMENT_CONTEXT` (default: `devnetL1`)
+  - `CELO_L1_CHAIN_ID` (default: `1`)
+
+- **Derived Paths**
+  - `CELO_DEPLOY_CONFIG_PATH`: `deploy-config/$(CELO_DEPLOYMENT_CONTEXT).json`
+  - `CELO_STATE_DUMP_PATH`: `deployments/l2-allocs.json`
+  - `CELO_CONTRACT_ADDRESSES_PATH`: `deployments/$(CELO_L1_CHAIN_ID)-deploy.json`
+
+## Makefile Targets
+
+- **generate_l2_allocs**
+  - Runs Forge script `L2Genesis` with necessary paths
+  - Generates and saves l2 allocations to `$(CELO_STATE_DUMP_PATH)`
+
+## Usage
+
+1. **Create L1 deploy script**
+  It is necessary to add L1 deployment file into `deployments` directory with the name convetion `$(CELO_L1_CHAIN_ID)-deploy.json` eg `1-deploy.json` (example of such file https://storage.googleapis.com/cel2-rollup-files/baklava/deployment-l1.json)
+1. **Set Environment Variables**
+
+   ```bash
+   export CELO_MONOREPO_DIR=/path/to/monorepo
+   export CELO_DEPLOYMENT_CONTEXT=devnetL1
+   export CELO_L1_CHAIN_ID=1
+   ```
+1. **Generate L2 Allocations**
+
+   ```bash
+   make generate_l2_allocs
+    ```

bedrock-devnet/devnet/__init__.py

@@ -31,7 +31,7 @@
 DEVNET_L2OO = os.getenv('DEVNET_L2OO') == "true"
 DEVNET_ALTDA = os.getenv('DEVNET_ALTDA') == "true"
 GENERIC_ALTDA = os.getenv('GENERIC_ALTDA') == "true"
-
+DEVNET_CELO = os.getenv('DEVNET_CELO') == "true"
 class Bunch:
     def __init__(self, **kwds):
         self.__dict__.update(kwds)
@@ -129,6 +129,15 @@ def init_devnet_l1_deploy_config(paths, update_timestamp=False):
         deploy_config['useAltDA'] = True
     if GENERIC_ALTDA:
         deploy_config['daCommitmentType'] = "GenericCommitment"
+    if DEVNET_CELO:
+        deploy_config['useFaultProofs'] = True
+        deploy_config['useCustomGasToken'] = True
+        deploy_config['gasPriceOracleBlobBaseFeeScalar'] = 0
+        deploy_config['gasPriceOracleBaseFeeScalar'] = 0
+        deploy_config['deployCeloContracts'] = True
+        # Usage of the zero address in combination of the useCustomGasToken == True
+        # will deploy a new contract
+        deploy_config['customGasTokenAddress'] = "0x0000000000000000000000000000000000000000"
     write_json(paths.devnet_config_path, deploy_config)
 
 def devnet_l1_allocs(paths):

celo.mk

@@ -0,0 +1,62 @@
+# ================================
+# Variables Configuration
+# ================================
+
+# Default to current directory if CELO_MONOREPO_DIR is not set
+CELO_MONOREPO_DIR ?= $(shell pwd)
+
+# Directory Paths
+CELO_OP_NODE_DIR             := $(CELO_MONOREPO_DIR)/op-node
+CELO_DEVNET_CONFIG_PATH      := $(CELO_MONOREPO_DIR)/packages/contracts-bedrock/deploy-config/devnetL1.json
+CELO_L2_ALLOCS_PATH          := $(CELO_MONOREPO_DIR)/packages/contracts-bedrock/.devnet/allocs-l2.json
+CELO_ADDRESSES_JSON_PATH     := $(CELO_MONOREPO_DIR)/packages/contracts-bedrock/.devnet/addresses.json
+CELO_GENESIS_L2_PATH         := $(CELO_MONOREPO_DIR)/packages/contracts-bedrock/.devnet/genesis-l2.json
+CELO_ROLLUP_CONFIG_PATH      := $(CELO_MONOREPO_DIR)/packages/contracts-bedrock/.devnet/rollup.json
+CELO_CONTRACTS_BEDROCK_DIR   := $(CELO_MONOREPO_DIR)/packages/contracts-bedrock
+
+# RPC Configuration
+CELO_L1_RPC_URL              := http://localhost:8545
+
+# Deployment Configuration
+CELO_DEPLOYMENT_CONTEXT ?= devnetL1
+CELO_L1_CHAIN_ID ?= 1
+
+# Derived Paths based on Deployment Context and Chain ID
+CELO_DEPLOY_CONFIG_PATH      := $(CELO_CONTRACTS_BEDROCK_DIR)/deploy-config/$(CELO_DEPLOYMENT_CONTEXT).json
+CELO_STATE_DUMP_PATH         := $(CELO_CONTRACTS_BEDROCK_DIR)/deployments/l2-allocs.json
+CELO_CONTRACT_ADDRESSES_PATH := $(CELO_CONTRACTS_BEDROCK_DIR)/deployments/$(CELO_L1_CHAIN_ID)-deploy.json
+
+# ================================
+# Phony Targets
+# ================================
+.PHONY: run_Genesis generate_l2_allocs deploy clean help
+
+# ================================
+# generate_l2_allocs Target
+# ================================
+generate_l2_allocs:
+	@# Validate Environment Variables
+	@if [ -z "$(CELO_DEPLOYMENT_CONTEXT)" ]; then \
+		echo "Error: CELO_DEPLOYMENT_CONTEXT is not set."; \
+		echo "Set it using 'make deploy CELO_DEPLOYMENT_CONTEXT=<context>' or export it as an environment variable."; \
+		exit 1; \
+	fi
+	@if [ -z "$(CELO_L1_CHAIN_ID)" ]; then \
+		echo "Error: CELO_L1_CHAIN_ID is not set."; \
+		echo "Set it using 'make deploy CELO_L1_CHAIN_ID=<chain_id>' or export it as an environment variable."; \
+		exit 1; \
+	fi
+
+	@echo "Running Forge Deployment Script..."
+
+	# Ensure deployment directory exists
+	@mkdir -p $(CELO_CONTRACTS_BEDROCK_DIR)/deployments
+
+	# Run Forge script with absolute paths
+	@cd $(CELO_CONTRACTS_BEDROCK_DIR) && \
+	DEPLOY_CONFIG_PATH=$(CELO_DEPLOY_CONFIG_PATH) \
+	STATE_DUMP_PATH=$(CELO_STATE_DUMP_PATH) \
+	CONTRACT_ADDRESSES_PATH=$(CELO_CONTRACT_ADDRESSES_PATH) \
+	forge script scripts/L2Genesis.s.sol:L2Genesis --sig 'runWithStateDump()'
+
+	@echo "Saved L2 allocations to $(CELO_STATE_DUMP_PATH)"

op-chain-ops/genesis/config.go

@@ -271,9 +271,11 @@ var _ ConfigChecker = (*GasTokenDeployConfig)(nil)
 
 func (d *GasTokenDeployConfig) Check(log log.Logger) error {
 	if d.UseCustomGasToken {
-		if d.CustomGasTokenAddress == (common.Address{}) {
-			return fmt.Errorf("%w: CustomGasTokenAddress cannot be address(0)", ErrInvalidDeployConfig)
-		}
+		// NOTE: we are using the address(0) as an instruction to deploy the L1 token,
+		//       so this deploy-config validation has to be disabled
+		// if d.CustomGasTokenAddress == (common.Address{}) {
+		// 	return fmt.Errorf("%w: CustomGasTokenAddress cannot be address(0)", ErrInvalidDeployConfig)
+		// }
 		log.Info("Using custom gas token", "address", d.CustomGasTokenAddress)
 	}
 	return nil
@@ -905,6 +907,15 @@ type DeployConfig struct {
 
 	// Legacy, ignored, here for strict-JSON decoding to be accepted.
 	LegacyDeployConfig `evm:"-"`
+
+	// DeployCeloContracts indicates whether to deploy Celo contracts.
+	DeployCeloContracts bool `json:"deployCeloContracts"`
+
+	// Address of the external SuperchainConfig that CeloSuperchainConfig should point to.
+	ExternalSuperchainConfig common.Address `json:"externalSuperchainConfig"`
+
+	// Used to validate the ProxyAdmin owner address.
+	ProxyAdminOwnerIsMultisig bool `json:"proxyAdminOwnerIsMultisig"`
 }
 
 // Copy will deeply copy the DeployConfig. This does a JSON roundtrip to copy

ops/docker/proofs-tools/Dockerfile

@@ -5,7 +5,7 @@ ARG CHALLENGER_VERSION
 ARG KONA_VERSION
 
 FROM --platform=$BUILDPLATFORM us-docker.pkg.dev/oplabs-tools-artifacts/images/op-challenger:$CHALLENGER_VERSION AS challenger
-FROM --platform=$BUILDPLATFORM ghcr.io/anton-rs/kona/kona-fpp-asterisc:$KONA_VERSION AS kona
+FROM --platform=$BUILDPLATFORM ghcr.io/op-rs/kona/kona-fpp-asterisc:$KONA_VERSION AS kona
 
 FROM --platform=$BUILDPLATFORM ubuntu:22.04 AS proofs-tools
 RUN apt-get update && apt-get install -y --no-install-recommends musl openssl ca-certificates

packages/contracts-bedrock/.gas-snapshot

@@ -6,12 +6,12 @@ GasBenchMark_L1Block_SetValuesEcotone:test_setL1BlockValuesEcotone_benchmark() (
 GasBenchMark_L1Block_SetValuesEcotone_Warm:test_setL1BlockValuesEcotone_benchmark() (gas: 7597)
 GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_0() (gas: 369280)
 GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_1() (gas: 2967420)
-GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_0() (gas: 564398)
-GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_1() (gas: 4076613)
+GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_0() (gas: 564413)
+GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_1() (gas: 4076628)
 GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_0() (gas: 467098)
 GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_1() (gas: 3512802)
-GasBenchMark_L1StandardBridge_Finalize:test_finalizeETHWithdrawal_benchmark() (gas: 72664)
-GasBenchMark_L2OutputOracle:test_proposeL2Output_benchmark() (gas: 92973)
+GasBenchMark_L1StandardBridge_Finalize:test_finalizeETHWithdrawal_benchmark() (gas: 85481)
+GasBenchMark_L2OutputOracle:test_proposeL2Output_benchmark() (gas: 92997)
 GasBenchMark_OptimismPortal:test_depositTransaction_benchmark() (gas: 68422)
 GasBenchMark_OptimismPortal:test_depositTransaction_benchmark_1() (gas: 68986)
-GasBenchMark_OptimismPortal:test_proveWithdrawalTransaction_benchmark() (gas: 155610)
+GasBenchMark_OptimismPortal:test_proveWithdrawalTransaction_benchmark() (gas: 169989)

packages/contracts-bedrock/Celo.README.md

@@ -0,0 +1,25 @@
+# Celo Diff
+
+- Since we are using the CustomGasFeature (which is currently being deprecated from OP), we cannot use the OP Deployer to deploy contracts. Instead, we need to deploy contracts using the `Deploy.s.sol` script.
+- The `Deploy.s.sol` script is not from the original 1.8.0 smart contract branch, as it was likely never used for testnet deployment (due to the use of Anvil cheat codes). We ported the `Deploy.s.sol` script from our Celo client branch, specifically based on version 1.9.3.
+
+## L1 Deploy Script Notes (`Deploy.s.sol`)
+- `CeloTokenL1` is deployed with a balance of 1 billion CELO and is used as the Custom Gas token.
+- Due to FaultProofs, we are using `OptimismPortal2` rather than `OptimismPortal`.
+- Since we are using the Custom Gas Token feature with a preexisting balance, we use a storage setter design pattern (deploying a different implementation to the OptimismPortal proxy during the transition period), which allows us to set a specific storage slot to the desired value.
+
+## L2 Deploy Script Notes (`L2Genesis.s.sol`)
+- The required Celo core contracts were added to `L2Genesis.s.sol` for devnet deployment. For mainnet, this step is skipped, and we instead rely on the blockchain migration tool for the entire blockchain state.
+
+## CeloSuperchainConfig
+- The Superchain has the power to pause/unpause the Celo network. To enable us to unpause the network when necessary, we introduced `CeloSuperchainConfig`, which adds a Guardian account with the same permissions as the Superchain. This allows us to pause/unpause the network in case of an emergency.
+
+## AbstractFeeCurrency
+- We added `AbstractFeeCurrency` to the bridged ERC20 token (specifically, `OptimismMintableERC20.sol`), which implements credit and debit functions. This enhancement allows us to whitelist and use any natively bridged token as the native fee currency.
+
+# Release Mainnet Process
+
+1. L1 smart contracts are deployed using the `Deploy.s.sol` script.
+2. The L2 Genesis is created either by running `make generate_l2_allocs` or by manually using the `L2Genesis.s.sol` script (which creates the L2 allocs file).
+3. The L2 allocs file is fed into the blockchain migration tool.
+4. The sequencer and nodes are started.

packages/contracts-bedrock/deploy-config/devnetL1-template.json

@@ -72,5 +72,7 @@
   "daChallengeWindow": 16,
   "daResolveWindow": 16,
   "daBondSize": 1000000,
-  "daResolverRefundPercentage": 0
+  "daResolverRefundPercentage": 0,
+  "proxyAdminOwnerIsMultisig": false,
+  "externalSuperchainConfig": "0x0000000000000000000000000000000000000000"
 }

packages/contracts-bedrock/deploy-config/hardhat.json

@@ -62,5 +62,6 @@
   "daChallengeWindow": 100,
   "daResolveWindow": 100,
   "daBondSize": 1000,
-  "daResolverRefundPercentage": 50
+  "daResolverRefundPercentage": 50,
+  "proxyAdminOwnerIsMultisig": false
 }