Merge branch 'main' into feature/da-sequencer-node

Author: musitdev

.github/workflows/build-push-container.yml

@@ -18,6 +18,10 @@ on:
 jobs:
   container-build:
     name: Build ${{ inputs.container_name }} ${{ matrix.architecture }}
+    if: >
+      (github.event_name == 'pull_request' && github.event.action == 'labeled' && github.event.label.name == 'cicd:movement-containers')
+      || github.ref == 'refs/heads/main'
+      || startsWith(github.ref, 'refs/tags/')
     strategy:
       matrix:
         architecture: [x86_64, arm64]        
@@ -36,7 +40,6 @@ jobs:
               exit 0
             fi
           fi
-
       - name: Checkout repository
         uses: actions/checkout@v4
         with: 

.gitmodules

@@ -1,13 +1,3 @@
-[submodule "protocol-units/dispute/lib/forge-std"]
-	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
-
 [submodule "protocol-units/settlement/mcr/contracts/lib/openzeppelin-foundry-upgrades"]
 	path = protocol-units/settlement/mcr/contracts/lib/openzeppelin-foundry-upgrades
 	url = https://github.com/OpenZeppelin/openzeppelin-foundry-upgrades

Cargo.lock

@@ -161,16 +161,17 @@ borsh = { version = "0.10" } # todo: internalize jmt and bump
 
 ### We use a forked version so that we can override dependency versions. This is required
 ### to be avoid dependency conflicts with other Sovereign Labs crates.
-aptos-api = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" }
-aptos-api-types = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" }
-aptos-bitvec = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" }
-aptos-block-executor = { git = "https://github.com/movementlabsxyz/aptos-core.git", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" }
-aptos-cached-packages = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" }
-aptos-config = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" }
-aptos-consensus-types = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" }
-aptos-crypto = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67", features = [
-  "cloneable-private-keys",
+aptos-api = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "c34b9e9347a0e4c0440930796ba06555e8be3355" }
+aptos-api-types = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "c34b9e9347a0e4c0440930796ba06555e8be3355" }
+aptos-bitvec = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "c34b9e9347a0e4c0440930796ba06555e8be3355" }
+aptos-block-executor = { git = "https://github.com/movementlabsxyz/aptos-core.git", rev = "c34b9e9347a0e4c0440930796ba06555e8be3355" }
+aptos-cached-packages = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "c34b9e9347a0e4c0440930796ba06555e8be3355" }
+aptos-config = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "c34b9e9347a0e4c0440930796ba06555e8be3355" }
+aptos-consensus-types = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "c34b9e9347a0e4c0440930796ba06555e8be3355" }
+aptos-crypto = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "c34b9e9347a0e4c0440930796ba06555e8be3355", features = [
+    "cloneable-private-keys",
 ] }
