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

Author: musitdev

.gitmodules

@@ -28,15 +28,7 @@
 [submodule "protocol-units/settlement/mcr/contracts/lib/solmate"]
 	path = protocol-units/settlement/mcr/contracts/lib/solmate
 	url = https://github.com/transmissions11/solmate
-[submodule "dispute-forge-std"]
-	path = protocol-units/dispute/lib/forge-std
-	url = https://github.com/foundry-rs/forge-std
-[submodule "dispute-openzeppelin-contracts"]
-	path = protocol-units/dispute/lib/openzeppelin-contracts
-	url = https://github.com/OpenZeppelin/openzeppelin-contracts
-[submodule "dispute-murky"]
-	path = protocol-units/dispute/lib/murky
-	url = https://github.com/dmfxyz/murky
+
 [submodule "protocol-units/tokens/mock/testnet/holesky/lib/openzeppelin-contracts"]
 	path = protocol-units/tokens/mock/testnet/holesky/lib/openzeppelin-contracts
 	url = https://github.com/OpenZeppelin/openzeppelin-contracts
@@ -45,4 +37,4 @@
 	url = https://github.com/bokkypoobah/BokkyPooBahsDateTimeLibrary
 [submodule "protocol-units/settlement/mcr/contracts/lib/v2-periphery"]
   path = protocol-units/settlement/mcr/contracts/lib/v2-periphery
-  url = https://github.com/Uniswap/v2-periphery
+  url = https://github.com/Uniswap/v2-periphery

Cargo.lock

@@ -152,7 +152,7 @@ google-cloud-kms = "0.6.0"
 
 # Serialization and Deserialization
 serde = "1.0"
-serde_json = "1.0"
+serde_json = "1.0.140"
 serde_derive = "1.0"
 serde_yaml = "0.9.34"
 borsh = { version = "0.10" } # todo: internalize jmt and bump
@@ -203,8 +203,8 @@ move-package = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1
 movement = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" }
 
 # Indexer
-processor = { git = "https://github.com/movementlabsxyz/aptos-indexer-processors", rev = "ceaff42dfb4d1e5c84ee45e7568bb071de4b07f2" }
-server-framework = { git = "https://github.com/movementlabsxyz/aptos-indexer-processors", rev = "ceaff42dfb4d1e5c84ee45e7568bb071de4b07f2" }
+processor = { git = "https://github.com/movementlabsxyz/aptos-indexer-processors", rev = "20be1190105908fd4fea4e78c330997658e9428e" }
+server-framework = { git = "https://github.com/movementlabsxyz/aptos-indexer-processors", rev = "20be1190105908fd4fea4e78c330997658e9428e" }
 
 bcs = { git = "https://github.com/movementlabsxyz/bcs.git", rev = "bc16d2d39cabafaabd76173dd1b04b2aa170cf0c" }
 

Cargo.toml

@@ -14,7 +14,7 @@
 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.
 
 ## Important
-Unless otherwise specified assume all commands below are run after entering a nix shell with `nix develop`.  Development is made possible Within the Nix environment with all needed tooling being available.  If you are wishing to run the network then this can also be achieved without the need to install `nix` with having docker and [just](https://github.com/casey/just) installed only. 
+Unless otherwise specified assume all commands below are run after entering a nix shell with `nix develop`.  Development is made possible Within the Nix environment with all needed tooling being available.  If you wish to run the network then this can also be achieved without the need to install `nix` with having docker and [just](https://github.com/casey/just) installed only. 
 
 ## Organization
 - [`scripts`](./scripts): Scripts for running Movement Labs software. See the [scripts README](./scripts/README.md) for more information about the organization of scripts.

README.md

@@ -1,3 +1,4 @@
+use anyhow::Context;
 use clap::Parser;
 use dot_movement::DotMovement;
 use godfig::{backend::config_file::ConfigFile, Godfig};
@@ -30,7 +31,10 @@ impl MovementArgs {
 	/// Get the config
 	pub async fn config(&self) -> Result<Config, anyhow::Error> {
 		let dot_movement = self.dot_movement()?;
-		let config_file = dot_movement.try_get_or_create_config_file().await?;
+		let config_file = dot_movement
+			.try_get_or_create_config_file()
+			.await
+			.context("Failed to get or create config file")?;
 		let godfig: Godfig<Config, ConfigFile> = Godfig::new(ConfigFile::new(config_file), vec![]);
 
 		godfig.try_wait_for_ready().await.map_err(|e| e.into())

docker/compose/movement-indexer/.remote-movement-node.env

@@ -1,6 +1,8 @@
 pub mod cached;
 
 use aptos_framework_upgrade_gas_release::generate_gas_upgrade_module;
+/// Expose the `maptos_framework_release_util` crate for use in the `pre-l1-merge` release.
+pub use maptos_framework_release_util;
 use maptos_framework_release_util::commit_hash_with_script;
 
 // Example usage of the macro to generate a build script for PreL1Merge.

networks/movement/movement-full-node/src/common_args.rs

@@ -5,10 +5,8 @@ use crate::executor::EXECUTOR_CHANNEL_SIZE;
 use crate::{bootstrap, Context};
 use anyhow::Context as _;
 use aptos_config::config::NodeConfig;
-#[cfg(test)]
 use aptos_crypto::ed25519::Ed25519PrivateKey;
 use aptos_crypto::ed25519::Ed25519PublicKey;
-#[cfg(test)]
 use aptos_crypto::ValidCryptoMaterialStringExt;
 use aptos_executor::block_executor::BlockExecutor;
 use aptos_mempool::MempoolClientRequest;
@@ -21,6 +19,21 @@ use movement_signer::Signing;
 #[cfg(test)]
 use movement_signer_loader::identifiers::{local::Local, SignerIdentifier};
 use movement_signer_loader::{Load, LoadedSigner};
+//=======
+//use aptos_types::transaction::SignedTransaction;
+//use maptos_execution_util::config::Config;
+
+//use movement_signer_loader::identifiers::{local::Local, SignerIdentifier};
+
+//use anyhow::Context as _;
+//use aptos_crypto::Uniform;
+//use futures::channel::mpsc as futures_mpsc;
+//use movement_collections::garbage::{counted::GcCounter, Duration};
+//use tokio::sync::mpsc;
+
+//use tempfile::TempDir;
+
+//>>>>>>> main
 use std::net::ToSocketAddrs;
 use std::sync::{Arc, RwLock};
 use tempfile::TempDir;
@@ -32,10 +45,6 @@ impl Executor {
 		public_key: Ed25519PublicKey,
 		mempool_tx_exec_result_sender: UnboundedSender<Vec<TxExecutionResult>>,
 	) -> Result<Self, anyhow::Error> {
-		// get dot movement
-		// todo: this is a slight anti-pattern, but it's fine for now
-		let dot_movement = DotMovement::try_from_env()?;
-
 		// set up the node config
 		let mut node_config = NodeConfig::default();
 
@@ -100,7 +109,8 @@ impl Executor {
 
 		// indexer table info config
 		node_config.indexer_table_info.enabled = true;
-		node_config.storage.dir = dot_movement.get_path().join("maptos-storage");
+		let db_dir = maptos_config.chain.maptos_db_path.as_ref().context("No db path provided.")?;
+		node_config.storage.dir = db_dir.join("maptos-storage");
 		node_config.storage.set_data_dir(node_config.storage.dir.clone());
 
 		let known_release = aptos_framework_known_release::KnownRelease::try_new(
@@ -193,6 +203,36 @@ impl Executor {
 		Ok((executor, tempdir))
 	}
 
+	pub async fn try_generated() -> Result<
+		(
+			Self,
+			TempDir,
+			Ed25519PrivateKey,
+			futures::channel::mpsc::Receiver<Vec<TxExecutionResult>>,
+		),
+		anyhow::Error,
+	> {
+		// generate a random private key
+		let private_key = Ed25519PrivateKey::generate_for_testing();
+
+		// generate a sender
+		let (mempool_tx_exec_result_sender, receiver) =
+			futures_mpsc::channel::<Vec<TxExecutionResult>>(EXECUTOR_CHANNEL_SIZE);
+		let tempdir = tempfile::tempdir()?;
+
+		let mut maptos_config = Config::default();
+		let raw_private_key_hex = private_key.to_encoded_string()?.to_string();
+		let prefix_stripped =
+			raw_private_key_hex.strip_prefix("0x").unwrap_or(&raw_private_key_hex);
+		maptos_config.chain.maptos_private_key_signer_identifier =
+			SignerIdentifier::Local(Local { private_key_hex_bytes: prefix_stripped.to_string() });
+
+		// replace the db path with the temporary directory
+		maptos_config.chain.maptos_db_path.replace(tempdir.path().to_path_buf());
+		let executor = Self::try_from_config(maptos_config, mempool_tx_exec_result_sender).await?;
+		Ok((executor, tempdir, private_key, receiver))
+	}
+
 	/// Creates an instance of [`Context`] and the background [`TransactionPipe`]
 	/// task to process transactions. If the configuration is for a read-only node,
 	/// `None` is returned instead of the transaction pipe task.

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

@@ -9,7 +9,9 @@ use aptos_executor::block_executor::BlockExecutor;
 use aptos_executor_types::StateComputeResult;
 use aptos_sdk::types::account_address::AccountAddress;
 use aptos_sdk::types::ledger_info::LedgerInfoWithSignatures;
+use aptos_storage_interface::state_view::{DbStateView, DbStateViewAtVersion};
 use aptos_storage_interface::{DbReader, DbReaderWriter};
+use aptos_types::state_store::StateView;
 use aptos_types::transaction::TransactionStatus;
 use aptos_types::validator_signer::ValidatorSigner;
 use aptos_vm::AptosVM;
@@ -141,9 +143,9 @@ pub struct Executor {
 	// Shared reference on the counter of transactions in flight.
 	transactions_in_flight: Arc<RwLock<GcCounter>>,
 	// The config for the executor.
-	pub(crate) config: Config,
+	pub config: Config,
 	/// The node config derived from the maptos config.
-	pub(crate) node_config: NodeConfig,
+	pub node_config: NodeConfig,
 }
 
 impl Executor {
@@ -155,6 +157,15 @@ impl Executor {
 		Arc::clone(&self.db().reader)
 	}
 
+	pub fn state_view_at_version(
+		&self,
+		version: Option<u64>,
+	) -> Result<DbStateView, anyhow::Error> {
+		let reader = self.db_reader();
+		let state_view = reader.state_view_at_version(version)?;
+		Ok(state_view)
+	}
+
 	pub fn decrement_transactions_in_flight(&self, count: u64) {
 		// unwrap because lock is poisoned
 		let mut transactions_in_flight = self.transactions_in_flight.write().unwrap();

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

@@ -11,6 +11,15 @@ pub use context::Context;
 pub use executor::Executor;
 pub use service::Service;
 
+// Re-export dependencies
+pub use aptos_crypto;
+pub use aptos_db;
+pub use aptos_executor;
+pub use aptos_executor_test_helpers;
+pub use aptos_sdk;
+pub use aptos_storage_interface;
+pub use aptos_types;
+
 #[cfg(test)]
 mod tests {