CGT Contract Review

.dockerignore

@@ -1,13 +1,44 @@
-.github
-.vscode
+# All the files we depend on. We are using a negative pattern to not include anything by accident.
+# node_modules, packages (contains git submodules and node modules etc.), devnet dirs etc. all add up a lot.
+*
 
-.env
-.envrc
-**/.env
+# Include contracts
+!/packages/contracts-bedrock
+# Exclude generated files and node modules from contracts
+/packages/contracts-bedrock/forge-artifacts
+/packages/contracts-bedrock/artifacts
+/packages/contracts-bedrock/cache
+/packages/contracts-bedrock/broadcast
+
+!/cannon
+!/devnet-sdk
+!/op-batcher
+!/op-chain-ops
+!/op-deployer
+!/op-dripper
+!/op-challenger
+!/op-dispute-mon
+!/op-conductor
+!/op-node
+!/op-preimage
+!/op-program
+!/op-proposer
+!/op-service
+!/op-supervisor
+!/op-test-sequencer
+!/op-wheel
+!/op-alt-da
+!/op-faucet
+!/op-interop-mon
+!/go.mod
+!/go.sum
+!/justfiles
+!/mise.toml
+!/op-e2e/e2eutils
+!/op-geth
+!Makefile
 
-test
-**/*_test.go
-build/_workspace
-build/bin
-build/_bin
-tests/testdata
+**/bin
+**/testdata
+**/tests
+.env

.gitignore

@@ -73,3 +73,5 @@ test/tmp
 test-apollo/l1-geth
 test-apollo/config-op
 test-apollo/data
+
+test-pp-op/testnet.env

.gitmodules

@@ -35,4 +35,4 @@
 [submodule "op-geth"]
 	path = op-geth
 	url = https://github.com/okx/op-geth
-  branch = sync/optimism
+  branch = dev

Dockerfile-contracts

@@ -24,7 +24,7 @@ WORKDIR /app/packages/contracts-bedrock
 RUN git submodule update --init --recursive || echo "No submodules found"
 RUN --mount=type=cache,target=/root/.foundry \
     --mount=type=cache,target=/root/.cache \
-    forge build
+    forge build --skip "/**/test/**"
 
 # Build op-deployer
 WORKDIR /app
@@ -42,6 +42,13 @@ RUN --mount=type=cache,target=/root/.cache \
 FROM debian:bookworm-slim
 WORKDIR /app
 
+# Update certificates
+RUN apt-get update && apt-get install -y ca-certificates && update-ca-certificates
+
+# Set environment variables for Go
+ENV SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt
+ENV SSL_CERT_DIR=/etc/ssl/certs
+
 # Copy foundry tools for runtime use
 COPY --from=contracts-builder /usr/local/bin/forge /usr/local/bin/cast /usr/local/bin/anvil /usr/local/bin/
 

Dockerfile-opstack

@@ -40,10 +40,10 @@ COPY . .
 RUN --mount=type=cache,target=/root/.cache \
     --mount=type=cache,target=/root/.cache/go-build \
     --mount=type=cache,target=/go/pkg/mod \
-    make build-go
+    make build-go-no-submodules
 
 # Copy foundry tools and artifacts from contracts image
-COPY --from=op-contracts:v1.13.4 /usr/local/bin/forge /usr/local/bin/cast /usr/local/bin/anvil /usr/local/bin/
+COPY --from=op-contracts:latest /usr/local/bin/forge /usr/local/bin/cast /usr/local/bin/anvil /usr/local/bin/
 
 # Verify installations
 RUN echo "🔍 Verifying installations:" && \

Makefile

@@ -16,6 +16,9 @@ build: build-go build-contracts ## Builds Go components and contracts-bedrock
 build-go: submodules op-node op-proposer op-batcher op-challenger op-dispute-mon op-program cannon withdrawal op-conductor ## Builds main Go components
 .PHONY: build-go
 
+build-go-no-submodules: op-node op-proposer op-batcher op-challenger op-dispute-mon op-program cannon withdrawal op-conductor ## Used in Dockerfile
+.PHONY: build-go-no-submodules
+
 build-contracts:
 	(cd packages/contracts-bedrock && just build)
 .PHONY: build-contracts

op-deployer/pkg/deployer/bootstrap/implementations.go

@@ -94,7 +94,7 @@ func (c *ImplementationsConfig) Check() error {
 		return errors.New("dispute game finality delay in seconds must be specified")
 	}
 	// Check V2 fault game parameters only if V2 dispute games feature is enabled
