From ab26911bffb9682282ddc2cc79b56549a220ff2e Mon Sep 17 00:00:00 2001 From: Richard Melkonian Date: Tue, 28 Jan 2025 16:11:41 +0000 Subject: [PATCH 01/10] create: initial setup for mint op --- Cargo.lock | 3 + .../movement/movement-full-node/Cargo.toml | 4 + .../src/admin/ops/burn_from.rs | 0 .../movement-full-node/src/admin/ops/mint.rs | 104 ++++++++++++++++++ .../src/admin/ops/mint_lock.rs | 15 --- .../movement-full-node/src/admin/ops/mod.rs | 9 +- 6 files changed, 117 insertions(+), 18 deletions(-) create mode 100644 networks/movement/movement-full-node/src/admin/ops/burn_from.rs create mode 100644 networks/movement/movement-full-node/src/admin/ops/mint.rs delete mode 100644 networks/movement/movement-full-node/src/admin/ops/mint_lock.rs diff --git a/Cargo.lock b/Cargo.lock index 82a014a1e..d9b93b99a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -10536,6 +10536,7 @@ name = "movement-full-node" version = "0.0.2" dependencies = [ "anyhow", + "aptos-sdk", "bcs 0.1.4", "clap 4.5.21", "console-subscriber", @@ -10555,6 +10556,7 @@ dependencies = [ "movement-rest", "movement-tracing", "movement-types", + "once_cell", "prost 0.13.3", "rocksdb", "serde_json", @@ -10564,6 +10566,7 @@ dependencies = [ "tonic 0.12.3", "tracing", "tracing-subscriber 0.3.18", + "url", "zstd 0.13.2", ] diff --git a/networks/movement/movement-full-node/Cargo.toml b/networks/movement/movement-full-node/Cargo.toml index daac9aa5d..61930126e 100644 --- a/networks/movement/movement-full-node/Cargo.toml +++ b/networks/movement/movement-full-node/Cargo.toml @@ -12,6 +12,8 @@ rust-version = { workspace = true } # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] +anyhow = { workspace = true } +aptos-sdk = { workspace = true } maptos-dof-execution = { workspace = true } prost = { workspace = true } movement-da-light-node-proto = { workspace = true, features = ["client"] } @@ -22,6 +24,7 @@ serde_json = { workspace = true } anyhow = { workspace = true } futures = { workspace = true } tokio = { workspace = true } +once_cell = { workspace = true } tokio-stream = { workspace = true } sha2 = { workspace = true } tonic = { workspace = true } @@ -42,6 +45,7 @@ hex = { workspace = true } mcr-settlement-config = { workspace = true } clap = { workspace = true } movement-da-light-node-client = { workspace = true} +url = { workspace = true } [features] default = [] diff --git a/networks/movement/movement-full-node/src/admin/ops/burn_from.rs b/networks/movement/movement-full-node/src/admin/ops/burn_from.rs new file mode 100644 index 000000000..e69de29bb diff --git a/networks/movement/movement-full-node/src/admin/ops/mint.rs b/networks/movement/movement-full-node/src/admin/ops/mint.rs new file mode 100644 index 000000000..c266fef65 --- /dev/null +++ b/networks/movement/movement-full-node/src/admin/ops/mint.rs @@ -0,0 +1,104 @@ +#[allow(unused_imports)] +use anyhow::Context +use crate::common_args::MovementArgs; +use aptos_sdk::{coin_client::CoinClient, rest_client::{Client, FaucetClient}}; +use clap::Parser; +use once_cell::sync::Lazy; +use url::Url; +use std::str::FromStr; +use aptos_sdk::{ + coin_client::CoinClient, + crypto::{SigningKey, ValidCryptoMaterialStringExt}, + move_types::{ + identifier::Identifier, + language_storage::{ModuleId, TypeTag}, + }, + rest_client::{Client, FaucetClient, Transaction}, + transaction_builder::TransactionFactory, + types::{account_address::AccountAddress, transaction::TransactionPayload}, +}; + +#[derive(Debug, Parser, Clone)] +#[clap(rename_all = "kebab-case", about = "Mints and locks tokens.")] +pub struct Mint { + #[clap(flatten)] + pub movement_args: MovementArgs, +} + +static SUZUKA_CONFIG: Lazy = Lazy::new(|| { + let dot_movement = dot_movement::DotMovement::try_from_env().unwrap(); + let config = dot_movement.try_get_config_from_json::().unwrap(); + config +}); + +// :!:>section_1c +static NODE_URL: Lazy = Lazy::new(|| { + let node_connection_address = SUZUKA_CONFIG + .execution_config + .maptos_config + .client + .maptos_rest_connection_hostname + .clone(); + let node_connection_port = SUZUKA_CONFIG + .execution_config + .maptos_config + .client + .maptos_rest_connection_port + .clone(); + + let node_connection_url = + format!("http://{}:{}", node_connection_address, node_connection_port); + + Url::from_str(node_connection_url.as_str()).unwrap() +}); + +static FAUCET_URL: Lazy = Lazy::new(|| { + let faucet_listen_address = SUZUKA_CONFIG + .execution_config + .maptos_config + .client + .maptos_faucet_rest_connection_hostname + .clone(); + let faucet_listen_port = SUZUKA_CONFIG + .execution_config + .maptos_config + .client + .maptos_faucet_rest_connection_port + .clone(); + + let faucet_listen_url = format!("http://{}:{}", faucet_listen_address, faucet_listen_port); + + Url::from_str(faucet_listen_url.as_str()).unwrap() +}); + +const DEAD_ADDRESS: &str = "000000000000000000000000000000000000000000000000000000000000dead"; + +impl Mint { + + pub async fn execute(&self) -> Result<(), anyhow::Error> { + let rest_client = Client::new(NODE_URL.clone()); + let faucet_client = FaucetClient::new(FAUCET_URL.clone(), NODE_URL.clone()); + let coin_client = CoinClient::new(&rest_client); + let dead_address = AccountAddress::from_str(DEAD_ADDRESS)?; + let chain_id = rest_client + .get_index() + .await + .context("failed to get chain ID")? + .inner() + .chain_id; + + // Create account for transactions and gas collection + let private_key = SUZUKA_CONFIG + .execution_config + .maptos_config + .chain + .maptos_private_key + .to_string(); + let mut core_resources_account: LocalAccount = LocalAccount::from_private_key( + "0x0000000000000000000000000000000000000000000000000000000000000001", + 0, + )?; + + Ok(()) + } +} diff --git a/networks/movement/movement-full-node/src/admin/ops/mint_lock.rs b/networks/movement/movement-full-node/src/admin/ops/mint_lock.rs deleted file mode 100644 index eee416b3d..000000000 --- a/networks/movement/movement-full-node/src/admin/ops/mint_lock.rs +++ /dev/null @@ -1,15 +0,0 @@ -use crate::common_args::MovementArgs; -use clap::Parser; - -#[derive(Debug, Parser, Clone)] -#[clap(rename_all = "kebab-case", about = "Mints and locks tokens.")] -pub struct MintLock { - #[clap(flatten)] - pub movement_args: MovementArgs, -} - -impl MintLock { - pub async fn execute(&self) -> Result<(), anyhow::Error> { - Ok(()) - } -} diff --git a/networks/movement/movement-full-node/src/admin/ops/mod.rs b/networks/movement/movement-full-node/src/admin/ops/mod.rs index a76b14334..c5f8ce4bb 100644 --- a/networks/movement/movement-full-node/src/admin/ops/mod.rs +++ b/networks/movement/movement-full-node/src/admin/ops/mod.rs @@ -1,17 +1,20 @@ -pub mod mint_lock; +pub mod burn_from; +pub mod mint; use clap::Subcommand; #[derive(Subcommand, Debug)] #[clap(rename_all = "kebab-case", about = "Commands for bespoke network operations")] pub enum Ops { - MintLock(mint_lock::MintLock), + Mint(mint::Mint), + BurnFrom(burn_from::BurnFrom), } impl Ops { pub async fn execute(&self) -> Result<(), anyhow::Error> { match self { - Ops::MintLock(mint_lock) => mint_lock.execute().await, + Ops::Mint(mint) => mint.execute().await, + Ops::BurnFrom(burn_from) => burn_from.execute().await, } } } From 3262f96029544a9d8e8acd2c0e0abeca7002ef98 Mon Sep 17 00:00:00 2001 From: Richard Melkonian Date: Tue, 28 Jan 2025 16:42:39 +0000 Subject: [PATCH 02/10] fix: grab maptos k --- .../movement-full-node/src/admin/ops/mint.rs | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/networks/movement/movement-full-node/src/admin/ops/mint.rs b/networks/movement/movement-full-node/src/admin/ops/mint.rs index c266fef65..6973198b9 100644 --- a/networks/movement/movement-full-node/src/admin/ops/mint.rs +++ b/networks/movement/movement-full-node/src/admin/ops/mint.rs @@ -1,5 +1,5 @@ #[allow(unused_imports)] -use anyhow::Context +use anyhow::Context; use crate::common_args::MovementArgs; use aptos_sdk::{coin_client::CoinClient, rest_client::{Client, FaucetClient}}; use clap::Parser; @@ -71,6 +71,19 @@ static FAUCET_URL: Lazy = Lazy::new(|| { Url::from_str(faucet_listen_url.as_str()).unwrap() }); +static MAPTOS_PRIVATE_KEY: Lazy = Lazy::new(|| { + let faucet_listen_port = SUZUKA_CONFIG + .execution_config + .maptos_config + .chain + .maptos_private_key + .clone(); + + let faucet_listen_url = format!("http://{}:{}", faucet_listen_address, faucet_listen_port); + + Url::from_str(faucet_listen_url.as_str()).unwrap() +}); + const DEAD_ADDRESS: &str = "000000000000000000000000000000000000000000000000000000000000dead"; impl Mint { @@ -95,7 +108,7 @@ impl Mint { .maptos_private_key .to_string(); let mut core_resources_account: LocalAccount = LocalAccount::from_private_key( - "0x0000000000000000000000000000000000000000000000000000000000000001", + MAPTOS_PRIVATE_KEY.clone(), 0, )?; From f88ee4afcbe15c256ac761f8f9cda90418c6c84d Mon Sep 17 00:00:00 2001 From: Richard Melkonian Date: Tue, 28 Jan 2025 16:50:52 +0000 Subject: [PATCH 03/10] update: build burn tx --- .../movement/movement-full-node/Cargo.toml | 1 - .../movement-full-node/src/admin/ops/mint.rs | 31 +++++++++++++++---- 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/networks/movement/movement-full-node/Cargo.toml b/networks/movement/movement-full-node/Cargo.toml index 61930126e..980cf635c 100644 --- a/networks/movement/movement-full-node/Cargo.toml +++ b/networks/movement/movement-full-node/Cargo.toml @@ -21,7 +21,6 @@ movement-da-util = { workspace = true } mcr-settlement-client = { workspace = true, features = ["eth"] } mcr-settlement-manager = { workspace = true } serde_json = { workspace = true } -anyhow = { workspace = true } futures = { workspace = true } tokio = { workspace = true } once_cell = { workspace = true } diff --git a/networks/movement/movement-full-node/src/admin/ops/mint.rs b/networks/movement/movement-full-node/src/admin/ops/mint.rs index 6973198b9..335ece5b0 100644 --- a/networks/movement/movement-full-node/src/admin/ops/mint.rs +++ b/networks/movement/movement-full-node/src/admin/ops/mint.rs @@ -1,11 +1,11 @@ #[allow(unused_imports)] use anyhow::Context; use crate::common_args::MovementArgs; -use aptos_sdk::{coin_client::CoinClient, rest_client::{Client, FaucetClient}}; +use aptos_sdk::{coin_client::CoinClient, rest_client::{Client, FaucetClient}, transaction_builder::TransactionBuilder, types::{chain_id::ChainId, transaction::EntryFunction, LocalAccount}}; use clap::Parser; use once_cell::sync::Lazy; use url::Url; -use std::str::FromStr; +use std::{str::FromStr, time::{SystemTime, UNIX_EPOCH}}; use aptos_sdk::{ coin_client::CoinClient, crypto::{SigningKey, ValidCryptoMaterialStringExt}, @@ -100,6 +100,14 @@ impl Mint { .inner() .chain_id; + let mut core_resources_account: LocalAccount = LocalAccount::from_private_key( + MAPTOS_PRIVATE_KEY.clone().as_str(), + 0, + )?; + + tracing::info!("Created core resources account"); + tracing::debug!("core_resources_account address: {}", core_resources_account.address()); + // Create account for transactions and gas collection let private_key = SUZUKA_CONFIG .execution_config @@ -107,10 +115,21 @@ impl Mint { .chain .maptos_private_key .to_string(); - let mut core_resources_account: LocalAccount = LocalAccount::from_private_key( - MAPTOS_PRIVATE_KEY.clone(), - 0, - )?; + + let create_dead_transaction = + core_resources_account.sign_with_transaction_builder(TransactionBuilder::new( + TransactionPayload::EntryFunction(EntryFunction::new( + ModuleId::new( + AccountAddress::from_hex_literal("0x1")?, + Identifier::new("aptos_account")?, + ), + Identifier::new("create_account")?, + vec![], + vec![bcs::to_bytes(&dead_address)?], + )), + SystemTime::now().duration_since(UNIX_EPOCH)?.as_secs() + 60, + ChainId::new(chain_id), + ).sequence_number(core_resources_account.sequence_number())); Ok(()) } From 2938f80f918d8fc490ff5dfff83eade8e59bfa97 Mon Sep 17 00:00:00 2001 From: Richard Melkonian Date: Tue, 28 Jan 2025 16:53:16 +0000 Subject: [PATCH 04/10] fix: pk --- networks/movement/movement-full-node/src/admin/ops/mint.rs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/networks/movement/movement-full-node/src/admin/ops/mint.rs b/networks/movement/movement-full-node/src/admin/ops/mint.rs index 335ece5b0..1ee2f9dd6 100644 --- a/networks/movement/movement-full-node/src/admin/ops/mint.rs +++ b/networks/movement/movement-full-node/src/admin/ops/mint.rs @@ -72,16 +72,14 @@ static FAUCET_URL: Lazy = Lazy::new(|| { }); static MAPTOS_PRIVATE_KEY: Lazy = Lazy::new(|| { - let faucet_listen_port = SUZUKA_CONFIG + let pk= SUZUKA_CONFIG .execution_config .maptos_config .chain .maptos_private_key .clone(); - let faucet_listen_url = format!("http://{}:{}", faucet_listen_address, faucet_listen_port); - - Url::from_str(faucet_listen_url.as_str()).unwrap() + Url::from_str(pk).unwrap() }); const DEAD_ADDRESS: &str = "000000000000000000000000000000000000000000000000000000000000dead"; From 1a07ac2ae129b45cef158cce1f64bf715dc88424 Mon Sep 17 00:00:00 2001 From: Richard Melkonian Date: Tue, 28 Jan 2025 17:39:32 +0000 Subject: [PATCH 05/10] feat: complete burn call --- .../movement-full-node/src/admin/ops/mint.rs | 57 +++++++++++++------ .../src/admin/ops/move-modules/burn_from.move | 12 ++++ 2 files changed, 51 insertions(+), 18 deletions(-) create mode 100644 networks/movement/movement-full-node/src/admin/ops/move-modules/burn_from.move diff --git a/networks/movement/movement-full-node/src/admin/ops/mint.rs b/networks/movement/movement-full-node/src/admin/ops/mint.rs index 1ee2f9dd6..6b9e55e7d 100644 --- a/networks/movement/movement-full-node/src/admin/ops/mint.rs +++ b/networks/movement/movement-full-node/src/admin/ops/mint.rs @@ -1,11 +1,12 @@ #[allow(unused_imports)] use anyhow::Context; +use tokio::process::Command; use crate::common_args::MovementArgs; -use aptos_sdk::{coin_client::CoinClient, rest_client::{Client, FaucetClient}, transaction_builder::TransactionBuilder, types::{chain_id::ChainId, transaction::EntryFunction, LocalAccount}}; -use clap::Parser; +use aptos_sdk::{coin_client::CoinClient, move_types::language_storage::StructTag, rest_client::{Client, FaucetClient}, transaction_builder::TransactionBuilder, types::{chain_id::ChainId, transaction::{EntryFunction, Script, TransactionArgument}, LocalAccount}}; +use clap::{Parser}; use once_cell::sync::Lazy; use url::Url; -use std::{str::FromStr, time::{SystemTime, UNIX_EPOCH}}; +use std::{fs, str::FromStr, time::{SystemTime, UNIX_EPOCH}}; use aptos_sdk::{ coin_client::CoinClient, crypto::{SigningKey, ValidCryptoMaterialStringExt}, @@ -114,21 +115,41 @@ impl Mint { .maptos_private_key .to_string(); - let create_dead_transaction = - core_resources_account.sign_with_transaction_builder(TransactionBuilder::new( - TransactionPayload::EntryFunction(EntryFunction::new( - ModuleId::new( - AccountAddress::from_hex_literal("0x1")?, - Identifier::new("aptos_account")?, - ), - Identifier::new("create_account")?, - vec![], - vec![bcs::to_bytes(&dead_address)?], - )), - SystemTime::now().duration_since(UNIX_EPOCH)?.as_secs() + 60, - ChainId::new(chain_id), - ).sequence_number(core_resources_account.sequence_number())); - + let compile_status = Command::new("movement") + .args([ + "move", + "compile", + "--package-dir", + "networks/movement/movement-full-node/ops/move-modules", + ]) + .status() + .await + .expect("Failed to execute `movement compile` command"); + + let code = fs::read("networks/movement/movement-full-node/ops/move-modules/burn_from.move")?; + + let args = vec![TransactionArgument::Address(dead_address), TransactionArgument::U64(1), TransactionArgument::U8Vector(StructTag { + address: AccountAddress::from_hex_literal("0x1")?, + module: Identifier::new("coin")?, + name: Identifier::new("BurnCapability")?, + type_args: vec![StructTag{ + address: AccountAddress::from_hex_literal("0x1")?, + module: Identifier::new("aptos_coin")?, + name: Identifier::new("AptosCoin")?, + type_args: vec![], + }.into()], + }.access_vector())]; + + let script_payload = TransactionPayload::Script(Script::new(code, vec![], args)); + + let tx_response = rest_client.submit_and_wait(&core_resources_account.sign_with_transaction_builder( + TransactionBuilder::new( + script_payload, + SystemTime::now().duration_since(UNIX_EPOCH)?.as_secs() + 60, + ChainId::new(chain_id), + ).sequence_number(core_resources_account.sequence_number()) + )).await?; + Ok(()) } } diff --git a/networks/movement/movement-full-node/src/admin/ops/move-modules/burn_from.move b/networks/movement/movement-full-node/src/admin/ops/move-modules/burn_from.move new file mode 100644 index 000000000..e7e4818d5 --- /dev/null +++ b/networks/movement/movement-full-node/src/admin/ops/move-modules/burn_from.move @@ -0,0 +1,12 @@ +script { + use aptos_framework::aptos_account; + use aptos_framework::aptos_governance; + use aptos_framework::coin; + use aptos_framework::coin::{BurnCapability}; + use aptos_framework::aptos_coin::AptosCoin; + + + fun burn_from(core_resources: &signer, account: address, amount: u64, burn_cap: &BurnCapability) { + coin::burn_from(account, amount, burn_cap); + } +} \ No newline at end of file From 93219376adb7cc79b8173ec53e1e6ebe8deeeaef Mon Sep 17 00:00:00 2001 From: Richard Melkonian Date: Tue, 28 Jan 2025 17:44:06 +0000 Subject: [PATCH 06/10] chore: add comment for reviewer --- .../movement-full-node/src/admin/ops/burn.rs | 158 ++++++++++++++++++ .../src/admin/ops/burn_from.rs | 0 .../movement-full-node/src/admin/ops/mint.rs | 150 +---------------- .../movement-full-node/src/admin/ops/mod.rs | 6 +- 4 files changed, 163 insertions(+), 151 deletions(-) create mode 100644 networks/movement/movement-full-node/src/admin/ops/burn.rs delete mode 100644 networks/movement/movement-full-node/src/admin/ops/burn_from.rs diff --git a/networks/movement/movement-full-node/src/admin/ops/burn.rs b/networks/movement/movement-full-node/src/admin/ops/burn.rs new file mode 100644 index 000000000..1a5d4aa25 --- /dev/null +++ b/networks/movement/movement-full-node/src/admin/ops/burn.rs @@ -0,0 +1,158 @@ +#[allow(unused_imports)] +use anyhow::Context; +use tokio::process::Command; +use crate::common_args::MovementArgs; +use aptos_sdk::{coin_client::CoinClient, move_types::language_storage::StructTag, rest_client::{Client, FaucetClient}, transaction_builder::TransactionBuilder, types::{chain_id::ChainId, transaction::{EntryFunction, Script, TransactionArgument}, LocalAccount}}; +use clap::Parser; +use once_cell::sync::Lazy; +use url::Url; +use std::{fs, str::FromStr, time::{SystemTime, UNIX_EPOCH}}; +use aptos_sdk::{ + coin_client::CoinClient, + crypto::{SigningKey, ValidCryptoMaterialStringExt}, + move_types::{ + identifier::Identifier, + language_storage::{ModuleId, TypeTag}, + }, + rest_client::{Client, FaucetClient, Transaction}, + transaction_builder::TransactionFactory, + types::{account_address::AccountAddress, transaction::TransactionPayload}, +}; + +#[derive(Debug, Parser, Clone)] +#[clap(rename_all = "kebab-case", about = "Mints and locks tokens.")] +pub struct Burn { + #[clap(flatten)] + pub movement_args: MovementArgs, +} + +static SUZUKA_CONFIG: Lazy = Lazy::new(|| { + let dot_movement = dot_movement::DotMovement::try_from_env().unwrap(); + let config = dot_movement.try_get_config_from_json::().unwrap(); + config +}); + +// :!:>section_1c +static NODE_URL: Lazy = Lazy::new(|| { + let node_connection_address = SUZUKA_CONFIG + .execution_config + .maptos_config + .client + .maptos_rest_connection_hostname + .clone(); + let node_connection_port = SUZUKA_CONFIG + .execution_config + .maptos_config + .client + .maptos_rest_connection_port + .clone(); + + let node_connection_url = + format!("http://{}:{}", node_connection_address, node_connection_port); + + Url::from_str(node_connection_url.as_str()).unwrap() +}); + +static FAUCET_URL: Lazy = Lazy::new(|| { + let faucet_listen_address = SUZUKA_CONFIG + .execution_config + .maptos_config + .client + .maptos_faucet_rest_connection_hostname + .clone(); + let faucet_listen_port = SUZUKA_CONFIG + .execution_config + .maptos_config + .client + .maptos_faucet_rest_connection_port + .clone(); + + let faucet_listen_url = format!("http://{}:{}", faucet_listen_address, faucet_listen_port); + + Url::from_str(faucet_listen_url.as_str()).unwrap() +}); + +static MAPTOS_PRIVATE_KEY: Lazy = Lazy::new(|| { + let pk= SUZUKA_CONFIG + .execution_config + .maptos_config + .chain + .maptos_private_key + .clone(); + + Url::from_str(pk).unwrap() +}); + +const DEAD_ADDRESS: &str = "000000000000000000000000000000000000000000000000000000000000dead"; + +impl Burn { + + pub async fn execute(&self) -> Result<(), anyhow::Error> { + let rest_client = Client::new(NODE_URL.clone()); + let faucet_client = FaucetClient::new(FAUCET_URL.clone(), NODE_URL.clone()); + let coin_client = CoinClient::new(&rest_client); + let dead_address = AccountAddress::from_str(DEAD_ADDRESS)?; + let chain_id = rest_client + .get_index() + .await + .context("failed to get chain ID")? + .inner() + .chain_id; + + let mut core_resources_account: LocalAccount = LocalAccount::from_private_key( + MAPTOS_PRIVATE_KEY.clone().as_str(), + 0, + )?; + + tracing::info!("Created core resources account"); + tracing::debug!("core_resources_account address: {}", core_resources_account.address()); + + // Create account for transactions and gas collection + let private_key = SUZUKA_CONFIG + .execution_config + .maptos_config + .chain + .maptos_private_key + .to_string(); + + // I know that we shouldn't compile on cmd execution, but we can optimise this later. + let compile_status = Command::new("movement") + .args([ + "move", + "compile", + "--package-dir", + "networks/movement/movement-full-node/ops/move-modules", + ]) + .status() + .await + .expect("Failed to execute `movement compile` command"); + + let code = fs::read("networks/movement/movement-full-node/ops/move-modules/burn_from.move")?; + + let args = vec![TransactionArgument::Address(dead_address), TransactionArgument::U64(1), TransactionArgument::U8Vector(StructTag { + address: AccountAddress::from_hex_literal("0x1")?, + module: Identifier::new("coin")?, + name: Identifier::new("BurnCapability")?, + type_args: vec![StructTag{ + address: AccountAddress::from_hex_literal("0x1")?, + module: Identifier::new("aptos_coin")?, + name: Identifier::new("AptosCoin")?, + type_args: vec![], + }.into()], + }.access_vector())]; + + let script_payload = TransactionPayload::Script(Script::new(code, vec![], args)); + + let tx_response = rest_client.submit_and_wait(&core_resources_account.sign_with_transaction_builder( + TransactionBuilder::new( + script_payload, + SystemTime::now().duration_since(UNIX_EPOCH)?.as_secs() + 60, + ChainId::new(chain_id), + ).sequence_number(core_resources_account.sequence_number()) + )).await?; + + tracing::info!("Transaction submitted: {:?}", tx_response); + + Ok(()) + } +} diff --git a/networks/movement/movement-full-node/src/admin/ops/burn_from.rs b/networks/movement/movement-full-node/src/admin/ops/burn_from.rs deleted file mode 100644 index e69de29bb..000000000 diff --git a/networks/movement/movement-full-node/src/admin/ops/mint.rs b/networks/movement/movement-full-node/src/admin/ops/mint.rs index 6b9e55e7d..ab8efbc96 100644 --- a/networks/movement/movement-full-node/src/admin/ops/mint.rs +++ b/networks/movement/movement-full-node/src/admin/ops/mint.rs @@ -1,155 +1,9 @@ -#[allow(unused_imports)] -use anyhow::Context; -use tokio::process::Command; +use clap::Parser; use crate::common_args::MovementArgs; -use aptos_sdk::{coin_client::CoinClient, move_types::language_storage::StructTag, rest_client::{Client, FaucetClient}, transaction_builder::TransactionBuilder, types::{chain_id::ChainId, transaction::{EntryFunction, Script, TransactionArgument}, LocalAccount}}; -use clap::{Parser}; -use once_cell::sync::Lazy; -use url::Url; -use std::{fs, str::FromStr, time::{SystemTime, UNIX_EPOCH}}; -use aptos_sdk::{ - coin_client::CoinClient, - crypto::{SigningKey, ValidCryptoMaterialStringExt}, - move_types::{ - identifier::Identifier, - language_storage::{ModuleId, TypeTag}, - }, - rest_client::{Client, FaucetClient, Transaction}, - transaction_builder::TransactionFactory, - types::{account_address::AccountAddress, transaction::TransactionPayload}, -}; #[derive(Debug, Parser, Clone)] #[clap(rename_all = "kebab-case", about = "Mints and locks tokens.")] pub struct Mint { #[clap(flatten)] pub movement_args: MovementArgs, -} - -static SUZUKA_CONFIG: Lazy = Lazy::new(|| { - let dot_movement = dot_movement::DotMovement::try_from_env().unwrap(); - let config = dot_movement.try_get_config_from_json::().unwrap(); - config -}); - -// :!:>section_1c -static NODE_URL: Lazy = Lazy::new(|| { - let node_connection_address = SUZUKA_CONFIG - .execution_config - .maptos_config - .client - .maptos_rest_connection_hostname - .clone(); - let node_connection_port = SUZUKA_CONFIG - .execution_config - .maptos_config - .client - .maptos_rest_connection_port - .clone(); - - let node_connection_url = - format!("http://{}:{}", node_connection_address, node_connection_port); - - Url::from_str(node_connection_url.as_str()).unwrap() -}); - -static FAUCET_URL: Lazy = Lazy::new(|| { - let faucet_listen_address = SUZUKA_CONFIG - .execution_config - .maptos_config - .client - .maptos_faucet_rest_connection_hostname - .clone(); - let faucet_listen_port = SUZUKA_CONFIG - .execution_config - .maptos_config - .client - .maptos_faucet_rest_connection_port - .clone(); - - let faucet_listen_url = format!("http://{}:{}", faucet_listen_address, faucet_listen_port); - - Url::from_str(faucet_listen_url.as_str()).unwrap() -}); - -static MAPTOS_PRIVATE_KEY: Lazy = Lazy::new(|| { - let pk= SUZUKA_CONFIG - .execution_config - .maptos_config - .chain - .maptos_private_key - .clone(); - - Url::from_str(pk).unwrap() -}); - -const DEAD_ADDRESS: &str = "000000000000000000000000000000000000000000000000000000000000dead"; - -impl Mint { - - pub async fn execute(&self) -> Result<(), anyhow::Error> { - let rest_client = Client::new(NODE_URL.clone()); - let faucet_client = FaucetClient::new(FAUCET_URL.clone(), NODE_URL.clone()); - let coin_client = CoinClient::new(&rest_client); - let dead_address = AccountAddress::from_str(DEAD_ADDRESS)?; - let chain_id = rest_client - .get_index() - .await - .context("failed to get chain ID")? - .inner() - .chain_id; - - let mut core_resources_account: LocalAccount = LocalAccount::from_private_key( - MAPTOS_PRIVATE_KEY.clone().as_str(), - 0, - )?; - - tracing::info!("Created core resources account"); - tracing::debug!("core_resources_account address: {}", core_resources_account.address()); - - // Create account for transactions and gas collection - let private_key = SUZUKA_CONFIG - .execution_config - .maptos_config - .chain - .maptos_private_key - .to_string(); - - let compile_status = Command::new("movement") - .args([ - "move", - "compile", - "--package-dir", - "networks/movement/movement-full-node/ops/move-modules", - ]) - .status() - .await - .expect("Failed to execute `movement compile` command"); - - let code = fs::read("networks/movement/movement-full-node/ops/move-modules/burn_from.move")?; - - let args = vec![TransactionArgument::Address(dead_address), TransactionArgument::U64(1), TransactionArgument::U8Vector(StructTag { - address: AccountAddress::from_hex_literal("0x1")?, - module: Identifier::new("coin")?, - name: Identifier::new("BurnCapability")?, - type_args: vec![StructTag{ - address: AccountAddress::from_hex_literal("0x1")?, - module: Identifier::new("aptos_coin")?, - name: Identifier::new("AptosCoin")?, - type_args: vec![], - }.into()], - }.access_vector())]; - - let script_payload = TransactionPayload::Script(Script::new(code, vec![], args)); - - let tx_response = rest_client.submit_and_wait(&core_resources_account.sign_with_transaction_builder( - TransactionBuilder::new( - script_payload, - SystemTime::now().duration_since(UNIX_EPOCH)?.as_secs() + 60, - ChainId::new(chain_id), - ).sequence_number(core_resources_account.sequence_number()) - )).await?; - - Ok(()) - } -} +} \ No newline at end of file diff --git a/networks/movement/movement-full-node/src/admin/ops/mod.rs b/networks/movement/movement-full-node/src/admin/ops/mod.rs index c5f8ce4bb..8809285c2 100644 --- a/networks/movement/movement-full-node/src/admin/ops/mod.rs +++ b/networks/movement/movement-full-node/src/admin/ops/mod.rs @@ -1,5 +1,5 @@ -pub mod burn_from; pub mod mint; +pub mod burn; use clap::Subcommand; @@ -7,14 +7,14 @@ use clap::Subcommand; #[clap(rename_all = "kebab-case", about = "Commands for bespoke network operations")] pub enum Ops { Mint(mint::Mint), - BurnFrom(burn_from::BurnFrom), + Burn(burn::Burn), } impl Ops { pub async fn execute(&self) -> Result<(), anyhow::Error> { match self { Ops::Mint(mint) => mint.execute().await, - Ops::BurnFrom(burn_from) => burn_from.execute().await, + Ops::Burn(burm) => burn.execute().await, } } } From ca3ad11ddafee8c29de2bbbcf3059c045d33b2a5 Mon Sep 17 00:00:00 2001 From: Richard Melkonian Date: Tue, 28 Jan 2025 17:44:27 +0000 Subject: [PATCH 07/10] fix: typo --- networks/movement/movement-full-node/src/admin/ops/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/networks/movement/movement-full-node/src/admin/ops/mod.rs b/networks/movement/movement-full-node/src/admin/ops/mod.rs index 8809285c2..3325f8368 100644 --- a/networks/movement/movement-full-node/src/admin/ops/mod.rs +++ b/networks/movement/movement-full-node/src/admin/ops/mod.rs @@ -14,7 +14,7 @@ impl Ops { pub async fn execute(&self) -> Result<(), anyhow::Error> { match self { Ops::Mint(mint) => mint.execute().await, - Ops::Burn(burm) => burn.execute().await, + Ops::Burn(burn) => burn.execute().await, } } } From d9f682d1e79ca8366537eeb2279695d6ebce6f9f Mon Sep 17 00:00:00 2001 From: Richard Melkonian Date: Wed, 29 Jan 2025 13:53:31 +0000 Subject: [PATCH 08/10] important feat: add emoji to CLI helper output --- .../movement-full-node/src/admin/ops/burn.rs | 15 ++++++--------- .../movement-full-node/src/admin/ops/mint.rs | 12 ++++++++++-- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/networks/movement/movement-full-node/src/admin/ops/burn.rs b/networks/movement/movement-full-node/src/admin/ops/burn.rs index 1a5d4aa25..45c90d1e0 100644 --- a/networks/movement/movement-full-node/src/admin/ops/burn.rs +++ b/networks/movement/movement-full-node/src/admin/ops/burn.rs @@ -8,19 +8,16 @@ use once_cell::sync::Lazy; use url::Url; use std::{fs, str::FromStr, time::{SystemTime, UNIX_EPOCH}}; use aptos_sdk::{ - coin_client::CoinClient, - crypto::{SigningKey, ValidCryptoMaterialStringExt}, move_types::{ identifier::Identifier, language_storage::{ModuleId, TypeTag}, }, - rest_client::{Client, FaucetClient, Transaction}, - transaction_builder::TransactionFactory, + types::{account_address::AccountAddress, transaction::TransactionPayload}, }; #[derive(Debug, Parser, Clone)] -#[clap(rename_all = "kebab-case", about = "Mints and locks tokens.")] +#[clap(rename_all = "kebab-case", about = "Burns tokens 🔥.")] pub struct Burn { #[clap(flatten)] pub movement_args: MovementArgs, @@ -99,10 +96,10 @@ impl Burn { .inner() .chain_id; - let mut core_resources_account: LocalAccount = LocalAccount::from_private_key( - MAPTOS_PRIVATE_KEY.clone().as_str(), - 0, - )?; + let mut core_resources_account: LocalAccount = LocalAccount::from_private_key( + MAPTOS_PRIVATE_KEY.clone().as_str(), + 0, + )?; tracing::info!("Created core resources account"); tracing::debug!("core_resources_account address: {}", core_resources_account.address()); diff --git a/networks/movement/movement-full-node/src/admin/ops/mint.rs b/networks/movement/movement-full-node/src/admin/ops/mint.rs index ab8efbc96..1f8dcc097 100644 --- a/networks/movement/movement-full-node/src/admin/ops/mint.rs +++ b/networks/movement/movement-full-node/src/admin/ops/mint.rs @@ -1,9 +1,17 @@ -use clap::Parser; use crate::common_args::MovementArgs; +use clap::Parser; #[derive(Debug, Parser, Clone)] #[clap(rename_all = "kebab-case", about = "Mints and locks tokens.")] pub struct Mint { #[clap(flatten)] pub movement_args: MovementArgs, -} \ No newline at end of file +} + +#[derive(Debug, Parser, Clone)] +#[clap(rename_all = "kebab-case", about = "Mints tokens 🌿.")] +impl Mint { + pub async fn execute(&self) -> Result<(), anyhow::Error> { + + } +} From d9d3f6bd0617efd987b940b5cb0ee2d2c1adf95b Mon Sep 17 00:00:00 2001 From: Richard Melkonian Date: Wed, 29 Jan 2025 15:27:48 +0000 Subject: [PATCH 09/10] add basic mint ops and structure --- Cargo.lock | 1 + .../movement-full-node/src/admin/ops/burn.rs | 42 ++--- .../movement-full-node/src/admin/ops/mint.rs | 160 +++++++++++++++++- .../execution/maptos/util/Cargo.toml | 1 + 4 files changed, 181 insertions(+), 23 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d9b93b99a..f9916547f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -9043,6 +9043,7 @@ dependencies = [ "aptos-crypto", "aptos-sdk", "aptos-types", + "buildtime-helpers", "godfig", "hex", "movement-da-util", diff --git a/networks/movement/movement-full-node/src/admin/ops/burn.rs b/networks/movement/movement-full-node/src/admin/ops/burn.rs index 45c90d1e0..ed2f50f4e 100644 --- a/networks/movement/movement-full-node/src/admin/ops/burn.rs +++ b/networks/movement/movement-full-node/src/admin/ops/burn.rs @@ -2,7 +2,7 @@ use anyhow::Context; use tokio::process::Command; use crate::common_args::MovementArgs; -use aptos_sdk::{coin_client::CoinClient, move_types::language_storage::StructTag, rest_client::{Client, FaucetClient}, transaction_builder::TransactionBuilder, types::{chain_id::ChainId, transaction::{EntryFunction, Script, TransactionArgument}, LocalAccount}}; +use aptos_sdk::{coin_client::CoinClient, crypto::ed25519::{PrivateKey, Ed25519PrivateKey}, move_types::language_storage::StructTag, rest_client::{Client, FaucetClient}, transaction_builder::TransactionBuilder, types::{chain_id::ChainId, transaction::{EntryFunction, Script, TransactionArgument}, LocalAccount}}; use clap::Parser; use once_cell::sync::Lazy; use url::Url; @@ -16,12 +16,7 @@ use aptos_sdk::{ types::{account_address::AccountAddress, transaction::TransactionPayload}, }; -#[derive(Debug, Parser, Clone)] -#[clap(rename_all = "kebab-case", about = "Burns tokens 🔥.")] -pub struct Burn { - #[clap(flatten)] - pub movement_args: MovementArgs, -} + static SUZUKA_CONFIG: Lazy = Lazy::new(|| { let dot_movement = dot_movement::DotMovement::try_from_env().unwrap(); @@ -69,7 +64,7 @@ static FAUCET_URL: Lazy = Lazy::new(|| { Url::from_str(faucet_listen_url.as_str()).unwrap() }); -static MAPTOS_PRIVATE_KEY: Lazy = Lazy::new(|| { +static MAPTOS_PRIVATE_KEY: Lazy = Lazy::new(|| { let pk= SUZUKA_CONFIG .execution_config .maptos_config @@ -77,17 +72,22 @@ static MAPTOS_PRIVATE_KEY: Lazy = Lazy::new(|| { .maptos_private_key .clone(); - Url::from_str(pk).unwrap() + pk }); const DEAD_ADDRESS: &str = "000000000000000000000000000000000000000000000000000000000000dead"; +#[derive(Debug, Parser, Clone)] +#[clap(rename_all = "kebab-case", about = "Burns tokens 🔥.")] +pub struct Burn { + #[clap(flatten)] + pub movement_args: MovementArgs, +} + impl Burn { pub async fn execute(&self) -> Result<(), anyhow::Error> { let rest_client = Client::new(NODE_URL.clone()); - let faucet_client = FaucetClient::new(FAUCET_URL.clone(), NODE_URL.clone()); - let coin_client = CoinClient::new(&rest_client); let dead_address = AccountAddress::from_str(DEAD_ADDRESS)?; let chain_id = rest_client .get_index() @@ -96,15 +96,7 @@ impl Burn { .inner() .chain_id; - let mut core_resources_account: LocalAccount = LocalAccount::from_private_key( - MAPTOS_PRIVATE_KEY.clone().as_str(), - 0, - )?; - tracing::info!("Created core resources account"); - tracing::debug!("core_resources_account address: {}", core_resources_account.address()); - - // Create account for transactions and gas collection let private_key = SUZUKA_CONFIG .execution_config .maptos_config @@ -112,8 +104,18 @@ impl Burn { .maptos_private_key .to_string(); + let core_resources_account: LocalAccount = LocalAccount::from_private_key( + &private_key.clone(), + 0, + )?; + + tracing::info!("Created core resources account"); + tracing::debug!("core_resources_account address: {}", core_resources_account.address()); + + // Create account for transactions and gas collection + // I know that we shouldn't compile on cmd execution, but we can optimise this later. - let compile_status = Command::new("movement") + let _compile_status = Command::new("movement") .args([ "move", "compile", diff --git a/networks/movement/movement-full-node/src/admin/ops/mint.rs b/networks/movement/movement-full-node/src/admin/ops/mint.rs index 1f8dcc097..13d12a0a9 100644 --- a/networks/movement/movement-full-node/src/admin/ops/mint.rs +++ b/networks/movement/movement-full-node/src/admin/ops/mint.rs @@ -1,5 +1,80 @@ +#[allow(unused_imports)] +use buildtime_helpers::cargo::cargo_workspace; +use anyhow::Context; +use tokio::process::Command; use crate::common_args::MovementArgs; +use aptos_sdk::{coin_client::CoinClient, move_types::language_storage::StructTag, rest_client::{Client, FaucetClient}, transaction_builder::TransactionBuilder, types::{chain_id::ChainId, transaction::{EntryFunction, Script, TransactionArgument}, LocalAccount}}; use clap::Parser; +use once_cell::sync::Lazy; +use url::Url; +use std::{fs, path::PathBuf, str::FromStr, time::{SystemTime, UNIX_EPOCH}}; +use aptos_sdk::{ + move_types::{ + identifier::Identifier, + language_storage::{ModuleId, TypeTag}, + }, + + types::{account_address::AccountAddress, transaction::TransactionPayload}, +}; +use crate::common_args::MovementArgs; +use clap::Parser; + +static SUZUKA_CONFIG: Lazy = Lazy::new(|| { + let dot_movement = dot_movement::DotMovement::try_from_env().unwrap(); + let config = dot_movement.try_get_config_from_json::().unwrap(); + config +}); + +// :!:>section_1c +static NODE_URL: Lazy = Lazy::new(|| { + let node_connection_address = SUZUKA_CONFIG + .execution_config + .maptos_config + .client + .maptos_rest_connection_hostname + .clone(); + let node_connection_port = SUZUKA_CONFIG + .execution_config + .maptos_config + .client + .maptos_rest_connection_port + .clone(); + + let node_connection_url = + format!("http://{}:{}", node_connection_address, node_connection_port); + + Url::from_str(node_connection_url.as_str()).unwrap() +}); + +static FAUCET_URL: Lazy = Lazy::new(|| { + let faucet_listen_address = SUZUKA_CONFIG + .execution_config + .maptos_config + .client + .maptos_faucet_rest_connection_hostname + .clone(); + let faucet_listen_port = SUZUKA_CONFIG + .execution_config + .maptos_config + .client + .maptos_faucet_rest_connection_port + .clone(); + + let faucet_listen_url = format!("http://{}:{}", faucet_listen_address, faucet_listen_port); + + Url::from_str(faucet_listen_url.as_str()).unwrap() +}); + +static MAPTOS_PRIVATE_KEY: Lazy = Lazy::new(|| { + let pk= SUZUKA_CONFIG + .execution_config + .maptos_config + .chain + .maptos_private_key + .clone(); + + Url::from_str(pk).unwrap() +}); #[derive(Debug, Parser, Clone)] #[clap(rename_all = "kebab-case", about = "Mints and locks tokens.")] @@ -8,10 +83,89 @@ pub struct Mint { pub movement_args: MovementArgs, } -#[derive(Debug, Parser, Clone)] -#[clap(rename_all = "kebab-case", about = "Mints tokens 🌿.")] impl Mint { pub async fn execute(&self) -> Result<(), anyhow::Error> { - + let rest_client = Client::new(NODE_URL.clone()); + let faucet_client = FaucetClient::new(FAUCET_URL.clone(), NODE_URL.clone()); + let coin_client = CoinClient::new(&rest_client); + let chain_id = rest_client + .get_index() + .await + .context("failed to get chain ID")? + .inner() + .chain_id; + + let mut core_resources_account: LocalAccount = LocalAccount::from_private_key( + MAPTOS_PRIVATE_KEY.clone().as_str(), + 0, + )?; + + tracing::debug!("coreresources_account address: {}", core_resources_account.address()); + + tracing::info!( + "Core account balance: {}, Dead account balance: {}", + core_balance, + ); + + let _ = Command::new("movement") + .args(["move", "compile", "--package-dir", "protocol-units/bridge/move-modules"]) + .status() + .await + + let root: PathBuf= cargo_workspace()?; + let additional_path = + "protocol-units/bridge/move-modules/build/bridge-modules/bytecode_scripts/"; + let combined_path = root.join(additional_path); + + let enable_bridge_code = fs::read(combined_path.join("enable_bridge_feature.mv"))?; + let enable_bridge_script_payload = + TransactionPayload::Script(Script::new(enable_bridge_code, vec![], vec![])); + + let enable_bridge_script_transaction = + transaction_test_helpers::get_test_signed_transaction_with_chain_id( + associate_address, + core_resources_account.sequence_number(), + &core_resources_account.private_key(), + core_resources_account.public_key().clone(), + Some(enable_bridge_script_payload), + SystemTime::now().duration_since(UNIX_EPOCH)?.as_secs() + 60, + 100, + None, + ChainId::new(chain_id), + ); + + rest_client + .submit_and_wait(&enable_bridge_script_transaction) + .await + .context("Failed to enable bridge script transaction")?; + + core_resources_account.increment_sequence_number(); + + let store_mint_burn_caps_code = fs::read(combined_path.join("store_mint_burn_caps.mv"))?; + let store_mint_burn_caps_script_payload = + TransactionPayload::Script(Script::new(store_mint_burn_caps_code, vec![], vec![])); + + let store_mint_burn_caps_script_transaction = + transaction_test_helpers::get_test_signed_transaction_with_chain_id( + associate_address, + core_resources_account.sequence_number(), + &core_resources_account.private_key(), + core_resources_account.public_key().clone(), + Some(store_mint_burn_caps_script_payload), + SystemTime::now().duration_since(UNIX_EPOCH)?.as_secs() + 60, + 100, + None, + ChainId::new(chain_id), + ); + + rest_client + .submit_and_wait(&store_mint_burn_caps_script_transaction) + .await + .context("Failed to store_mint_burn_caps script transaction")?; + core_resources_account.increment_sequence_number(); + + tracing::info!("Bridge feature enabled and mint burn caps stored"); + + Ok(()) } } diff --git a/protocol-units/execution/maptos/util/Cargo.toml b/protocol-units/execution/maptos/util/Cargo.toml index d6b01bddc..b69127dd6 100644 --- a/protocol-units/execution/maptos/util/Cargo.toml +++ b/protocol-units/execution/maptos/util/Cargo.toml @@ -18,6 +18,7 @@ aptos-account-whitelist = { workspace = true } movement-da-util = { workspace = true } anyhow = { workspace = true } aptos-crypto = { workspace = true, features = ["cloneable-private-keys"] } +buildtime-helpers = { workspace = true } rand = { workspace = true } tempfile = { workspace = true } serde_json = { workspace = true } From 13d27c8cd4457e15f48f672259ccb18591fceab5 Mon Sep 17 00:00:00 2001 From: Richard Melkonian Date: Wed, 29 Jan 2025 19:12:49 +0000 Subject: [PATCH 10/10] fix: build --- Cargo.lock | 371 +++++++++--------- Cargo.toml | 64 +-- .../movement/movement-full-node/Cargo.toml | 2 + .../movement-full-node/src/admin/ops/burn.rs | 133 +++---- .../movement-full-node/src/admin/ops/mint.rs | 52 +-- 5 files changed, 302 insertions(+), 320 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f9916547f..be6a56611 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -11,7 +11,7 @@ checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3" [[package]] name = "abstract-domain-derive" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "proc-macro2", "quote", @@ -829,7 +829,7 @@ checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775" [[package]] name = "aptos-abstract-gas-usage" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "anyhow", "aptos-gas-algebra", @@ -853,7 +853,7 @@ dependencies = [ [[package]] name = "aptos-accumulator" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "anyhow", "aptos-crypto", @@ -863,11 +863,11 @@ dependencies = [ [[package]] name = "aptos-aggregator" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "aptos-logger", "aptos-types", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "claims", "move-binary-format", "move-core-types", @@ -877,7 +877,7 @@ dependencies = [ [[package]] name = "aptos-api" version = "0.2.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "anyhow", "aptos-api-types", @@ -895,7 +895,7 @@ dependencies = [ "aptos-types", "aptos-vm", "async-trait", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "bytes 1.8.0", "fail", "futures", @@ -919,7 +919,7 @@ dependencies = [ [[package]] name = "aptos-api-types" version = "0.0.1" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "anyhow", "aptos-config", @@ -932,7 +932,7 @@ dependencies = [ "aptos-types", "aptos-vm", "async-trait", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "bytes 1.8.0", "hex", "indoc", @@ -949,7 +949,7 @@ dependencies = [ [[package]] name = "aptos-bcs-utils" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "anyhow", "hex", @@ -958,7 +958,7 @@ dependencies = [ [[package]] name = "aptos-bitvec" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "serde", "serde_bytes", @@ -967,7 +967,7 @@ dependencies = [ [[package]] name = "aptos-block-executor" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "anyhow", "aptos-aggregator", @@ -980,7 +980,7 @@ dependencies = [ "aptos-vm-logging", "aptos-vm-types", "arc-swap", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "bytes 1.8.0", "claims", "concurrent-queue", @@ -1002,13 +1002,13 @@ dependencies = [ [[package]] name = "aptos-block-partitioner" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "aptos-crypto", "aptos-logger", "aptos-metrics-core", "aptos-types", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "clap 4.5.21", "dashmap 5.5.3", "itertools 0.12.1", @@ -1023,7 +1023,7 @@ dependencies = [ [[package]] name = "aptos-bounded-executor" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "futures", "rustversion", @@ -1033,7 +1033,7 @@ dependencies = [ [[package]] name = "aptos-build-info" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "shadow-rs", ] @@ -1041,13 +1041,13 @@ dependencies = [ [[package]] name = "aptos-cached-packages" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "anyhow", "aptos-framework", "aptos-package-builder", "aptos-types", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "move-core-types", "once_cell", ] @@ -1055,7 +1055,7 @@ dependencies = [ [[package]] name = "aptos-channels" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "anyhow", "aptos-infallible", @@ -1066,7 +1066,7 @@ dependencies = [ [[package]] name = "aptos-compression" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "aptos-logger", "aptos-metrics-core", @@ -1078,7 +1078,7 @@ dependencies = [ [[package]] name = "aptos-config" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "anyhow", "aptos-crypto", @@ -1089,7 +1089,7 @@ dependencies = [ "aptos-temppath", "aptos-types", "arr_macro", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "byteorder", "cfg-if", "get_if_addrs", @@ -1109,7 +1109,7 @@ dependencies = [ [[package]] name = "aptos-consensus-types" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "anyhow", "aptos-bitvec", @@ -1120,7 +1120,7 @@ dependencies = [ "aptos-logger", "aptos-short-hex-str", "aptos-types", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "fail", "futures", "itertools 0.12.1", @@ -1136,7 +1136,7 @@ dependencies = [ [[package]] name = "aptos-crypto" version = "0.0.3" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "aes-gcm", "anyhow", @@ -1147,7 +1147,7 @@ dependencies = [ "ark-groth16", "ark-std 0.4.0", "base64 0.13.1", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "blst", "bulletproofs", "bytes 1.8.0", @@ -1189,7 +1189,7 @@ dependencies = [ [[package]] name = "aptos-crypto-derive" version = "0.0.3" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "proc-macro2", "quote", @@ -1199,7 +1199,7 @@ dependencies = [ [[package]] name = "aptos-db" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "anyhow", "aptos-accumulator", @@ -1224,7 +1224,7 @@ dependencies = [ "aptos-types", "arc-swap", "arr_macro", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "byteorder", "claims", "dashmap 5.5.3", @@ -1247,7 +1247,7 @@ dependencies = [ [[package]] name = "aptos-db-indexer" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "anyhow", "aptos-config", @@ -1258,7 +1258,7 @@ dependencies = [ "aptos-schemadb", "aptos-storage-interface", "aptos-types", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "bytes 1.8.0", "dashmap 5.5.3", "move-core-types", @@ -1267,13 +1267,13 @@ dependencies = [ [[package]] name = "aptos-db-indexer-schemas" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "anyhow", "aptos-schemadb", "aptos-storage-interface", "aptos-types", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "byteorder", "serde", ] @@ -1281,12 +1281,12 @@ dependencies = [ [[package]] name = "aptos-dkg" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "anyhow", "aptos-crypto", "aptos-crypto-derive", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "blst", "blstrs", "criterion", @@ -1312,7 +1312,7 @@ dependencies = [ [[package]] name = "aptos-drop-helper" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "aptos-infallible", "aptos-metrics-core", @@ -1323,7 +1323,7 @@ dependencies = [ [[package]] name = "aptos-event-notifications" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "anyhow", "aptos-channels", @@ -1339,7 +1339,7 @@ dependencies = [ [[package]] name = "aptos-executor" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "anyhow", "aptos-consensus-types", @@ -1357,7 +1357,7 @@ dependencies = [ "aptos-types", "aptos-vm", "arr_macro", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "bytes 1.8.0", "dashmap 5.5.3", "fail", @@ -1371,7 +1371,7 @@ dependencies = [ [[package]] name = "aptos-executor-service" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "aptos-block-partitioner", "aptos-config", @@ -1385,7 +1385,7 @@ dependencies = [ "aptos-storage-interface", "aptos-types", "aptos-vm", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "clap 4.5.21", "crossbeam-channel", "ctrlc", @@ -1401,7 +1401,7 @@ dependencies = [ [[package]] name = "aptos-executor-test-helpers" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "anyhow", "aptos-cached-packages", @@ -1423,7 +1423,7 @@ dependencies = [ [[package]] name = "aptos-executor-types" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "anyhow", "aptos-crypto", @@ -1432,7 +1432,7 @@ dependencies = [ "aptos-secure-net", "aptos-storage-interface", "aptos-types", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "criterion", "itertools 0.12.1", "once_cell", @@ -1443,7 +1443,7 @@ dependencies = [ [[package]] name = "aptos-experimental-runtimes" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "aptos-runtimes", "core_affinity", @@ -1456,7 +1456,7 @@ dependencies = [ [[package]] name = "aptos-faucet-core" version = "2.0.1" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "anyhow", "aptos-config", @@ -1490,7 +1490,7 @@ dependencies = [ [[package]] name = "aptos-faucet-metrics-server" version = "2.0.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "anyhow", "aptos-logger", @@ -1504,7 +1504,7 @@ dependencies = [ [[package]] name = "aptos-framework" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "anyhow", "aptos-aggregator", @@ -1522,7 +1522,7 @@ dependencies = [ "ark-ff 0.4.2", "ark-serialize 0.4.2", "ark-std 0.4.0", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "better_any", "blake2-rfc", "bulletproofs", @@ -1572,7 +1572,7 @@ dependencies = [ [[package]] name = "aptos-gas-algebra" version = "0.0.1" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "either", "move-core-types", @@ -1581,7 +1581,7 @@ dependencies = [ [[package]] name = "aptos-gas-meter" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "aptos-gas-algebra", "aptos-gas-schedule", @@ -1596,7 +1596,7 @@ dependencies = [ [[package]] name = "aptos-gas-profiling" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "anyhow", "aptos-gas-algebra", @@ -1616,7 +1616,7 @@ dependencies = [ [[package]] name = "aptos-gas-schedule" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "aptos-gas-algebra", "aptos-global-constants", @@ -1629,17 +1629,17 @@ dependencies = [ [[package]] name = "aptos-global-constants" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" [[package]] name = "aptos-id-generator" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" [[package]] name = "aptos-indexer" version = "0.0.1" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "anyhow", "aptos-api", @@ -1653,7 +1653,7 @@ dependencies = [ "aptos-storage-interface", "aptos-types", "async-trait", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "bigdecimal", "chrono", "diesel", @@ -1671,7 +1671,7 @@ dependencies = [ [[package]] name = "aptos-indexer-grpc-fullnode" version = "1.0.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "anyhow", "aptos-api", @@ -1682,12 +1682,12 @@ dependencies = [ "aptos-logger", "aptos-mempool", "aptos-metrics-core", - "aptos-moving-average 0.1.0 (git+https://github.com/movementlabsxyz/aptos-indexer-processors)", - "aptos-protos 1.3.0 (git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41)", + "aptos-moving-average 0.1.0 (git+https://github.com/movementlabsxyz/aptos-indexer-processors?rev=77a36245400250e7d8a854360194288d078681bc)", + "aptos-protos 1.3.0 (git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4)", "aptos-runtimes", "aptos-storage-interface", "aptos-types", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "bytes 1.8.0", "chrono", "futures", @@ -1709,7 +1709,7 @@ dependencies = [ [[package]] name = "aptos-indexer-grpc-table-info" version = "1.0.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "anyhow", "aptos-api", @@ -1740,11 +1740,11 @@ dependencies = [ [[package]] name = "aptos-indexer-grpc-utils" version = "1.0.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "anyhow", "aptos-metrics-core", - "aptos-protos 1.3.0 (git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41)", + "aptos-protos 1.3.0 (git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4)", "async-trait", "backoff", "base64 0.13.1", @@ -1772,12 +1772,12 @@ dependencies = [ [[package]] name = "aptos-infallible" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" [[package]] name = "aptos-jellyfish-merkle" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "anyhow", "aptos-crypto", @@ -1789,7 +1789,7 @@ dependencies = [ "aptos-storage-interface", "aptos-types", "arr_macro", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "byteorder", "itertools 0.12.1", "num-derive", @@ -1805,7 +1805,7 @@ dependencies = [ [[package]] name = "aptos-keygen" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "aptos-crypto", "aptos-types", @@ -1815,7 +1815,7 @@ dependencies = [ [[package]] name = "aptos-language-e2e-tests" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "anyhow", "aptos-abstract-gas-usage", @@ -1836,7 +1836,7 @@ dependencies = [ "aptos-vm-genesis", "aptos-vm-logging", "aptos-vm-types", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "bytes 1.8.0", "goldenfile", "move-binary-format", @@ -1859,7 +1859,7 @@ dependencies = [ [[package]] name = "aptos-ledger" version = "0.2.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "aptos-crypto", "aptos-types", @@ -1872,7 +1872,7 @@ dependencies = [ [[package]] name = "aptos-log-derive" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "proc-macro2", "quote", @@ -1882,7 +1882,7 @@ dependencies = [ [[package]] name = "aptos-logger" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "aptos-infallible", "aptos-log-derive", @@ -1906,7 +1906,7 @@ dependencies = [ [[package]] name = "aptos-memory-usage-tracker" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "aptos-gas-algebra", "aptos-gas-meter", @@ -1919,7 +1919,7 @@ dependencies = [ [[package]] name = "aptos-mempool" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "anyhow", "aptos-bounded-executor", @@ -1941,7 +1941,7 @@ dependencies = [ "aptos-time-service", "aptos-types", "aptos-vm-validator", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "fail", "futures", "itertools 0.12.1", @@ -1959,7 +1959,7 @@ dependencies = [ [[package]] name = "aptos-mempool-notifications" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "aptos-types", "async-trait", @@ -1972,7 +1972,7 @@ dependencies = [ [[package]] name = "aptos-memsocket" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "aptos-infallible", "bytes 1.8.0", @@ -1983,7 +1983,7 @@ dependencies = [ [[package]] name = "aptos-metrics-core" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "anyhow", "prometheus", @@ -1992,7 +1992,7 @@ dependencies = [ [[package]] name = "aptos-move-stdlib" version = "0.1.1" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "aptos-gas-schedule", "aptos-native-interface", @@ -2015,7 +2015,7 @@ dependencies = [ [[package]] name = "aptos-moving-average" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-indexer-processors#a43b90b98bc5e8d79d37cc6058ed2cfa741c0997" +source = "git+https://github.com/movementlabsxyz/aptos-indexer-processors?rev=77a36245400250e7d8a854360194288d078681bc#77a36245400250e7d8a854360194288d078681bc" dependencies = [ "chrono", ] @@ -2023,7 +2023,7 @@ dependencies = [ [[package]] name = "aptos-mvhashmap" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "anyhow", "aptos-aggregator", @@ -2044,12 +2044,12 @@ dependencies = [ [[package]] name = "aptos-native-interface" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "aptos-gas-algebra", "aptos-gas-schedule", "aptos-types", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "bytes 1.8.0", "move-binary-format", "move-core-types", @@ -2061,7 +2061,7 @@ dependencies = [ [[package]] name = "aptos-netcore" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "aptos-memsocket", "aptos-proxy", @@ -2078,7 +2078,7 @@ dependencies = [ [[package]] name = "aptos-network" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "anyhow", "aptos-bitvec", @@ -2098,7 +2098,7 @@ dependencies = [ "aptos-types", "arc-swap", "async-trait", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "bytes 1.8.0", "futures", "futures-util", @@ -2123,7 +2123,7 @@ dependencies = [ [[package]] name = "aptos-node-identity" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "anyhow", "aptos-types", @@ -2134,7 +2134,7 @@ dependencies = [ [[package]] name = "aptos-node-resource-metrics" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "aptos-build-info", "aptos-infallible", @@ -2150,7 +2150,7 @@ dependencies = [ [[package]] name = "aptos-num-variants" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "proc-macro2", "quote", @@ -2160,7 +2160,7 @@ dependencies = [ [[package]] name = "aptos-openapi" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "async-trait", "percent-encoding", @@ -2173,7 +2173,7 @@ dependencies = [ [[package]] name = "aptos-package-builder" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "anyhow", "aptos-framework", @@ -2186,11 +2186,11 @@ dependencies = [ [[package]] name = "aptos-peer-monitoring-service-types" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "aptos-config", "aptos-types", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "serde", "thiserror 1.0.69", ] @@ -2211,7 +2211,7 @@ dependencies = [ [[package]] name = "aptos-proptest-helpers" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "crossbeam", "proptest", @@ -2233,7 +2233,7 @@ dependencies = [ [[package]] name = "aptos-protos" version = "1.3.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "futures-core", "pbjson", @@ -2245,7 +2245,7 @@ dependencies = [ [[package]] name = "aptos-proxy" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "ipnet", ] @@ -2253,7 +2253,7 @@ dependencies = [ [[package]] name = "aptos-push-metrics" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "aptos-logger", "aptos-metrics-core", @@ -2264,7 +2264,7 @@ dependencies = [ [[package]] name = "aptos-resource-viewer" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "anyhow", "aptos-types", @@ -2278,7 +2278,7 @@ dependencies = [ [[package]] name = "aptos-rest-client" version = "0.0.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "anyhow", "aptos-api-types", @@ -2286,7 +2286,7 @@ dependencies = [ "aptos-infallible", "aptos-logger", "aptos-types", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "bytes 1.8.0", "hex", "move-core-types", @@ -2301,7 +2301,7 @@ dependencies = [ [[package]] name = "aptos-rocksdb-options" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "aptos-config", "rocksdb", @@ -2310,7 +2310,7 @@ dependencies = [ [[package]] name = "aptos-runtimes" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "rayon", "tokio", @@ -2319,7 +2319,7 @@ dependencies = [ [[package]] name = "aptos-schemadb" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "anyhow", "aptos-infallible", @@ -2336,7 +2336,7 @@ dependencies = [ [[package]] name = "aptos-scratchpad" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "aptos-crypto", "aptos-drop-helper", @@ -2355,7 +2355,7 @@ dependencies = [ [[package]] name = "aptos-sdk" version = "0.0.3" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "anyhow", "aptos-cached-packages", @@ -2365,7 +2365,7 @@ dependencies = [ "aptos-rest-client", "aptos-types", "base64 0.13.1", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "ed25519-dalek-bip32", "hex", "move-core-types", @@ -2377,11 +2377,11 @@ dependencies = [ [[package]] name = "aptos-sdk-builder" version = "0.2.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "anyhow", "aptos-types", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "clap 4.5.21", "heck 0.4.1", "move-core-types", @@ -2395,12 +2395,12 @@ dependencies = [ [[package]] name = "aptos-secure-net" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "aptos-logger", "aptos-metrics-core", - "aptos-protos 1.3.0 (git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41)", - "bcs 0.1.4", + "aptos-protos 1.3.0 (git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4)", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "crossbeam-channel", "once_cell", "serde", @@ -2413,7 +2413,7 @@ dependencies = [ [[package]] name = "aptos-secure-storage" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "aptos-crypto", "aptos-infallible", @@ -2422,7 +2422,7 @@ dependencies = [ "aptos-time-service", "aptos-vault-client", "base64 0.13.1", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "chrono", "enum_dispatch", "rand 0.7.3", @@ -2434,7 +2434,7 @@ dependencies = [ [[package]] name = "aptos-short-hex-str" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "mirai-annotations", "serde", @@ -2445,7 +2445,7 @@ dependencies = [ [[package]] name = "aptos-speculative-state-helper" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "anyhow", "aptos-infallible", @@ -2456,7 +2456,7 @@ dependencies = [ [[package]] name = "aptos-storage-interface" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "anyhow", "aptos-crypto", @@ -2467,7 +2467,7 @@ dependencies = [ "aptos-secure-net", "aptos-types", "aptos-vm", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "crossbeam-channel", "dashmap 5.5.3", "move-core-types", @@ -2504,7 +2504,7 @@ dependencies = [ [[package]] name = "aptos-table-natives" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "aptos-gas-schedule", "aptos-native-interface", @@ -2522,7 +2522,7 @@ dependencies = [ [[package]] name = "aptos-temppath" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "hex", "rand 0.7.3", @@ -2531,7 +2531,7 @@ dependencies = [ [[package]] name = "aptos-time-service" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "aptos-infallible", "enum_dispatch", @@ -2544,7 +2544,7 @@ dependencies = [ [[package]] name = "aptos-types" version = "0.0.3" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "anyhow", "aptos-bitvec", @@ -2559,7 +2559,7 @@ dependencies = [ "ark-serialize 0.4.2", "arr_macro", "base64 0.13.1", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "bytes 1.8.0", "fixed", "fxhash", @@ -2601,12 +2601,12 @@ dependencies = [ [[package]] name = "aptos-utils" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" [[package]] name = "aptos-vault-client" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "aptos-crypto", "base64 0.13.1", @@ -2622,7 +2622,7 @@ dependencies = [ [[package]] name = "aptos-vm" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "anyhow", "aptos-aggregator", @@ -2649,7 +2649,7 @@ dependencies = [ "aptos-vm-types", "ark-bn254", "ark-groth16", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "bytes 1.8.0", "claims", "crossbeam-channel", @@ -2672,7 +2672,7 @@ dependencies = [ [[package]] name = "aptos-vm-genesis" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "aptos-cached-packages", "aptos-crypto", @@ -2680,7 +2680,7 @@ dependencies = [ "aptos-gas-schedule", "aptos-types", "aptos-vm", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "bytes 1.8.0", "move-core-types", "move-vm-runtime", @@ -2693,7 +2693,7 @@ dependencies = [ [[package]] name = "aptos-vm-logging" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "aptos-crypto", "aptos-logger", @@ -2708,14 +2708,14 @@ dependencies = [ [[package]] name = "aptos-vm-types" version = "0.0.1" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "anyhow", "aptos-aggregator", "aptos-gas-algebra", "aptos-gas-schedule", "aptos-types", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "bytes 1.8.0", "claims", "either", @@ -2730,7 +2730,7 @@ dependencies = [ [[package]] name = "aptos-vm-validator" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "anyhow", "aptos-logger", @@ -3821,6 +3821,15 @@ dependencies = [ "thiserror 1.0.69", ] +[[package]] +name = "bcs" +version = "0.1.6" +source = "git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c#bc16d2d39cabafaabd76173dd1b04b2aa170cf0c" +dependencies = [ + "serde", + "thiserror 1.0.69", +] + [[package]] name = "bech32" version = "0.11.0" @@ -9103,7 +9112,7 @@ dependencies = [ "aptos-language-e2e-tests", "aptos-logger", "aptos-mempool", - "aptos-protos 1.3.0 (git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41)", + "aptos-protos 1.3.0 (git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4)", "aptos-sdk", "aptos-storage-interface", "aptos-temppath", @@ -9480,10 +9489,10 @@ checksum = "1fafa6961cabd9c63bcd77a45d7e3b7f3b552b70417831fb0f56db717e72407e" [[package]] name = "move-abigen" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "anyhow", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "heck 0.4.1", "log", "move-binary-format", @@ -9497,7 +9506,7 @@ dependencies = [ [[package]] name = "move-binary-format" version = "0.0.3" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "anyhow", "backtrace", @@ -9512,15 +9521,15 @@ dependencies = [ [[package]] name = "move-borrow-graph" version = "0.0.1" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" [[package]] name = "move-bytecode-source-map" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "anyhow", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "move-binary-format", "move-command-line-common", "move-core-types", @@ -9532,7 +9541,7 @@ dependencies = [ [[package]] name = "move-bytecode-spec" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "once_cell", "quote", @@ -9542,7 +9551,7 @@ dependencies = [ [[package]] name = "move-bytecode-utils" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "anyhow", "move-binary-format", @@ -9554,7 +9563,7 @@ dependencies = [ [[package]] name = "move-bytecode-verifier" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "fail", "move-binary-format", @@ -9568,7 +9577,7 @@ dependencies = [ [[package]] name = "move-bytecode-viewer" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "anyhow", "clap 4.5.21", @@ -9583,7 +9592,7 @@ dependencies = [ [[package]] name = "move-cli" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "anyhow", "clap 4.5.21", @@ -9613,7 +9622,7 @@ dependencies = [ [[package]] name = "move-command-line-common" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "anyhow", "difference", @@ -9630,10 +9639,10 @@ dependencies = [ [[package]] name = "move-compiler" version = "0.0.1" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "anyhow", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "clap 4.5.21", "codespan-reporting", "hex", @@ -9656,11 +9665,11 @@ dependencies = [ [[package]] name = "move-compiler-v2" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "abstract-domain-derive", "anyhow", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "clap 4.5.21", "codespan-reporting", "ethnum", @@ -9687,11 +9696,11 @@ dependencies = [ [[package]] name = "move-core-types" version = "0.0.4" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "anyhow", "arbitrary", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "bytes 1.8.0", "ethnum", "hashbrown 0.14.5", @@ -9712,10 +9721,10 @@ dependencies = [ [[package]] name = "move-coverage" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "anyhow", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "clap 4.5.21", "codespan", "colored", @@ -9731,7 +9740,7 @@ dependencies = [ [[package]] name = "move-disassembler" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "anyhow", "clap 4.5.21", @@ -9748,7 +9757,7 @@ dependencies = [ [[package]] name = "move-docgen" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "anyhow", "clap 4.5.21", @@ -9767,7 +9776,7 @@ dependencies = [ [[package]] name = "move-errmapgen" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "anyhow", "move-command-line-common", @@ -9779,10 +9788,10 @@ dependencies = [ [[package]] name = "move-ir-compiler" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "anyhow", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "clap 4.5.21", "move-binary-format", "move-bytecode-source-map", @@ -9795,7 +9804,7 @@ dependencies = [ [[package]] name = "move-ir-to-bytecode" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "anyhow", "codespan-reporting", @@ -9813,7 +9822,7 @@ dependencies = [ [[package]] name = "move-ir-to-bytecode-syntax" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "anyhow", "hex", @@ -9826,7 +9835,7 @@ dependencies = [ [[package]] name = "move-ir-types" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "hex", "move-command-line-common", @@ -9839,7 +9848,7 @@ dependencies = [ [[package]] name = "move-model" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "anyhow", "codespan", @@ -9865,7 +9874,7 @@ dependencies = [ [[package]] name = "move-package" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "anyhow", "clap 4.5.21", @@ -9899,7 +9908,7 @@ dependencies = [ [[package]] name = "move-prover" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "anyhow", "atty", @@ -9926,7 +9935,7 @@ dependencies = [ [[package]] name = "move-prover-boogie-backend" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "anyhow", "async-trait", @@ -9955,7 +9964,7 @@ dependencies = [ [[package]] name = "move-prover-bytecode-pipeline" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "abstract-domain-derive", "anyhow", @@ -9972,7 +9981,7 @@ dependencies = [ [[package]] name = "move-resource-viewer" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "anyhow", "hex", @@ -9999,7 +10008,7 @@ dependencies = [ [[package]] name = "move-stackless-bytecode" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "abstract-domain-derive", "codespan-reporting", @@ -10018,7 +10027,7 @@ dependencies = [ [[package]] name = "move-stdlib" version = "0.1.1" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "anyhow", "hex", @@ -10041,7 +10050,7 @@ dependencies = [ [[package]] name = "move-symbol-pool" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "once_cell", "serde", @@ -10050,7 +10059,7 @@ dependencies = [ [[package]] name = "move-table-extension" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "better_any", "bytes 1.8.0", @@ -10065,7 +10074,7 @@ dependencies = [ [[package]] name = "move-unit-test" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "anyhow", "better_any", @@ -10093,7 +10102,7 @@ dependencies = [ [[package]] name = "move-vm-runtime" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "better_any", "bytes 1.8.0", @@ -10117,7 +10126,7 @@ dependencies = [ [[package]] name = "move-vm-test-utils" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ "anyhow", "bytes 1.8.0", @@ -10132,9 +10141,9 @@ dependencies = [ [[package]] name = "move-vm-types" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4#fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" dependencies = [ - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "derivative", "itertools 0.12.1", "move-binary-format", @@ -10224,7 +10233,7 @@ name = "movement-client" version = "0.0.2" dependencies = [ "anyhow", - "aptos-protos 1.3.0 (git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41)", + "aptos-protos 1.3.0 (git+https://github.com/movementlabsxyz/aptos-core?rev=fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4)", "aptos-sdk", "aptos-types", "async-trait", @@ -10537,8 +10546,10 @@ name = "movement-full-node" version = "0.0.2" dependencies = [ "anyhow", + "aptos-language-e2e-tests", "aptos-sdk", "bcs 0.1.4", + "buildtime-helpers", "clap 4.5.21", "console-subscriber", "dot-movement", @@ -13868,7 +13879,7 @@ name = "serde-generate" version = "0.20.6" source = "git+https://github.com/aptos-labs/serde-reflection?rev=73b6bbf748334b71ff6d7d09d06a29e3062ca075#73b6bbf748334b71ff6d7d09d06a29e3062ca075" dependencies = [ - "bcs 0.1.6", + "bcs 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "bincode", "heck 0.3.3", "include_dir", diff --git a/Cargo.toml b/Cargo.toml index f95f321a0..bd106f6ff 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -155,40 +155,40 @@ serde_yaml = "0.9.34" ## Aptos dependencies ### 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 = "9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" } -aptos-api-types = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" } -aptos-bitvec = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" } -aptos-block-executor = { git = "https://github.com/movementlabsxyz/aptos-core.git", rev = "9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" } -aptos-cached-packages = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" } -aptos-config = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" } -aptos-consensus-types = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" } -aptos-crypto = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "9dfc8e7a3d622597dfd81cc4ba480a5377f87a41", features = [ +aptos-api = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" } +aptos-api-types = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" } +aptos-bitvec = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" } +aptos-block-executor = { git = "https://github.com/movementlabsxyz/aptos-core.git", rev = "fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" } +aptos-cached-packages = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" } +aptos-config = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" } +aptos-consensus-types = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" } +aptos-crypto = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4", features = [ "cloneable-private-keys", ] } -aptos-db = { git = "https://github.com/movementlabsxyz/aptos-core.git", rev = "9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" } -aptos-executor = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" } -aptos-executor-test-helpers = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" } -aptos-executor-types = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" } -aptos-faucet-core = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" } -aptos-framework = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" } -aptos-language-e2e-tests = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" } -aptos-mempool = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" } -aptos-proptest-helpers = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" } -aptos-sdk = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" } -aptos-state-view = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" } -aptos-storage-interface = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" } -aptos-temppath = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" } -aptos-types = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" } -aptos-vm = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" } -aptos-vm-genesis = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" } -aptos-vm-logging = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" } -aptos-vm-validator = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" } -aptos-logger = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" } -aptos-vm-types = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" } -aptos-indexer = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" } -aptos-indexer-grpc-fullnode = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" } -aptos-indexer-grpc-table-info = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" } -aptos-protos = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" } +aptos-db = { git = "https://github.com/movementlabsxyz/aptos-core.git", rev = "fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" } +aptos-executor = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" } +aptos-executor-test-helpers = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" } +aptos-executor-types = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" } +aptos-faucet-core = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" } +aptos-framework = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" } +aptos-language-e2e-tests = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" } +aptos-mempool = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" } +aptos-proptest-helpers = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" } +aptos-sdk = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" } +aptos-state-view = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" } +aptos-storage-interface = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" } +aptos-temppath = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" } +aptos-types = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" } +aptos-vm = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" } +aptos-vm-genesis = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" } +aptos-vm-logging = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" } +aptos-vm-validator = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" } +aptos-logger = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" } +aptos-vm-types = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" } +aptos-indexer = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" } +aptos-indexer-grpc-fullnode = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" } +aptos-indexer-grpc-table-info = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" } +aptos-protos = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "fb1d8c5b884da9758813e59fa2a7b8d0d372ddc4" } # Indexer processor = { git = "https://github.com/movementlabsxyz/aptos-indexer-processors", rev = "7658338eb9224abd9698c1e02dbc6ca526c268ce" } diff --git a/networks/movement/movement-full-node/Cargo.toml b/networks/movement/movement-full-node/Cargo.toml index 980cf635c..5259169b9 100644 --- a/networks/movement/movement-full-node/Cargo.toml +++ b/networks/movement/movement-full-node/Cargo.toml @@ -12,6 +12,7 @@ rust-version = { workspace = true } # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] +buildtime-helpers = { workspace = true } anyhow = { workspace = true } aptos-sdk = { workspace = true } maptos-dof-execution = { workspace = true } @@ -21,6 +22,7 @@ movement-da-util = { workspace = true } mcr-settlement-client = { workspace = true, features = ["eth"] } mcr-settlement-manager = { workspace = true } serde_json = { workspace = true } +aptos-language-e2e-tests = { workspace = true } futures = { workspace = true } tokio = { workspace = true } once_cell = { workspace = true } diff --git a/networks/movement/movement-full-node/src/admin/ops/burn.rs b/networks/movement/movement-full-node/src/admin/ops/burn.rs index ed2f50f4e..49b074ab7 100644 --- a/networks/movement/movement-full-node/src/admin/ops/burn.rs +++ b/networks/movement/movement-full-node/src/admin/ops/burn.rs @@ -1,22 +1,29 @@ #[allow(unused_imports)] -use anyhow::Context; -use tokio::process::Command; use crate::common_args::MovementArgs; -use aptos_sdk::{coin_client::CoinClient, crypto::ed25519::{PrivateKey, Ed25519PrivateKey}, move_types::language_storage::StructTag, rest_client::{Client, FaucetClient}, transaction_builder::TransactionBuilder, types::{chain_id::ChainId, transaction::{EntryFunction, Script, TransactionArgument}, LocalAccount}}; -use clap::Parser; -use once_cell::sync::Lazy; -use url::Url; -use std::{fs, str::FromStr, time::{SystemTime, UNIX_EPOCH}}; +use anyhow::Context; use aptos_sdk::{ - move_types::{ - identifier::Identifier, - language_storage::{ModuleId, TypeTag}, + move_types::language_storage::StructTag, + move_types::identifier::Identifier, + rest_client::{Client}, + transaction_builder::TransactionBuilder, + types::{ + chain_id::ChainId, + transaction::{ Script, TransactionArgument}, + LocalAccount, }, - +}; +use aptos_sdk::{ types::{account_address::AccountAddress, transaction::TransactionPayload}, }; - - +use clap::Parser; +use once_cell::sync::Lazy; +use std::{ + fs, + str::FromStr, + time::{SystemTime, UNIX_EPOCH}, +}; +use tokio::process::Command; +use url::Url; static SUZUKA_CONFIG: Lazy = Lazy::new(|| { let dot_movement = dot_movement::DotMovement::try_from_env().unwrap(); @@ -45,36 +52,6 @@ static NODE_URL: Lazy = Lazy::new(|| { Url::from_str(node_connection_url.as_str()).unwrap() }); -static FAUCET_URL: Lazy = Lazy::new(|| { - let faucet_listen_address = SUZUKA_CONFIG - .execution_config - .maptos_config - .client - .maptos_faucet_rest_connection_hostname - .clone(); - let faucet_listen_port = SUZUKA_CONFIG - .execution_config - .maptos_config - .client - .maptos_faucet_rest_connection_port - .clone(); - - let faucet_listen_url = format!("http://{}:{}", faucet_listen_address, faucet_listen_port); - - Url::from_str(faucet_listen_url.as_str()).unwrap() -}); - -static MAPTOS_PRIVATE_KEY: Lazy = Lazy::new(|| { - let pk= SUZUKA_CONFIG - .execution_config - .maptos_config - .chain - .maptos_private_key - .clone(); - - pk -}); - const DEAD_ADDRESS: &str = "000000000000000000000000000000000000000000000000000000000000dead"; #[derive(Debug, Parser, Clone)] @@ -85,7 +62,6 @@ pub struct Burn { } impl Burn { - pub async fn execute(&self) -> Result<(), anyhow::Error> { let rest_client = Client::new(NODE_URL.clone()); let dead_address = AccountAddress::from_str(DEAD_ADDRESS)?; @@ -96,7 +72,6 @@ impl Burn { .inner() .chain_id; - let private_key = SUZUKA_CONFIG .execution_config .maptos_config @@ -104,17 +79,15 @@ impl Burn { .maptos_private_key .to_string(); - let core_resources_account: LocalAccount = LocalAccount::from_private_key( - &private_key.clone(), - 0, - )?; + let core_resources_account: LocalAccount = + LocalAccount::from_private_key(&private_key.clone(), 0)?; tracing::info!("Created core resources account"); tracing::debug!("core_resources_account address: {}", core_resources_account.address()); // Create account for transactions and gas collection - - // I know that we shouldn't compile on cmd execution, but we can optimise this later. + + // I know that we shouldn't compile on cmd execution, but we can optimise this later. let _compile_status = Command::new("movement") .args([ "move", @@ -126,32 +99,46 @@ impl Burn { .await .expect("Failed to execute `movement compile` command"); - let code = fs::read("networks/movement/movement-full-node/ops/move-modules/burn_from.move")?; - - let args = vec![TransactionArgument::Address(dead_address), TransactionArgument::U64(1), TransactionArgument::U8Vector(StructTag { - address: AccountAddress::from_hex_literal("0x1")?, - module: Identifier::new("coin")?, - name: Identifier::new("BurnCapability")?, - type_args: vec![StructTag{ - address: AccountAddress::from_hex_literal("0x1")?, - module: Identifier::new("aptos_coin")?, - name: Identifier::new("AptosCoin")?, - type_args: vec![], - }.into()], - }.access_vector())]; + let code = + fs::read("networks/movement/movement-full-node/ops/move-modules/burn_from.move")?; + + let args = vec![ + TransactionArgument::Address(dead_address), + TransactionArgument::U64(1), + TransactionArgument::U8Vector( + StructTag { + address: AccountAddress::from_hex_literal("0x1")?, + module: Identifier::new("coin")?, + name: Identifier::new("BurnCapability")?, + type_args: vec![StructTag { + address: AccountAddress::from_hex_literal("0x1")?, + module: Identifier::new("aptos_coin")?, + name: Identifier::new("AptosCoin")?, + type_args: vec![], + } + .into()], + } + .access_vector(), + ), + ]; let script_payload = TransactionPayload::Script(Script::new(code, vec![], args)); - - let tx_response = rest_client.submit_and_wait(&core_resources_account.sign_with_transaction_builder( - TransactionBuilder::new( - script_payload, - SystemTime::now().duration_since(UNIX_EPOCH)?.as_secs() + 60, - ChainId::new(chain_id), - ).sequence_number(core_resources_account.sequence_number()) - )).await?; + + let tx_response = rest_client + .submit_and_wait( + &core_resources_account.sign_with_transaction_builder( + TransactionBuilder::new( + script_payload, + SystemTime::now().duration_since(UNIX_EPOCH)?.as_secs() + 60, + ChainId::new(chain_id), + ) + .sequence_number(core_resources_account.sequence_number()), + ), + ) + .await?; tracing::info!("Transaction submitted: {:?}", tx_response); - + Ok(()) } } diff --git a/networks/movement/movement-full-node/src/admin/ops/mint.rs b/networks/movement/movement-full-node/src/admin/ops/mint.rs index 13d12a0a9..c86e04057 100644 --- a/networks/movement/movement-full-node/src/admin/ops/mint.rs +++ b/networks/movement/movement-full-node/src/admin/ops/mint.rs @@ -1,23 +1,16 @@ -#[allow(unused_imports)] use buildtime_helpers::cargo::cargo_workspace; use anyhow::Context; use tokio::process::Command; use crate::common_args::MovementArgs; -use aptos_sdk::{coin_client::CoinClient, move_types::language_storage::StructTag, rest_client::{Client, FaucetClient}, transaction_builder::TransactionBuilder, types::{chain_id::ChainId, transaction::{EntryFunction, Script, TransactionArgument}, LocalAccount}}; +use aptos_sdk::{ + coin_client::CoinClient, + rest_client::{Client, FaucetClient}, types::{chain_id::ChainId, test_helpers::transaction_test_helpers, transaction::Script, LocalAccount} +}; use clap::Parser; use once_cell::sync::Lazy; use url::Url; use std::{fs, path::PathBuf, str::FromStr, time::{SystemTime, UNIX_EPOCH}}; -use aptos_sdk::{ - move_types::{ - identifier::Identifier, - language_storage::{ModuleId, TypeTag}, - }, - - types::{account_address::AccountAddress, transaction::TransactionPayload}, -}; -use crate::common_args::MovementArgs; -use clap::Parser; +use aptos_sdk::types::transaction::TransactionPayload; static SUZUKA_CONFIG: Lazy = Lazy::new(|| { let dot_movement = dot_movement::DotMovement::try_from_env().unwrap(); @@ -65,17 +58,6 @@ static FAUCET_URL: Lazy = Lazy::new(|| { Url::from_str(faucet_listen_url.as_str()).unwrap() }); -static MAPTOS_PRIVATE_KEY: Lazy = Lazy::new(|| { - let pk= SUZUKA_CONFIG - .execution_config - .maptos_config - .chain - .maptos_private_key - .clone(); - - Url::from_str(pk).unwrap() -}); - #[derive(Debug, Parser, Clone)] #[clap(rename_all = "kebab-case", about = "Mints and locks tokens.")] pub struct Mint { @@ -95,22 +77,22 @@ impl Mint { .inner() .chain_id; - let mut core_resources_account: LocalAccount = LocalAccount::from_private_key( - MAPTOS_PRIVATE_KEY.clone().as_str(), - 0, - )?; + let private_key = SUZUKA_CONFIG + .execution_config + .maptos_config + .chain + .maptos_private_key + .to_string(); + + let core_resources_account: LocalAccount = + LocalAccount::from_private_key(&private_key.clone(), 0)?; tracing::debug!("coreresources_account address: {}", core_resources_account.address()); - tracing::info!( - "Core account balance: {}, Dead account balance: {}", - core_balance, - ); - let _ = Command::new("movement") .args(["move", "compile", "--package-dir", "protocol-units/bridge/move-modules"]) .status() - .await + .await?; let root: PathBuf= cargo_workspace()?; let additional_path = @@ -123,7 +105,7 @@ impl Mint { let enable_bridge_script_transaction = transaction_test_helpers::get_test_signed_transaction_with_chain_id( - associate_address, + core_resources_account.address(), core_resources_account.sequence_number(), &core_resources_account.private_key(), core_resources_account.public_key().clone(), @@ -147,7 +129,7 @@ impl Mint { let store_mint_burn_caps_script_transaction = transaction_test_helpers::get_test_signed_transaction_with_chain_id( - associate_address, + core_resources_account.address(), core_resources_account.sequence_number(), &core_resources_account.private_key(), core_resources_account.public_key().clone(),