Contract file artifacts

devnet/configs/chain.nix

@@ -1,4 +1,8 @@
-{pkgs}:
+{
+  pkgs,
+  SECONDS_PER_SLOT ? 12,
+  SLOTS_PER_EPOCH ? 32,
+}:
 pkgs.writeTextFile {
   name = "chain-config.yaml";
   text = ''
@@ -36,8 +40,8 @@ pkgs.writeTextFile {
     # FULU_FORK_EPOCH: 0
 
     # Time parameters
-    SECONDS_PER_SLOT: 12
-    SLOTS_PER_EPOCH: 32
+    SECONDS_PER_SLOT: ${toString SECONDS_PER_SLOT}
+    SLOTS_PER_EPOCH: ${toString SLOTS_PER_EPOCH}
 
     # Deposit contract
     DEPOSIT_CONTRACT_ADDRESS: 0x4242424242424242424242424242424242424242

flake.nix

@@ -5,7 +5,7 @@
     flake-parts.url = "github:hercules-ci/flake-parts";
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
     devshell.url = "github:numtide/devshell";
-    foundry.url = "github:shazow/foundry.nix/monthly";
+    foundry.url = "github:shazow/foundry.nix/stable";
     withdrawer.url = "git+ssh://git@github.com/Golem-Base/withdrawer";
 
     solc = {

packages/contracts-bedrock/v1.7.0-beta.1+l2-contracts/default.nix

@@ -0,0 +1,75 @@
+{
+  pkgs,
+  lib,
+  fetchFromGitHub,
+  ...
+}: let
+  mkSolcSvmInstallation = solcPkg: let
+    solcBinPath = lib.getExe solcPkg;
+    version = lib.lists.last (
+      lib.strings.splitString "-" (lib.lists.last (lib.splitString "/" solcBinPath))
+    );
+  in ''
+    mkdir -p $XDG_DATA_HOME/svm/${version}
+    ln -s ${solcBinPath} $XDG_DATA_HOME/svm/${version}/solc-${version}
+  '';
+
+  mkSolcSvmDataDir = solcPkgs: let
+    solcInstalls = lib.strings.concatLines (lib.lists.forEach solcPkgs mkSolcSvmInstallation);
+  in ''
+    export XDG_DATA_HOME=$(mktemp -d)
+    mkdir -p $XDG_DATA_HOME/svm
+    touch $XDG_DATA_HOME/svm/.global-version
+    ${solcInstalls}
+  '';
+in
+  pkgs.stdenv.mkDerivation {
+    pname = "contracts-bedrock";
+    version = "1.7.0-beta.1+l2-contracts";
+
+    src = fetchFromGitHub {
+      owner = "ethereum-optimism";
+      repo = "optimism";
+      rev = "5e14a61547a45eef2ebeba677aee4a049f106ed8";
+      hash = "sha256-CiW2f4lXmACwCg8GM2BG16bZjqBHLNJPYwHxIf5GRyg=";
+      fetchSubmodules = true;
+    };
+
+    patches = [./001_v1_7_0-beta_1_l2-contracts__additional_holocene_fork.patch];
+
+    nativeBuildInputs = with pkgs; [foundry-bin];
+
+    buildPhase = ''
+      cp $src/packages/contracts-bedrock/foundry.toml .
+      cp -r $src/packages/contracts-bedrock/src .
+      cp -r $src/packages/contracts-bedrock/test .
+      cp -r $src/packages/contracts-bedrock/scripts .
+      cp -r $src/packages/contracts-bedrock/lib .
+
+      ${mkSolcSvmDataDir (
+        with pkgs; [
+          solc_0_8_15
+          solc_0_8_19
+          solc_0_8_25
+          solc_0_8_28
+        ]
+      )}
+
+      forge build --offline
+    '';
+
+    installPhase = ''
+      mkdir -p $out
+      cp -r forge-artifacts $out/
+      cp -r artifacts $out/
+      cp -r cache $out/
+      echo ef7a933ca7f3d27ac40406f87fea25e0c3ba2016 > $out/COMMIT
+    '';
+
+    meta = with lib; {
+      description = "Optimism is Ethereum, scaled.";
+      homepage = "https://optimism.io/";
+      license = with licenses; [mit];
+      platforms = ["x86_64-linux"];
+    };
+  }

packages/contracts-bedrock/v2.0.0-rc.1/001_game_clock_validations_removal.patch

@@ -0,0 +1,15 @@
+diff --git a/packages/contracts-bedrock/scripts/deploy/DeployOPChain.s.sol b/packages/contracts-bedrock/scripts/deploy/DeployOPChain.s.sol
+index 9541db0bba..d72fb1e374 100644
+--- a/packages/contracts-bedrock/scripts/deploy/DeployOPChain.s.sol
++++ b/packages/contracts-bedrock/scripts/deploy/DeployOPChain.s.sol
+@@ -490,8 +490,8 @@ contract DeployOPChain is Script {
+         require(address(game.anchorStateRegistry()) == address(_doo.anchorStateRegistryProxy()), "DPG-50");
+         require(game.l2ChainId() == _doi.l2ChainId(), "DPG-60");
+         require(game.l2BlockNumber() == 0, "DPG-70");
+-        require(Duration.unwrap(game.clockExtension()) == 10800, "DPG-80");
+-        require(Duration.unwrap(game.maxClockDuration()) == 302400, "DPG-110");
++        // require(Duration.unwrap(game.clockExtension()) == 10800, "DPG-80");
++        // require(Duration.unwrap(game.maxClockDuration()) == 302400, "DPG-110");
+         require(game.splitDepth() == 30, "DPG-90");
+         require(game.maxGameDepth() == 73, "DPG-100");
+     }

packages/contracts-bedrock/v2.0.0-rc.1/default.nix

@@ -0,0 +1,74 @@
+{
+  pkgs,
+  lib,
+  fetchFromGitHub,
+  ...
+}: let
+  mkSolcSvmInstallation = solcPkg: let
+    solcBinPath = lib.getExe solcPkg;
+    version = lib.lists.last (
+      lib.strings.splitString "-" (lib.lists.last (lib.splitString "/" solcBinPath))
+    );
+  in ''
+    mkdir -p $XDG_DATA_HOME/svm/${version}
+    ln -s ${solcBinPath} $XDG_DATA_HOME/svm/${version}/solc-${version}
+  '';
+
+  mkSolcSvmDataDir = solcPkgs: let
+    solcInstalls = lib.strings.concatLines (lib.lists.forEach solcPkgs mkSolcSvmInstallation);
+  in ''
+    export XDG_DATA_HOME=$(mktemp -d)
+    mkdir -p $XDG_DATA_HOME/svm
+    touch $XDG_DATA_HOME/svm/.global-version
+    ${solcInstalls}
+  '';
+in
+  pkgs.stdenv.mkDerivation {
+    pname = "contracts-bedrock";
+    version = "v2.0.0-rc.1";
+
+    src = fetchFromGitHub {
+      owner = "ethereum-optimism";
+      repo = "optimism";
+      rev = "8d0dd96e494b2ba154587877351e87788336a4ec";
+      hash = "sha256-alsWwj6bb3QkhakED8a9hBF9RE98HQRYmRtNTYhrpjA=";
+      fetchSubmodules = true;
+    };
+
+    nativeBuildInputs = with pkgs; [foundry-bin];
+
+    buildPhase = ''
+      cp $src/packages/contracts-bedrock/foundry.toml .
+      cp -r $src/packages/contracts-bedrock/src .
+      cp -r $src/packages/contracts-bedrock/interfaces .
+      cp -r $src/packages/contracts-bedrock/test .
+      cp -r $src/packages/contracts-bedrock/scripts .
+      cp -r $src/packages/contracts-bedrock/lib .
+
+      ${mkSolcSvmDataDir (
+        with pkgs; [
+          solc_0_8_15
+          solc_0_8_19
+          solc_0_8_25
+          solc_0_8_28
+        ]
+      )}
+
+      forge build --offline
+    '';
+
+    installPhase = ''
+      mkdir -p $out
+      cp -r forge-artifacts $out/
+      cp -r artifacts $out/
+      cp -r cache $out/
+      echo ef7a933ca7f3d27ac40406f87fea25e0c3ba2016 > $out/COMMIT
+    '';
+
+    meta = with lib; {
+      description = "Optimism is Ethereum, scaled.";
+      homepage = "https://optimism.io/";
+      license = with licenses; [mit];
+      platforms = ["x86_64-linux"];
+    };
+  }

packages/contracts-bedrock/v1_8_0.nix → packages/contracts-bedrock/v3.0.0-rc.2/default.nix

@@ -25,21 +25,24 @@
 in
   pkgs.stdenv.mkDerivation rec {
     pname = "contracts-bedrock";
-    version = "1.8.0";
+    version = "3.0.0-rc.2";
 
     src = fetchFromGitHub {
       owner = "ethereum-optimism";
       repo = "optimism";
       rev = "op-contracts/v${version}";
-      hash = "sha256-87Gcy54DNpgH538nmxWCdIeMC7+rCFcPwIpBGooAp4c=";
+      hash = "sha256-8s6XHNnEv5hrDjvmVH06aiKxCSeYS2RhDel8z3EcWrs=";
       fetchSubmodules = true;
     };
 
+    patches = [./001_deployment_game_clock_validations_removal.patch];
+
     nativeBuildInputs = with pkgs; [foundry-bin];
 
-    unpackPhase = ''
+    buildPhase = ''
       cp $src/packages/contracts-bedrock/foundry.toml .
       cp -r $src/packages/contracts-bedrock/src .
+      cp -r $src/packages/contracts-bedrock/interfaces .
       cp -r $src/packages/contracts-bedrock/test .
       cp -r $src/packages/contracts-bedrock/scripts .
       cp -r $src/packages/contracts-bedrock/lib .
@@ -49,23 +52,19 @@ in
           solc_0_8_15
           solc_0_8_19
           solc_0_8_25
+          solc_0_8_28
         ]
       )}
-    '';
 
-    buildPhase = ''
       forge build --offline
     '';
 
     installPhase = ''
       mkdir -p $out
-      cp foundry.toml $out/
-      cp -r src $out/
-      cp -r test $out/
-      cp -r scripts $out/
-      cp -r lib $out/
       cp -r forge-artifacts $out/
+      cp -r artifacts $out/
       cp -r cache $out/
+      echo ef7a933ca7f3d27ac40406f87fea25e0c3ba2016 > $out/COMMIT
     '';
 
     meta = with lib; {

packages/default.nix

@@ -18,26 +18,26 @@
 
       eth2-testnet-genesis = callPackage ./eth2-testnet-genesis {inherit bls;};
 
-      # op stack (supports contracts v1_3_0 to v1_8_0)
       op-node = callPackage ./op-node {};
       op-proposer = callPackage ./op-proposer {};
       op-batcher = callPackage ./op-batcher {};
       op-geth = callPackage ./op-geth {};
 
-      contracts-bedrock-v1_8_0 = callPackage ./contracts-bedrock/v1_8_0.nix {};
-      contracts-bedrock-v1_3_0 = callPackage ./contracts-bedrock/v1_3_0.nix {};
+      contracts-bedrock-v3_0_0-rc2 = callPackage ./contracts-bedrock/v3.0.0-rc.2 {};
+      contracts-bedrock-v2_0_0-rc1 = callPackage ./contracts-bedrock/v2.0.0-rc.1 {};
+      contracts-bedrock-v1_7_0-beta_1_l2-contracts = callPackage ./contracts-bedrock/v1.7.0-beta.1+l2-contracts {};
 
       op-config = import ./op-config {inherit pkgs;};
 
       probe = callPackage ../probe {};
 
-      deploy-optimism = callPackage ./deploy-optimism {op-deployer = op-deployer-v0_2_0_rc1;};
-
-      # op stack (supports contracts v2.0.0)
       op-batcher-v1_11_4 = callPackage ./op-batcher/op-batcher-v1_11_4.nix {};
-      op-deployer-v0_2_0_rc1 = callPackage ./op-deployer/op-deployer-v0_2_0_rc1.nix {};
+
+      op-deployer-v0_2_0-rc2 = callPackage ./op-deployer/op-deployer-v0.2.0-rc.2.nix {};
+
       op-geth-v1_101500_1 = callPackage ./op-geth/op-geth-v1_101500_1.nix {};
       op-node-v1_11_2 = callPackage ./op-node/op-node-v1_11_2.nix {};
+      op-node-v1_12_0 = callPackage ./op-node/op-node-v1_12_0.nix {};
       op-proposer-v1_10_0 = callPackage ./op-proposer/op-proposer-v1_10_0.nix {};
     };