-	deployV2Games := deployer.IsDevFeatureEnabled(c.DevFeatureBitmap, deployer.DeployV2DisputeGames)
+	deployV2Games := deployer.IsDevFeatureEnabled(c.DevFeatureBitmap, deployer.DeployV2DisputeGamesDevFlag)
 	if deployV2Games {
 		if c.FaultGameMaxGameDepth == 0 {
 			return errors.New("fault game max game depth must be specified when V2 dispute games feature is enabled")

op-deployer/pkg/deployer/devfeatures.go

@@ -15,8 +15,8 @@ var (
 	// CannonKonaDevFlag enables Kona as the default cannon prover.
 	CannonKonaDevFlag = common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000010")
 
-	// DeployV2DisputeGames enables deployment of V2 dispute game contracts.
-	DeployV2DisputeGames = common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000100")
+	// DeployV2DisputeGamesDevFlag enables deployment of V2 dispute game contracts.
+	DeployV2DisputeGamesDevFlag = common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000100")
 
 	// CustomGasToken enables the custom gas token.
 	CustomGasToken = common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000001000")

op-devstack/presets/disputegame_v2.go

@@ -7,5 +7,5 @@ import (
 )
 
 func WithDisputeGameV2() stack.CommonOption {
-	return stack.MakeCommon(sysgo.WithDeployerOptions(sysgo.WithDevFeatureBitmap(deployer.DeployV2DisputeGames)))
+	return stack.MakeCommon(sysgo.WithDeployerOptions(sysgo.WithDevFeatureBitmap(deployer.DeployV2DisputeGamesDevFlag)))
 }

packages/contracts-bedrock/foundry.toml

@@ -63,6 +63,7 @@ fs_permissions = [
   { access='read-write', path='./.testdata/' },
   { access='read', path='./kout-deployment' },
   { access='read', path='./test/fixtures' },
+  { access='read', path='../../test/config-op/' },
   { access='read', path='./lib/superchain-registry/superchain/configs/' },
   { access='read', path='./lib/superchain-registry/validation/standard/' },
 ]

packages/contracts-bedrock/interfaces/L1/IOKB.sol

@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import { IERC20Metadata } from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
+
+interface IOKB is IERC20, IERC20Metadata {
+    function triggerBridge() external;
+}

packages/contracts-bedrock/interfaces/L1/IOptimismPortal2.sol

@@ -34,6 +34,8 @@ interface IOptimismPortal2 is IProxyAdminOwnedBase {
     error OptimismPortal_ProofNotOldEnough();
     error OptimismPortal_Unproven();
     error OptimismPortal_InvalidLockboxState();
+    error OptimismPortal_OnlyCustomGasToken();
+    error OptimismPortal_InvalidGasToken();
     error OutOfGas();
     error UnexpectedList();
     error UnexpectedString();
@@ -49,6 +51,15 @@ interface IOptimismPortal2 is IProxyAdminOwnedBase {
     function anchorStateRegistry() external view returns (IAnchorStateRegistry);
     function ethLockbox() external view returns (IETHLockbox);
     function checkWithdrawal(bytes32 _withdrawalHash, address _proofSubmitter) external view;
+    function depositERC20Transaction(
+        address _to,
+        uint256 _mint,
+        uint256 _value,
+        uint64 _gasLimit,
+        bool _isCreation,
+        bytes memory _data
+    )
+        external;
     function depositTransaction(
         address _to,
         uint256 _value,

packages/contracts-bedrock/interfaces/L1/ISystemConfig.sol

@@ -99,6 +99,10 @@ interface ISystemConfig is IProxyAdminOwnedBase {
     function setFeature(bytes32 _feature, bool _enabled) external;
     function isFeatureEnabled(bytes32) external view returns (bool);
     function isCustomGasToken() external view returns (bool);
+    function gasPayingToken() external view returns (address address_, uint8 decimals_);
+    function gasPayingTokenName() external view returns (string memory name_);
+    function gasPayingTokenSymbol() external view returns (string memory symbol_);
+    function setGasPayingToken(address _token, uint8 _decimals, bytes32 _name, bytes32 _symbol) external;
 
     function __constructor__() external;
 }

packages/contracts-bedrock/scripts/DeployMockOKB.s.sol

@@ -0,0 +1,74 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.15;
+
+import { Script } from "forge-std/Script.sol";
+import { console2 as console } from "forge-std/console2.sol";
+
+// Contracts
+import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
+import { ERC20Burnable } from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Burnable.sol";
+
+/// @title MockOKB
+/// @notice Mock OKB token for testing custom gas token setup
+contract MockOKB is ERC20, ERC20Burnable {
+    constructor() ERC20("Mock OKB", "OKB") {
+        _mint(msg.sender, 660000 * 10 ** decimals());
+    }
+
+    function decimals() public pure override returns (uint8) {
+        return 18;
+    }
+
+    /// @notice Burn all tokens of msg.sender
+    function triggerBridge() external {
+        _burn(msg.sender, balanceOf(msg.sender));
+    }
+}
+
+/// @title DeployMockOKB
+/// @notice Foundry script to deploy MockOKB token for testing
+/// @dev This script deploys a mock OKB token with 660,000 initial supply
+contract DeployMockOKB is Script {
+    // Deployed contract
+    MockOKB okbToken;
+    address deployerAddress;
+
+    function setUp() public {
+        // Get deployer address from msg.sender (set by forge script --private-key)
+        deployerAddress = msg.sender;
+        console.log("Deployer address:", deployerAddress);
+    }
+
+    function run() public {
+        console.log("\n=== Deploying Mock OKB Token ===\n");
+
+        vm.startBroadcast(msg.sender);
+
+        // Deploy Mock OKB Token
+        deployMockOKB();
+
+        vm.stopBroadcast();
+
+        // Print deployment summary
+        printDeploymentSummary();
+    }
+
+    /// @notice Deploy mock OKB token with 660,000 supply
+    function deployMockOKB() internal {
+        okbToken = new MockOKB();
+        console.log("MockOKB deployed at:", address(okbToken));
+    }
+
+    /// @notice Print deployment summary with token details
+    function printDeploymentSummary() internal view {
+        console.log("\n=== Deployment Summary ===");
+        console.log("MockOKB Address:", address(okbToken));
+        console.log("Token name:", okbToken.name());
+        console.log("Token symbol:", okbToken.symbol());
+        console.log("Token decimals:", okbToken.decimals());
+        console.log("Total supply:", okbToken.totalSupply() / 1e18, "OKB");
+        console.log("Deployer balance:", okbToken.balanceOf(deployerAddress) / 1e18, "OKB");
+        console.log("\nEnvironment variable to set:");
+        console.log("export OKB_TOKEN_ADDRESS=", address(okbToken));
+    }
+}