Merge branch 'main' of https://github.com/movementlabsxyz/sdk

Cargo.toml

@@ -14,10 +14,6 @@ members = [
     "util/buildtime/buildtime-macros",
 
     "networks/monza/*",
-
-    "protocol-units/zkfp/host",
-    "protocol-units/zkfp/methods",
-    "protocol-units/zkfp/methods/guest",
 ]
 
 [workspace.package]
@@ -27,6 +23,7 @@ license = "MIT OR Apache-2.0"
 authors = ["Movement Labs"]
 repository = "www.github.com/movementlabs/movement"
 homepage = "www.homepage.com"
+resolver = "2"
 publish = false
 rust-version = "1.75"
 
@@ -165,32 +162,33 @@ ethers-middleware = { version = "=2.0.10", default-features = false }
 # Aptos dependencies
 # We use a forked version so that we can override dependency versions. This is required
 # to be avoid depenedency conflicts with other Sovereign Labs crates.
-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", features = [
+aptos-vm = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "7d807dcbd8796e760d272db2fd7903e6d8449730" }
+aptos-sdk = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "7d807dcbd8796e760d272db2fd7903e6d8449730" }
+aptos-consensus-types = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "7d807dcbd8796e760d272db2fd7903e6d8449730" }
+aptos-crypto = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "7d807dcbd8796e760d272db2fd7903e6d8449730", 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" }
-aptos-api = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "monza" }
-aptos-storage-interface = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "monza" }
-aptos-block-executor = { git = "https://github.com/movementlabsxyz/aptos-core.git", branch = "monza" }
-aptos-vm-types = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "monza" }
-aptos-vm-logging = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "monza" }
-aptos-language-e2e-tests = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "monza" }
-aptos-framework = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "monza" }
-aptos-config = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "monza" }
-aptos-vm-genesis = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "monza" }
-aptos-executor = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "monza" }
-aptos-executor-types = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "monza" }
-aptos-executor-test-helpers = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "monza" }
-aptos-bitvec = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "monza" }
-aptos-mempool = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "monza" }
-aptos-state-view = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "monza" }
-aptos-temppath = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "monza" }
-aptos-faucet-core = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "monza" }
+aptos-db = { git = "https://github.com/movementlabsxyz/aptos-core.git", rev = "7d807dcbd8796e760d272db2fd7903e6d8449730" }
+aptos-api-types = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "7d807dcbd8796e760d272db2fd7903e6d8449730" }
+aptos-types = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "7d807dcbd8796e760d272db2fd7903e6d8449730" }
+aptos-api = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "7d807dcbd8796e760d272db2fd7903e6d8449730" }
+aptos-storage-interface = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "7d807dcbd8796e760d272db2fd7903e6d8449730" }
+aptos-block-executor = { git = "https://github.com/movementlabsxyz/aptos-core.git", rev = "7d807dcbd8796e760d272db2fd7903e6d8449730" }
+aptos-vm-types = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "7d807dcbd8796e760d272db2fd7903e6d8449730" }
+aptos-vm-logging = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "7d807dcbd8796e760d272db2fd7903e6d8449730" }
+aptos-language-e2e-tests = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "7d807dcbd8796e760d272db2fd7903e6d8449730" }
+aptos-framework = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "7d807dcbd8796e760d272db2fd7903e6d8449730" }
+aptos-config = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "7d807dcbd8796e760d272db2fd7903e6d8449730" }
+aptos-vm-genesis = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "7d807dcbd8796e760d272db2fd7903e6d8449730" }
+aptos-executor = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "7d807dcbd8796e760d272db2fd7903e6d8449730" }
+aptos-executor-types = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "7d807dcbd8796e760d272db2fd7903e6d8449730" }
+aptos-executor-test-helpers = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "7d807dcbd8796e760d272db2fd7903e6d8449730" }
+aptos-bitvec = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "7d807dcbd8796e760d272db2fd7903e6d8449730" }
+aptos-mempool = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "7d807dcbd8796e760d272db2fd7903e6d8449730" }
+aptos-state-view = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "7d807dcbd8796e760d272db2fd7903e6d8449730" }
+aptos-temppath = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "7d807dcbd8796e760d272db2fd7903e6d8449730" }
+aptos-faucet-core = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "7d807dcbd8796e760d272db2fd7903e6d8449730" }
+aptos-proptest-helpers = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "7d807dcbd8796e760d272db2fd7903e6d8449730" }
 bcs = { git = "https://github.com/aptos-labs/bcs.git", rev = "d31fab9d81748e2594be5cd5cdf845786a30562d" }
 
 move-binary-format = { git = "https://github.com/diem/move" }
@@ -213,7 +211,7 @@ secp256k1 = { version = "0.27", default-features = false, features = [
     "rand-std",
     "recovery",
 ] }
-aptos-cached-packages = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "monza" }
+aptos-cached-packages = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "7d807dcbd8796e760d272db2fd7903e6d8449730" }
 
 # celestia dependencies
 celestia-rpc = { git = "https://github.com/eigerco/lumina" }
@@ -223,10 +221,6 @@ celestia-types = { git = "https://github.com/eigerco/lumina" }
 futures = "0.3.17"
 
 
-# zkfp
-methods = { path = "protocol-units/zkfp/methods" }
-
-
 [workspace.lints.rust]
 dead_code = "deny"
 unused_imports = "deny"

README.md

@@ -1,6 +1,8 @@
 # `movement-sdk`
 The Movement SDK is a collection of tools and libraries for building, deploying, and working with Movement Labs infrastructure. The SDK is designed to be modular and extensible, allowing developers to build custom tools and libraries on top of the core components as well as to interact with Movement Labs' own networks.
 
+**Note:** unless otherwise specified assume all commands below are run after entering a nix shell with `nix develop`.
+
 ## Organization
 - [`scripts`](./scripts): Scripts for running Movement Labs software. See the [scripts README](./scripts/README.md) for more information about the organization of scripts.
 - [`process-compose`](./process-compose): Process compose files for running Movement Labs software. These files are part of the standard flow for running and testing components in the Movement Network. See the [scripts README](./scripts/README.md) for more information about the organization of scripts.
@@ -13,13 +15,24 @@ The Movement SDK is a collection of tools and libraries for building, deploying,
 - **Features**:
     - `local`: Run a local Celestia Data Availability service. (Default.)
     - `arabica`: Run an Arabica Celestia Data Availability service. (Overrides local.)
-    - `test`: Run the test suite for the `m1-da-light-node`. (Can be combined with `local` or `arabica`.)
+    - `test`: Run the test suite for the `m1-da-light-node`. (Can be combined with `local` or `arabica`. Exits on completion by default.)
 
 ```bash
 # example test with local  Celestia Data Availability service
 just m1-da-light-node test.local
 ```
 
+# `monza-full-node`
+
+- **Features**:
+    - `local`: Run a local Celesta Data Availability service. 
+    - `test`: run the test suite for `monza-full-node`. (Can be combined with `local`. Exits on completion by default.)
+
+```bash
+# example test with local
+just monza-full-node test.local
+```
+
 ## License
 
 This project is licensed under the Apache 2.0 License - see the [LICENSE](LICENSE) file for details.

protocol-units/execution/monza/executor/Cargo.toml

@@ -59,6 +59,7 @@ aptos-executor-test-helpers = { workspace = true }
 aptos-bitvec = { workspace = true }
 aptos-mempool = { workspace = true }
 aptos-temppath = { workspace = true }
+aptos-proptest-helpers = { workspace = true }
 
 monza-opt-executor = { workspace = true }
 monza-execution-util = { workspace = true }