+
 aptos-crypto-derive = { git = "https://github.com/movementlabsxyz/aptos-core.git", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" }
 aptos-db = { git = "https://github.com/movementlabsxyz/aptos-core.git", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" }
 aptos-executor = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" }
@@ -220,9 +221,9 @@ move-table-extension = { git = "https://github.com/diem/move" }
 move-core-types = { git = "https://github.com/diem/move" }
 
 secp256k1 = { version = "0.27", default-features = false, features = [
-  "global-context",
-  "rand-std",
-  "recovery",
+    "global-context",
+    "rand-std",
+    "recovery",
 ] }
 
 ## Celestia Dependencies
@@ -232,15 +233,15 @@ celestia-types = { git = "https://github.com/eigerco/lumina", rev = "c6e5b7f5e3a
 # External Dependencies
 
 alloy = { git = "https://github.com/alloy-rs/alloy.git", package = "alloy", rev = "83343b172585fe4e040fb104b4d1421f58cbf9a2", features = [
-  "node-bindings",
-  "rpc-types-trace",
-  "json-rpc",
-  "json-abi",
-  "rpc-client",
-  "signers",
-  "signer-yubihsm",
-  "pubsub",
-  "providers",
+    "node-bindings",
+    "rpc-types-trace",
+    "json-rpc",
+    "json-abi",
+    "rpc-client",
+    "signers",
+    "signer-yubihsm",
+    "pubsub",
+    "providers",
 ] }
 alloy-rpc-types-eth = "0.1.3"
 alloy-eips = { git = "https://github.com/alloy-rs/alloy.git", rev = "83343b172585fe4e040fb104b4d1421f58cbf9a2" }
@@ -249,15 +250,15 @@ alloy-network = { git = "https://github.com/alloy-rs/alloy.git", rev = "83343b17
 alloy-primitives = { version = "0.7.2", default-features = false }
 alloy-consensus = { git = "https://github.com/alloy-rs/alloy.git", rev = "83343b172585fe4e040fb104b4d1421f58cbf9a2" }
 alloy-provider = { git = "https://github.com/alloy-rs/alloy.git", rev = "83343b172585fe4e040fb104b4d1421f58cbf9a2", features = [
-  "ws",
+    "ws",
 ] }
 alloy-rlp = "0.3.5"
 alloy-rpc-types = { git = "https://github.com/alloy-rs/alloy.git", rev = "83343b172585fe4e040fb104b4d1421f58cbf9a2" }
 alloy-sol-types = { version = "0.7.2", features = ["json"] }
 alloy-signer = { git = "https://github.com/alloy-rs/alloy.git", rev = "83343b172585fe4e040fb104b4d1421f58cbf9a2" }
 alloy-transport = { git = "https://github.com/alloy-rs/alloy.git", rev = "83343b172585fe4e040fb104b4d1421f58cbf9a2" }
 alloy-transport-http = { git = "https://github.com/alloy-rs/alloy.git", rev = "83343b172585fe4e040fb104b4d1421f58cbf9a2", features = [
-  "reqwest-rustls-tls",
+    "reqwest-rustls-tls",
 ] }
 alloy-transport-ws = { git = "https://github.com/alloy-rs/alloy.git", rev = "83343b172585fe4e040fb104b4d1421f58cbf9a2" }
 
@@ -282,8 +283,8 @@ fail = "0.5.1"
 futures = "0.3.17"
 hashbrown = "0.14.3"
 hex = { version = "0.4.3", default-features = false, features = [
-  "alloc",
-  "serde",
+    "alloc",
+    "serde",
 ] }
 ics23 = { version = "0.11.0" }
 k256 = { version = "0.13.3" }
@@ -310,10 +311,10 @@ reqwest = "0.12.4"
 risc0-build = "0.20"
 risc0-zkvm = { version = "0.21", features = ["std", "getrandom"] }
 rocksdb = { version = "0.22.0", features = [
-  "snappy",
-  "lz4",
-  "zstd",
-  "zlib",
+    "snappy",
+    "lz4",
+    "zstd",
+    "zlib",
 ], default-features = false }
 schemars = { version = "0.8.16", features = ["derive"] }
 serde_with = "3.7.0"

Cargo.toml

@@ -58,6 +58,22 @@ pub mod full {
 		// Or, I suppose you can keep and GOVERNED_GAS_POOL feature flag and a GOVERNED_GAS_POOL_V2 feature flag and just make sure you're disabling the former and enabling the latter. Thereafter, it won't matter what happens to the GOVERNED_GAS_POOL feature flag, i.e., it can be replaced.
 		aptos_feature_flags.push(AptosFeatureFlag::GOVERNED_GAS_POOL);
 
+		// Note: before the upgrade to the newest version to the Aptos framework
+		// we need to activate features that are currently active on the Aptos testnet
+		// See: https://github.com/movementlabsxyz/movement-migration/issues/30#issuecomment-2862738427
+		// aptos_feature_flags.push(AptosFeatureFlag::PERIODICAL_REWARD_RATE_DECREASE);
+		aptos_feature_flags.push(AptosFeatureFlag::PARTIAL_GOVERNANCE_VOTING);
+		aptos_feature_flags.push(AptosFeatureFlag::DELEGATION_POOL_PARTIAL_GOVERNANCE_VOTING);
+		aptos_feature_flags.push(AptosFeatureFlag::VM_BINARY_FORMAT_V7);
+
+		aptos_feature_flags.push(AptosFeatureFlag::ALLOW_SERIALIZED_SCRIPT_ARGS);
+		aptos_feature_flags.push(AptosFeatureFlag::ENABLE_ENUM_TYPES);
+		aptos_feature_flags.push(AptosFeatureFlag::FEDERATED_KEYLESS);
+		aptos_feature_flags.push(AptosFeatureFlag::TRANSACTION_SIMULATION_ENHANCEMENT);
+		aptos_feature_flags.push(AptosFeatureFlag::COLLECTION_OWNER);
+		aptos_feature_flags.push(AptosFeatureFlag::NATIVE_MEMORY_OPERATIONS);
+		aptos_feature_flags.push(AptosFeatureFlag::ACCOUNT_ABSTRACTION);
+    
 		Features {
 			enabled: aptos_feature_flags.into_iter().map(FeatureFlag::from).collect(),
 			disabled: vec![],

protocol-units/execution/maptos/framework/releases/pre-l1-merge/src/cached.rs

@@ -248,6 +248,7 @@ mod tests {
 		transaction_builder::TransactionFactory,
 		types::{AccountKey, LocalAccount},
 	};
+
 	use aptos_storage_interface::state_view::DbStateViewAtVersion;
 	use aptos_types::{
 		account_address::AccountAddress,

protocol-units/execution/maptos/opt-executor/src/executor/execution.rs

@@ -1,4 +1,6 @@
 [profile.default]
+via_ir = true
+optimizer = true
 src = "src"
 out = "out"
 libs = ["lib"]