Merge branch 'monza' into 0xmovses/ENG-301-e2e-state-reversion-1

Author: 0xmovses

.dockerignore

@@ -0,0 +1,3 @@
+.movement
+.etc
+target

.gitignore

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

Cargo.lock

@@ -37,6 +37,7 @@ monza-opt-executor = { path = "protocol-units/execution/monza/opt-executor" }
 monza-fin-executor = { path = "protocol-units/execution/monza/fin-executor" }
 monza-execution-util = { path = "protocol-units/execution/monza/util" }
 monza-executor = { path = "protocol-units/execution/monza/executor" }
+
 ## types
 movement-types = { path = "util/movement-types"}
 ## buildtime
@@ -55,7 +56,7 @@ move-rocks = { path = "protocol-units/mempool/move-rocks" }
 sequencing-util = { path = "protocol-units/sequencing/util" }
 memseq = { path = "protocol-units/sequencing/memseq" }
 # random
-rand = "0.8.4"
+rand = "0.7.3"
 
 anyhow = "1.0"
 # To try (experimental) std support, add `features = [ "std" ]` to risc0-zkvm
@@ -68,10 +69,41 @@ serde = "1.0"
 serde_json = "1.0"
 
 
-tempfile = "3.2.0"
-
-# runtime
-tokio = { version = "1.36.0", features = ["fs", "rt-multi-thread"] }
+auto_impl = "1.2.0"
+chrono = "0.4.37"
+serde_with = "3.7.0"
+derivative = "2.2.0"
+derive_more = { version = "0.99.11", default-features = false }
+bytes = { version = "1.2.1", default-features = false }
+clap = { version = "4.4.10", features = ["derive"] }
+log = "0.4.21"
+hex = { version = "0.4.3", default-features = false, features = [
+    "alloc",
+    "serde",
+] }
+async-trait = "0.1.71"
+tracing = "0.1.40"
+tracing-log = "0.2.0"
+env_logger = "0.11.0"
+tokio = { version = "1.35.1", features = ["full"] }
+tokio-stream = "0.1.15"
+async-stream = "0.3.0"
+tempfile = "3.5"
+fail = "0.5.1"
+jsonrpsee = { version = "0.20.1", features = ["jsonrpsee-types"] }
+proptest = { version = "1.3.1", default-features = false, features = ["alloc"] }
+poem = { version = "=1.3.59", features = ["anyhow", "rustls"] }
+poem-openapi = { version = "=2.0.11", features = ["swagger-ui", "url"] }
+schemars = { version = "0.8.16", features = ["derive"] }
+thiserror = "1.0.50"
+x25519-dalek = "1.0.1"
+rand_core = "0.5.1"
+zstd-sys = "2.0.9"
+async-channel = "2.2.1"
+sha2 = "0.10.8"
+once_cell = "1.8.0"
+url = "2.2.2"
+dirs = "3.0.2"
 
 # storage
 rocksdb = { version = "0.21.0", features = [
@@ -85,7 +117,6 @@ rocksdb = { version = "0.21.0", features = [
 # cryptography
 jmt = "0.9.0"
 trie-db = "0.28.0"
-sha2 = "0.10"
 
 # for jmt
 digest = "0.10" 
@@ -95,43 +126,16 @@ mirai-annotations = "1.10.1"
 num-derive = "0.4.2"
 num-traits = "0.2.14"
 parking_lot = { version = "0.12.1" } 
-thiserror = { version = "1.0.24" } 
 blake3 = { version = "1.4.0", features = ["traits-preview"] } 
-hex = { vesion = "0.4.3", features = ["serde"] }
-tracing = "0.1"
 ics23 = { version = "0.11.0" }
 
-
-proptest = "1.0"
 proptest-derive = "0.4"
 
 # internal
 # tentacles = { path = "protocol-units/cryptography/tentacles" }
 move-vm-integration-test-helpers = { path = "test-helpers/move-vm-integration-test-helpers" }
 move-vm-ext = { path = "types/move-vm-ext" }
 
-auto_impl = "1.2.0"
-chrono = "0.4.37"
-serde_with = "3.7.0"
-derivative = "2.2.0"
-derive_more = { version = "0.99.11", default-features = false }
-bytes = { version = "1.2.1", default-features = false }
-clap = { version = "4.4.10", features = ["derive"] }
-log = "0.4.21"
-async-trait = "0.1.71"
-tokio-stream = "0.1.15"
-async-stream = "0.3.0"
-fail = "0.5.1"
-jsonrpsee = { version = "0.20.1", features = ["jsonrpsee-types"] }
-poem = { version = "=1.3.59", features = ["anyhow", "rustls"] }
-poem-openapi = { version = "=2.0.11", features = ["swagger-ui", "url"] }
-schemars = { version = "0.8.16", features = ["derive"] }
-x25519-dalek = "1.0.1"
-rand_core = "0.5.1"
-zstd-sys = "2.0.9"
-async-channel = "2.2.1"
-once_cell = "1.8.0"
-url = "2.2.2"
 
 risc0-build = "0.20"
 
@@ -164,7 +168,9 @@ ethers-middleware = { version = "=2.0.10", default-features = false }
 aptos-vm = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "monza" }
 aptos-sdk = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "monza" }
 aptos-consensus-types = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "monza" }
-aptos-crypto = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "monza" }
+aptos-crypto = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "monza", features = [
+    "cloneable-private-keys",
+] }
 aptos-db = { git = "https://github.com/movementlabsxyz/aptos-core.git", branch = "monza" }
 aptos-api-types = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "monza" }
 aptos-types = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "monza" }

Cargo.toml

@@ -0,0 +1,28 @@
+# Nix builder
+FROM nixos/nix:latest AS builder
+
+# Copy our source and setup our working dir.
+COPY . /tmp/build
+WORKDIR /tmp/build
+
+# Build our Nix environment
+RUN nix \
+    --extra-experimental-features "nix-command flakes" \
+    --option filter-syscalls false \
+    build
+
+# Copy the Nix store closure into a directory. The Nix store closure is the
+# entire set of Nix store values that we need for our build.
+RUN mkdir /tmp/nix-store-closure
+RUN cp -R $(nix-store -qR result/) /tmp/nix-store-closure
+
+# Final image is based on scratch. We copy a bunch of Nix dependencies
+# but they're fully self-contained so we don't need Nix anymore.
+FROM scratch
+
+WORKDIR /app
+
+# Copy /nix/store
+COPY --from=builder /tmp/nix-store-closure /nix/store
+COPY --from=builder /tmp/build/result /app
+CMD ["/app/bin/app"]

docker/build/monza-full-node/Dockerfile

@@ -0,0 +1,11 @@
+# Use the latest Nix image
+FROM nixos/nix:latest
+
+# Set up working directory where the flake will be copied
+WORKDIR /app
+
+# Copy the flake files into the container
+COPY . /app
+
+# Set the entrypoint to use `nix develop` to execute commands within the Nix environment
+ENTRYPOINT ["nix", "develop", "--command", "bash", "-c"]

docker/build/rd/Dockerfile

@@ -12,7 +12,7 @@
     flake-utils,
     ...
     }:
-    flake-utils.lib.eachSystem ["aarch64-darwin" "x86_64-linux"] (
+    flake-utils.lib.eachSystem ["aarch64-darwin" "x86_64-linux" "aarch64-linux"] (
       system: let
         overlays = [(import rust-overlay)];
         pkgs = import nixpkgs {
@@ -26,6 +26,30 @@
 
         # celestia-app
         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;
+          };
+
+        };
 
         # Specific version of toolchain
         rust = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
@@ -65,6 +89,7 @@
         testingDependencies = with pkgs; [
             celestia-node
             celestia-app
+            monza-aptos
         ]
         ++ buildDependencies;
 
@@ -76,12 +101,16 @@
       in
         with pkgs; {
 
+          # Monza Aptos
+          packages.monza-aptos = monza-aptos;
+
           # Development Shell
           devShells.default = mkShell {
             buildInputs = developmentDependencies;
 
             shellHook = ''
               #!/bin/bash
+              export MONZA_APTOS_PATH=$(nix path-info -r .#monza-aptos | tail -n 1)
               cat <<'EOF'
                  _  _   __   _  _  ____  _  _  ____  __ _  ____
                 ( \/ ) /  \ / )( \(  __)( \/ )(  __)(  ( \(_  _)

flake.nix

@@ -2,5 +2,4 @@ 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:
-    cargo build -p monza-full-node
     scripts/movement/run monza-full-node {{ FEATURES }} {{ ARGS }}

justfile

@@ -0,0 +1,25 @@
+{ pkgs }:
+
+pkgs.stdenv.mkDerivation {
+    pname = "monza-aptos";
+    version = "branch-monza";
+
+    src = pkgs.fetchFromGitHub {
+        owner = "movementlabsxyz";
+        repo = "aptos-core";
+        rev = "06443b81f6b8b8742c4aa47eba9e315b5e6502ff";
+        sha256 = "sha256-bmFcJrC4ocbCw1pew2HKEdLj6+1D/0VuWtdoTs1S2sU=";
+    };
+
+    installPhase = ''
+        ls -al && sleep 30
+        mkdir -p $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;
+    };
+}

monza-aptos.nix

@@ -18,6 +18,7 @@ once_cell = { workspace = true }
 tokio = { workspace = true }
 url = { workspace = true }
 rand = { workspace = true }
+monza-execution-util = { workspace = true }
 
 [lints]
 workspace = true

networks/monza/monza-client/Cargo.toml

@@ -8,25 +8,25 @@ use once_cell::sync::Lazy;
 use std::str::FromStr;
 use url::Url;
 
+static MONZA_CONFIG : Lazy<monza_execution_util::config::Config> = Lazy::new(|| {
+    monza_execution_util::config::Config::try_from_env().context("Failed to create the config").unwrap()
+});
+
 // :!:>section_1c
 static NODE_URL: Lazy<Url> = Lazy::new(|| {
+
     Url::from_str(
-        std::env::var("MONZA_FULL_NODE_URL")
-            .as_ref()
-            .map(|s| s.as_str())
-            .unwrap_or("http://localhost:3000"),
-    )
-    .unwrap()
+       format!("http://{}", MONZA_CONFIG.monza_config.aptos_rest_listen_url.as_str()).as_str()
+    ).unwrap()
+    
 });
 
 static FAUCET_URL: Lazy<Url> = Lazy::new(|| {
+    
     Url::from_str(
-        std::env::var("MONZA_FAUCET_URL")
-            .as_ref()
-            .map(|s| s.as_str())
-            .unwrap_or("http://localhost:8081"),
-    )
-    .unwrap()
+        format!("http://{}", MONZA_CONFIG.monza_config.aptos_faucet_listen_url.as_str()).as_str()
+    ).unwrap()
+
 });
 // <:!:section_1c
 

networks/monza/monza-client/src/tests/mod.rs

@@ -0,0 +1,22 @@
+[package]
+name = "monza-config"
+description = "Config tool for Monza"
+authors = { workspace = true }
+edition = { workspace = true }
+homepage = { workspace = true }
+license = { workspace = true }
+repository = { workspace = true }
+
+version = { workspace = true }
+
+[lib]
+path = "src/lib.rs"
+
+[[bin]]
+name = "monza-config"
+path = "src/bin/monza_config.rs"
+
+[dependencies]
+monza-execution-util = { workspace = true }
+anyhow = { workspace = true }
+tokio = { workspace = true }

networks/monza/monza-config/Cargo.toml

@@ -0,0 +1,10 @@
+use monza_config::Config;
+
+#[tokio::main]
+async fn main() -> Result<(), anyhow::Error> {
+    // read any values from env, but populate the default values if they are not present
+    let config = Config::try_from_env()?;
+    // write the values to the env
+    print!("{}", config.write_bash_export_string()?);
+    Ok(())
+}

networks/monza/monza-config/src/bin/monza_config.rs

@@ -0,0 +1,36 @@
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct Config {
+    pub execution_config : monza_execution_util::config::Config,
+}
+
+impl Config {
+
+    pub fn new(execution_config : monza_execution_util::config::Config) -> Self {
+        Self {
+            execution_config,
+        }
+    }
+
+    pub fn try_from_env() -> Result<Self, anyhow::Error> {
+
+        let execution_config = monza_execution_util::config::Config::try_from_env()?;
+
+        Ok(Self {
+            execution_config,
+        })
+        
+    }
+
+    pub fn write_to_env(&self) -> Result<(), anyhow::Error>{
+        self.execution_config.write_to_env()?;
+        Ok(())
+    }
+
+    pub fn write_bash_export_string(&self) -> Result<String, anyhow::Error> {
+        Ok(format!(
+            "{}",
+            self.execution_config.write_bash_export_string()?
+        ))
+    }
+
+}