Merge branch 'l-monninger/ci-fix' into eng-326/full-node-commitments

Author: l-monninger

.github/workflows/checks.yml

@@ -0,0 +1,34 @@
+name: Checks
+
+on:
+  push:
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        include:
+          - os: ubuntu-22.04
+            arch: x86_64
+            runs-on: movement-runner
+          - os: macos-13-latest
+            arch: arm64
+            runs-on: macos-13-xlarge
+
+    runs-on: ${{ matrix.runs-on }}
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    - name: Install Nix
+      uses: DeterminateSystems/nix-installer-action@main
+
+    - name: Run test in nix environment
+      run: nix develop --command bash  -c "cargo check"  
+
+    - name: Run test in nix environment
+      run: nix develop --command bash  -c "just m1-da-light-node test.local -t=false"  
+
+    - name: Run test in nix environment
+      run: nix develop --command bash  -c "just monza-full-node test.local -t=false"  

.github/workflows/m1-da-light-node.yml

@@ -5,4 +5,5 @@ target/
 ledger_db/
 state_merkle_db/
 .etc
-.movement
+.movement
+.idea

.github/workflows/m2-ci.yml

@@ -1,6 +1,6 @@
 {
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/6143fc5eeb9c4f00163267708e26191d1e918932";
+    nixpkgs.url = "github:NixOS/nixpkgs/f1010e0469db743d14519a1efd37e23f8513d714";
     rust-overlay.url = "github:oxalica/rust-overlay";
     flake-utils.url = "github:numtide/flake-utils";
   };
@@ -12,9 +12,14 @@
     flake-utils,
     ...
     }:
-    flake-utils.lib.eachSystem ["aarch64-darwin" "x86_64-linux" "aarch64-linux"] (
+    flake-utils.lib.eachSystem ["aarch64-darwin" "x86_64-darwin" "x86_64-linux" "aarch64-linux"] (
+
       system: let
+
+        overrides = (builtins.fromTOML (builtins.readFile ./rust-toolchain.toml));
+
         overlays = [(import rust-overlay)];
+
         pkgs = import nixpkgs {
           inherit system overlays;
         };
@@ -28,29 +33,8 @@
         celestia-app = import ./celestia-app.nix { inherit pkgs; };
 
         # monza-aptos
-        monza-aptos = pkgs.stdenv.mkDerivation {
-          pname = "monza-aptos";
-          version = "branch-monza";
-
-          src = pkgs.fetchFromGitHub {
-              owner = "movementlabsxyz";
-              repo = "aptos-core";
-              rev = "06443b81f6b8b8742c4aa47eba9e315b5e6502ff";
-              sha256 = "sha256-iIYGbIh9yPtC6c22+KDi/LgDbxLEMhk4JJMGvweMJ1Q=";
-          };
-
-          installPhase = ''
-              cp -r . $out
-          '';
-
-          meta = with pkgs.lib; {
-              description = "Aptos core repository on the monza branch";
-              homepage = "https://github.com/movementlabsxyz/aptos-core";
-              license = licenses.asl20;
-          };
+        monza-aptos = import ./monza-aptos.nix { inherit pkgs; };
 
-        };
-       
         # Specific version of toolchain
         rust = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
 
@@ -59,46 +43,37 @@
           rustc = rust;
         };
 
-        runtimeDependencies = with pkgs; [
+        dependencies = with pkgs; [
+          llvmPackages.bintools
           openssl
+          openssl.dev
+          libiconv 
+          pkg-config
           process-compose
           just
           jq
-        ];
-
-
-        buildDependencies = with pkgs; [
-            libclang.lib
-            libz
-            clang
-            pkg-config
-            protobuf
-            rustPlatform.bindgenHook
-            lld
-            coreutils
-          ]
-          ++ runtimeDependencies
-          # Be it Darwin
-          ++ lib.optionals stdenv.isDarwin [
-            frameworks.Security
-            frameworks.CoreServices
-            frameworks.SystemConfiguration
-            frameworks.AppKit
-          ]
-          ++ lib.optionals stdenv.isLinux [
-            systemd
-          ];
-
-        testingDependencies = with pkgs; [
-            celestia-node
-            celestia-app
-            monza-aptos
-        ]
-        ++ buildDependencies;
-
-        developmentDependencies = with pkgs; [
+          libclang.lib
+          libz
+          clang
+          pkg-config
+          protobuf
+          rustPlatform.bindgenHook
+          lld
+          coreutils
+          gcc
           rust
-        ] ++ testingDependencies;
+          celestia-node
+          celestia-app
+          monza-aptos
+        ] ++ lib.optionals stdenv.isDarwin [
+          frameworks.Security
+          frameworks.CoreServices
+          frameworks.SystemConfiguration
+          frameworks.AppKit
+        ] ++ lib.optionals stdenv.isLinux [
+          udev
+          systemd
+        ];
 
 
       in
@@ -109,11 +84,17 @@
 
           # Development Shell
           devShells.default = mkShell {
-            buildInputs = developmentDependencies;
+
+            OPENSSL_DEV=pkgs.openssl.dev;
+            PKG_CONFIG_PATH = "${pkgs.openssl.dev}/lib/pkgconfig";
+            buildInputs = dependencies;
+            nativeBuildInputs = dependencies;
 
             shellHook = ''
               #!/bin/bash
               export MONZA_APTOS_PATH=$(nix path-info -r .#monza-aptos | tail -n 1)
+              export PATH=$PATH:''${CARGO_HOME:-~/.cargo}/bin
+              export PATH=$PATH:''${RUSTUP_HOME:-~/.rustup}/toolchains/$RUSTC_VERSION-x86_64-unknown-linux-gnu/bin/
               cat <<'EOF'
                  _  _   __   _  _  ____  _  _  ____  __ _  ____
                 ( \/ ) /  \ / )( \(  __)( \/ )(  __)(  ( \(_  _)

.gitignore

@@ -8,18 +8,16 @@ pkgs.stdenv.mkDerivation {
         owner = "movementlabsxyz";
         repo = "aptos-core";
         rev = "06443b81f6b8b8742c4aa47eba9e315b5e6502ff";
-        sha256 = "sha256-bmFcJrC4ocbCw1pew2HKEdLj6+1D/0VuWtdoTs1S2sU=";
+        sha256 = "sha256-iIYGbIh9yPtC6c22+KDi/LgDbxLEMhk4JJMGvweMJ1Q=";
     };
 
     installPhase = ''
-        ls -al && sleep 30
-        mkdir -p $out
-        cp -r ./* $out/
+        cp -r . $out
     '';
 
     meta = with pkgs.lib; {
         description = "Aptos core repository on the monza branch";
         homepage = "https://github.com/movementlabsxyz/aptos-core";
         license = licenses.asl20;
     };
-}
+}

Cargo.lock

@@ -9,7 +9,7 @@ processes:
       cargo run -p m1-da-light-node --features "sequencer"
     depends_on:
       m1-da-light-node-verifier-tests:
-        condition: process_completed
+        condition: process_completed_successfully
       celestia-light-node:
         condition: process_healthy
     readiness_probe:
@@ -26,4 +26,4 @@ processes:
       m1-da-light-node: 
         condition: process_healthy
       m1-da-light-node-verifier-tests:
-        condition: process_completed
+        condition: process_completed_successfully

flake.lock

@@ -11,7 +11,7 @@ processes:
       celestia-light-node: 
         condition: process_healthy
       celestia-light-node-synced:
-        condition: process_completed
+        condition: process_completed_successfully
 
     readiness_probe:
       exec:
@@ -27,7 +27,7 @@ processes:
       m1-da-light-node: 
         condition: process_healthy
       m1-da-light-node-verifier-tests:
-        condition: process_completed
+        condition: process_completed_successfully
     availability:
       # NOTE: `restart: exit_on_failure` is not needed since
       # exit_on_end implies it.

flake.nix

@@ -13,18 +13,17 @@ processes:
 
   celestia-light-node-synced:
     command: |
-      sleep 10
       cargo run --bin wait-for-celestia-light-node
     depends_on:
       celestia-light-node:
         condition: process_healthy
 
   m1-da-light-node:
     command: |
-      cargo run -p m1-da-light-node
+      ./target/debug/m1-da-light-node
     depends_on:
       m1-da-light-node-verifier-tests:
-        condition: process_completed
+        condition: process_completed_successfully
       celestia-light-node:
         condition: process_healthy
     readiness_probe: