Merge branch 'integrated-movement-cli' into dev

movementlabsxyz · Dec 2, 2023 · 8d93bbc · 8d93bbc
2 parents f9f536d + f5f8292
commit 8d93bbc
Show file tree

Hide file tree

Showing 195 changed files with 33,265 additions and 1,700 deletions.
diff --git a/m1/Cargo.toml b/m1/Cargo.toml
@@ -2,7 +2,7 @@
 resolver = "2"
 members = [
     "subnet",
-    "movement",
+    "m1-cli",
     "movement-benchmark",
     "tests/e2e"
 ]

diff --git a/m1/movement/CHANGELOG.md → m1/m1-cli/CHANGELOG.md b/m1/movement/CHANGELOG.md → m1/m1-cli/CHANGELOG.md
diff --git a/m1/movement/Cargo.toml → m1/m1-cli/Cargo.toml b/m1/movement/Cargo.toml → m1/m1-cli/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "movement"
+name = "m1-cli"
 description = "Movement tool for management of nodes and interacting with the blockchain. Based on the Movement CLI."
 version = "1.0.13"
 

diff --git a/m1/movement/README.md → m1/m1-cli/README.md b/m1/movement/README.md → m1/m1-cli/README.md
diff --git a/m1/movement/build.rs → m1/m1-cli/build.rs b/m1/movement/build.rs → m1/m1-cli/build.rs
diff --git a/m1/movement/debug-move-example/Move.toml → m1/m1-cli/debug-move-example/Move.toml b/m1/movement/debug-move-example/Move.toml → m1/m1-cli/debug-move-example/Move.toml
diff --git a/...debug-move-example/sources/DebugDemo.move → ...debug-move-example/sources/DebugDemo.move b/...debug-move-example/sources/DebugDemo.move → ...debug-move-example/sources/DebugDemo.move
diff --git a/m1/movement/e2e/README.md → m1/m1-cli/e2e/README.md b/m1/movement/e2e/README.md → m1/m1-cli/e2e/README.md
diff --git a/m1/movement/e2e/cases/__init__.py → m1/m1-cli/e2e/cases/__init__.py b/m1/movement/e2e/cases/__init__.py → m1/m1-cli/e2e/cases/__init__.py
diff --git a/m1/movement/e2e/cases/account.py → m1/m1-cli/e2e/cases/account.py b/m1/movement/e2e/cases/account.py → m1/m1-cli/e2e/cases/account.py
diff --git a/m1/movement/e2e/cases/init.py → m1/m1-cli/e2e/cases/init.py b/m1/movement/e2e/cases/init.py → m1/m1-cli/e2e/cases/init.py
diff --git a/m1/movement/e2e/common.py → m1/m1-cli/e2e/common.py b/m1/movement/e2e/common.py → m1/m1-cli/e2e/common.py
diff --git a/m1/movement/e2e/local_testnet.py → m1/m1-cli/e2e/local_testnet.py b/m1/movement/e2e/local_testnet.py → m1/m1-cli/e2e/local_testnet.py
diff --git a/m1/movement/e2e/main.py → m1/m1-cli/e2e/main.py b/m1/movement/e2e/main.py → m1/m1-cli/e2e/main.py
diff --git a/m1/movement/e2e/poetry.lock → m1/m1-cli/e2e/poetry.lock b/m1/movement/e2e/poetry.lock → m1/m1-cli/e2e/poetry.lock
diff --git a/m1/movement/e2e/pyproject.toml → m1/m1-cli/e2e/pyproject.toml b/m1/movement/e2e/pyproject.toml → m1/m1-cli/e2e/pyproject.toml
diff --git a/m1/movement/e2e/test_helpers.py → m1/m1-cli/e2e/test_helpers.py b/m1/movement/e2e/test_helpers.py → m1/m1-cli/e2e/test_helpers.py
diff --git a/m1/movement/e2e/test_results.py → m1/m1-cli/e2e/test_results.py b/m1/movement/e2e/test_results.py → m1/m1-cli/e2e/test_results.py
diff --git a/m1/movement/homebrew/README.md → m1/m1-cli/homebrew/README.md b/m1/movement/homebrew/README.md → m1/m1-cli/homebrew/README.md
diff --git a/m1/movement/homebrew/aptos.rb → m1/m1-cli/homebrew/aptos.rb b/m1/movement/homebrew/aptos.rb → m1/m1-cli/homebrew/aptos.rb
diff --git a/m1/movement/src/account/create.rs → m1/m1-cli/src/account/create.rs b/m1/movement/src/account/create.rs → m1/m1-cli/src/account/create.rs
diff --git a/...nt/src/account/create_resource_account.rs → ...li/src/account/create_resource_account.rs b/...nt/src/account/create_resource_account.rs → ...li/src/account/create_resource_account.rs
diff --git a/...nt/src/account/derive_resource_account.rs → ...li/src/account/derive_resource_account.rs b/...nt/src/account/derive_resource_account.rs → ...li/src/account/derive_resource_account.rs
diff --git a/m1/movement/src/account/fund.rs → m1/m1-cli/src/account/fund.rs b/m1/movement/src/account/fund.rs → m1/m1-cli/src/account/fund.rs
diff --git a/m1/movement/src/account/key_rotation.rs → m1/m1-cli/src/account/key_rotation.rs b/m1/movement/src/account/key_rotation.rs → m1/m1-cli/src/account/key_rotation.rs
diff --git a/m1/movement/src/account/list.rs → m1/m1-cli/src/account/list.rs b/m1/movement/src/account/list.rs → m1/m1-cli/src/account/list.rs
diff --git a/m1/movement/src/account/mod.rs → m1/m1-cli/src/account/mod.rs b/m1/movement/src/account/mod.rs → m1/m1-cli/src/account/mod.rs
diff --git a/m1/movement/src/account/multisig_account.rs → m1/m1-cli/src/account/multisig_account.rs b/m1/movement/src/account/multisig_account.rs → m1/m1-cli/src/account/multisig_account.rs
diff --git a/m1/movement/src/account/transfer.rs → m1/m1-cli/src/account/transfer.rs b/m1/movement/src/account/transfer.rs → m1/m1-cli/src/account/transfer.rs
diff --git a/m1/movement/src/common/init.rs → m1/m1-cli/src/common/init.rs b/m1/movement/src/common/init.rs → m1/m1-cli/src/common/init.rs
diff --git a/m1/movement/src/common/mod.rs → m1/m1-cli/src/common/mod.rs b/m1/movement/src/common/mod.rs → m1/m1-cli/src/common/mod.rs
diff --git a/m1/movement/src/common/types.rs → m1/m1-cli/src/common/types.rs b/m1/movement/src/common/types.rs → m1/m1-cli/src/common/types.rs
diff --git a/m1/movement/src/common/utils.rs → m1/m1-cli/src/common/utils.rs b/m1/movement/src/common/utils.rs → m1/m1-cli/src/common/utils.rs
diff --git a/m1/movement/src/config/mod.rs → m1/m1-cli/src/config/mod.rs b/m1/movement/src/config/mod.rs → m1/m1-cli/src/config/mod.rs
diff --git a/m1/movement/src/faucet/mod.rs → m1/m1-cli/src/faucet/mod.rs b/m1/movement/src/faucet/mod.rs → m1/m1-cli/src/faucet/mod.rs
diff --git a/m1/movement/src/ffi.rs → m1/m1-cli/src/ffi.rs b/m1/movement/src/ffi.rs → m1/m1-cli/src/ffi.rs
diff --git a/m1/movement/src/genesis/git.rs → m1/m1-cli/src/genesis/git.rs b/m1/movement/src/genesis/git.rs → m1/m1-cli/src/genesis/git.rs
diff --git a/m1/movement/src/genesis/keys.rs → m1/m1-cli/src/genesis/keys.rs b/m1/movement/src/genesis/keys.rs → m1/m1-cli/src/genesis/keys.rs
diff --git a/m1/movement/src/genesis/mod.rs → m1/m1-cli/src/genesis/mod.rs b/m1/movement/src/genesis/mod.rs → m1/m1-cli/src/genesis/mod.rs
diff --git a/m1/movement/src/genesis/tests.rs → m1/m1-cli/src/genesis/tests.rs b/m1/movement/src/genesis/tests.rs → m1/m1-cli/src/genesis/tests.rs
diff --git a/m1/movement/src/genesis/tools.rs → m1/m1-cli/src/genesis/tools.rs b/m1/movement/src/genesis/tools.rs → m1/m1-cli/src/genesis/tools.rs
diff --git a/m1/movement/src/governance/mod.rs → m1/m1-cli/src/governance/mod.rs b/m1/movement/src/governance/mod.rs → m1/m1-cli/src/governance/mod.rs
diff --git a/m1/movement/src/lib.rs → m1/m1-cli/src/lib.rs b/m1/movement/src/lib.rs → m1/m1-cli/src/lib.rs
@@ -28,7 +28,7 @@ use std::collections::BTreeMap;
 
 /// Command Line Interface (CLI) for developing and interacting with the Aptos blockchain
 #[derive(Parser)]
-#[clap(name = "movement", author, version, propagate_version = true)]
+#[clap(name = "aptos", author, version, propagate_version = true)]
 pub enum Tool {
     #[clap(subcommand)]
     Account(account::AccountTool),

diff --git a/m1/movement/src/main.rs → m1/m1-cli/src/main.rs b/m1/movement/src/main.rs → m1/m1-cli/src/main.rs
@@ -9,7 +9,7 @@
 #[global_allocator]
 static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc;
 
-use movement::{move_tool, Tool};
+pub use movement::{move_tool, Tool};
 use clap::Parser;
 use std::process::exit;
 

diff --git a/...ment/src/move_tool/aptos_debug_natives.rs → ...-cli/src/move_tool/aptos_debug_natives.rs b/...ment/src/move_tool/aptos_debug_natives.rs → ...-cli/src/move_tool/aptos_debug_natives.rs
diff --git a/...src/move_tool/aptos_dep_example/README.md → ...src/move_tool/aptos_dep_example/README.md b/...src/move_tool/aptos_dep_example/README.md → ...src/move_tool/aptos_dep_example/README.md
diff --git a/...ve_tool/aptos_dep_example/pack1/Move.toml → ...ve_tool/aptos_dep_example/pack1/Move.toml b/...ve_tool/aptos_dep_example/pack1/Move.toml → ...ve_tool/aptos_dep_example/pack1/Move.toml
diff --git a/...ptos_dep_example/pack1/sources/hello.move → ...ptos_dep_example/pack1/sources/hello.move b/...ptos_dep_example/pack1/sources/hello.move → ...ptos_dep_example/pack1/sources/hello.move
diff --git a/...ve_tool/aptos_dep_example/pack2/Move.toml → ...ve_tool/aptos_dep_example/pack2/Move.toml b/...ve_tool/aptos_dep_example/pack2/Move.toml → ...ve_tool/aptos_dep_example/pack2/Move.toml
diff --git a/...ol/aptos_dep_example/pack2/sources/m.move → ...ol/aptos_dep_example/pack2/sources/m.move b/...ol/aptos_dep_example/pack2/sources/m.move → ...ol/aptos_dep_example/pack2/sources/m.move
diff --git a/m1/movement/src/move_tool/coverage.rs → m1/m1-cli/src/move_tool/coverage.rs b/m1/movement/src/move_tool/coverage.rs → m1/m1-cli/src/move_tool/coverage.rs
diff --git a/m1/movement/src/move_tool/disassembler.rs → m1/m1-cli/src/move_tool/disassembler.rs b/m1/movement/src/move_tool/disassembler.rs → m1/m1-cli/src/move_tool/disassembler.rs
diff --git a/m1/movement/src/move_tool/manifest.rs → m1/m1-cli/src/move_tool/manifest.rs b/m1/movement/src/move_tool/manifest.rs → m1/m1-cli/src/move_tool/manifest.rs
diff --git a/m1/movement/src/move_tool/mod.rs → m1/m1-cli/src/move_tool/mod.rs b/m1/movement/src/move_tool/mod.rs → m1/m1-cli/src/move_tool/mod.rs
diff --git a/m1/movement/src/move_tool/package_hooks.rs → m1/m1-cli/src/move_tool/package_hooks.rs b/m1/movement/src/move_tool/package_hooks.rs → m1/m1-cli/src/move_tool/package_hooks.rs
diff --git a/m1/movement/src/move_tool/show.rs → m1/m1-cli/src/move_tool/show.rs b/m1/movement/src/move_tool/show.rs → m1/m1-cli/src/move_tool/show.rs
diff --git a/m1/movement/src/move_tool/stored_package.rs → m1/m1-cli/src/move_tool/stored_package.rs b/m1/movement/src/move_tool/stored_package.rs → m1/m1-cli/src/move_tool/stored_package.rs
diff --git a/...c/move_tool/transactional_tests_runner.rs → ...c/move_tool/transactional_tests_runner.rs b/...c/move_tool/transactional_tests_runner.rs → ...c/move_tool/transactional_tests_runner.rs
diff --git a/...nt/src/node/analyze/analyze_validators.rs → ...li/src/node/analyze/analyze_validators.rs b/...nt/src/node/analyze/analyze_validators.rs → ...li/src/node/analyze/analyze_validators.rs
diff --git a/...vement/src/node/analyze/fetch_metadata.rs → m1/m1-cli/src/node/analyze/fetch_metadata.rs b/...vement/src/node/analyze/fetch_metadata.rs → m1/m1-cli/src/node/analyze/fetch_metadata.rs
diff --git a/m1/movement/src/node/analyze/mod.rs → m1/m1-cli/src/node/analyze/mod.rs b/m1/movement/src/node/analyze/mod.rs → m1/m1-cli/src/node/analyze/mod.rs
diff --git a/m1/movement/src/node/mod.rs → m1/m1-cli/src/node/mod.rs b/m1/movement/src/node/mod.rs → m1/m1-cli/src/node/mod.rs
diff --git a/m1/movement/src/op/key.rs → m1/m1-cli/src/op/key.rs b/m1/movement/src/op/key.rs → m1/m1-cli/src/op/key.rs
diff --git a/m1/movement/src/op/mod.rs → m1/m1-cli/src/op/mod.rs b/m1/movement/src/op/mod.rs → m1/m1-cli/src/op/mod.rs
diff --git a/m1/movement/src/stake/mod.rs → m1/m1-cli/src/stake/mod.rs b/m1/movement/src/stake/mod.rs → m1/m1-cli/src/stake/mod.rs
diff --git a/m1/movement/src/test/mod.rs → m1/m1-cli/src/test/mod.rs b/m1/movement/src/test/mod.rs → m1/m1-cli/src/test/mod.rs
diff --git a/m1/movement/src/test/tests.rs → m1/m1-cli/src/test/tests.rs b/m1/movement/src/test/tests.rs → m1/m1-cli/src/test/tests.rs
diff --git a/m1/movement/src/update/helpers.rs → m1/m1-cli/src/update/helpers.rs b/m1/movement/src/update/helpers.rs → m1/m1-cli/src/update/helpers.rs
diff --git a/m1/movement/src/update/mod.rs → m1/m1-cli/src/update/mod.rs b/m1/movement/src/update/mod.rs → m1/m1-cli/src/update/mod.rs
diff --git a/m1/movement/src/update/tool.rs → m1/m1-cli/src/update/tool.rs b/m1/movement/src/update/tool.rs → m1/m1-cli/src/update/tool.rs