feat: mcr contracts

ENG-317 implement mcr contracts

Author: l-monninger

.github/workflows/checks.yml

@@ -24,11 +24,14 @@ jobs:
     - name: Install Nix
       uses: DeterminateSystems/nix-installer-action@main
 
-    - name: Run test in nix environment
+    - name: Run MCR tests in nix environment
+      run: nix develop --command bash  -c "just mcr-contract-tests"
+
+    - name: Run Cargo Check in nix environment
       run: nix develop --command bash  -c "cargo check"  
 
-    - name: Run test in nix environment
+    - name: Run M1 DA Light Node tests in nix environment
       run: nix develop --command bash  -c "just m1-da-light-node test.local -t=false"  
 
-    - name: Run test in nix environment
+    - name: Run monza tests in nix environment
       run: nix develop --command bash  -c "just monza-full-node test.local -t=false"  

.gitmodules

@@ -1,9 +1,10 @@
 [submodule "protocol-units/dispute/lib/forge-std"]
-	path = protocol-units/dispute/lib/forge-std
-	url = https://github.com/foundry-rs/forge-std
-[submodule "protocol-units/eth-settlement/contracts/lib/openzeppelin-contracts"]
-	path = protocol-units/dispute/contracts/lib/openzeppelin-contracts
-	url = https://github.com/OpenZeppelin/openzeppelin-contracts
-[submodule "protocol-units/eth-settlement/lib/openzeppelin-contracts"]
-	path = protocol-units/eth-settlement/lib/openzeppelin-contracts
-	url = https://github.com/OpenZeppelin/openzeppelin-contracts
+	path = protocol-units/settlement/mcr/contracts/lib/forge-std
+    url = https://github.com/foundry-rs/forge-std
+[submodule "protocol-units/dispute/lib/openzeppelin-contracts"]
+	path = protocol-units/settlement/mcr/contracts/lib/openzeppelin-contracts
+    url = https://github.com/OpenZeppelin/openzeppelin-contracts
+[submodule "protocol-units/dispute/lib/murky"]
+	path = protocol-units/settlement/mcr/contracts/lib/murky
+	url = https://github.com/dmfxyz/murky
+

flake.lock

@@ -3,13 +3,15 @@
     nixpkgs.url = "github:NixOS/nixpkgs/f1010e0469db743d14519a1efd37e23f8513d714";
     rust-overlay.url = "github:oxalica/rust-overlay";
     flake-utils.url = "github:numtide/flake-utils";
+    foundry.url = "github:shazow/foundry.nix/monthly"; 
   };
 
   outputs = {
     self,
     nixpkgs,
     rust-overlay,
     flake-utils,
+    foundry,
     ...
     }:
     flake-utils.lib.eachSystem ["aarch64-darwin" "x86_64-darwin" "x86_64-linux" "aarch64-linux"] (
@@ -18,32 +20,20 @@
 
         overrides = (builtins.fromTOML (builtins.readFile ./rust-toolchain.toml));
 
-        overlays = [(import rust-overlay)];
+        overlays = [
+          (import rust-overlay)
+          foundry.overlay
+        ];
 
         pkgs = import nixpkgs {
           inherit system overlays;
         };
 
         frameworks = pkgs.darwin.apple_sdk.frameworks;
 
-        # celestia-node
-        celestia-node = import ./celestia-node.nix { inherit pkgs; };
-
-        # celestia-app
-        celestia-app = import ./celestia-app.nix { inherit pkgs; };
-
-        # monza-aptos
-        monza-aptos = import ./monza-aptos.nix { inherit pkgs; };
-
-        # Specific version of toolchain
-        rust = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
-
-        rustPlatform = pkgs.makeRustPlatform {
-          cargo = rust;
-          rustc = rust;
-        };
-
-        dependencies = with pkgs; [
+         dependencies = with pkgs; [
+          foundry-bin
+          solc
           llvmPackages.bintools
           openssl
           openssl.dev
@@ -75,6 +65,22 @@
           systemd
         ];
 
+        # Specific version of toolchain
+        rust = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
+
+        rustPlatform = pkgs.makeRustPlatform {
+          cargo = rust;
+          rustc = rust;
+        };
+
+        # celestia-node
+        celestia-node = import ./nix/celestia-node.nix { inherit pkgs; };
+
+        # celestia-app
+        celestia-app = import ./nix/celestia-app.nix { inherit pkgs; };
+
+        # monza-aptos
+        monza-aptos = import ./nix/monza-aptos.nix { inherit pkgs; };
 
       in
         with pkgs; {
@@ -93,6 +99,7 @@
             shellHook = ''
               #!/bin/bash
               export MONZA_APTOS_PATH=$(nix path-info -r .#monza-aptos | tail -n 1)
+              install-foundry
               cat <<'EOF'
                  _  _   __   _  _  ____  _  _  ____  __ _  ____
                 ( \/ ) /  \ / )( \(  __)( \/ )(  __)(  ( \(_  _)

flake.nix

@@ -2,4 +2,6 @@ m1-da-light-node FEATURES *ARGS:
     cargo build -p m1-da-light-node
     scripts/movement/run m1-da-light-node {{ FEATURES }} {{ ARGS }}
 monza-full-node FEATURES *ARGS:
-    scripts/movement/run monza-full-node {{ FEATURES }} {{ ARGS }}
+    scripts/movement/run monza-full-node {{ FEATURES }} {{ ARGS }}
+mcr-contract-tests: 
+    cd ./protocol-units/settlement/mcr/contracts && forge test