Skip to content

Commit a62518c

Browse files
authored
Prettify Aptos CLI -> Movement CLI (#224)
## Description <!-- Please include a summary of the change, including which issue it fixes or what feature it adds. Include relevant motivation, context and documentation as appropriate. List dependencies that are required for this change, if any. --> Address #216 - Rename the misnomers: **Done** - Fix cosmetics : **Done** - Update any static URLs: **Done** - Check the precompiled binary : **Not Done**. See binaries remark. - Easy build of Movement CLI (homebrow or [current script](https://docs.movementnetwork.xyz/devs/movementcli#quick-install-movement-precompiled-binaries) built by Andy G): **Not done**. The entire process should be rethought to generate the binaries build using GitHub CI and a more robust Homebrew integration, rather than simply downloading the binary. - When we init Move.toml should use our fork of the framework instead of builders having to populate: Done - Mainnet, Testnet, Devnet should populate movement endpoints for rpc: **Done** - Successful transactions with link to our explorer: **Done** - New account creation should hit our faucet for initial account initialization: **Done** ## Type of Change - [ ] New feature - [ ] Bug fix - [ ] Breaking change - [ ] Performance improvement - [X] Refactoring - [ ] Dependency update - [ ] Documentation update - [ ] Tests ## Which Components or Systems Does This Change Impact? - [ ] Validator Node - [ ] Full Node (API, Indexer, etc.) - [ ] Move/Aptos Virtual Machine - [ ] Aptos Framework - [X] Aptos CLI/SDK - [] Developer Infrastructure - [ ] Other (specify) ## How Has This Been Tested? <!-- - Please ensure that the functionality introduced by this change is well tested and verified to work as expected. - Ensure tests cover both happy and unhappy paths. - List and link relevant tests. --> I built all targets and ran the tests. I've created a new account, invited a new smart contract, and deployed it. ## Key Areas to Review <!-- - Identify any critical parts of the code that require special attention or understanding. Explain why these parts are crucial to the functionality or architecture of the project. - Point out any areas where complex logic has been implemented. Provide a brief explanation of the logic and your approach to make it easier for reviewers to follow. - Highlight any areas where you are particularly concerned or unsure about the code's impact on the change. This can include potential performance or security issues, or compatibility with existing features. --> ## Checklist - [ ] I have read and followed the [CONTRIBUTING](https://github.com/aptos-labs/aptos-core/blob/main/CONTRIBUTING.md) doc - [ ] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I identified and added all stakeholders and component owners affected by this change as reviewers - [ ] I tested both happy and unhappy path of the functionality - [ ] I have made corresponding changes to the documentation <!-- Thank you for your contribution! -->
2 parents f23bc89 + e88e79e commit a62518c

File tree

63 files changed

+353
-364
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+353
-364
lines changed

Cargo.lock

Lines changed: 105 additions & 105 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ rust-version = "1.80.1"
292292
[workspace.dependencies]
293293
# Internal crate dependencies.
294294
# Please do not add any test features here: they should be declared by the individual crate.
295-
aptos = { path = "crates/aptos" }
295+
movement = { path = "crates/aptos" }
296296
aptos-accumulator = { path = "storage/accumulator" }
297297
aptos-admin-service = { path = "crates/aptos-admin-service" }
298298
aptos-aggregator = { path = "aptos-move/aptos-aggregator" }

aptos-move/aptos-release-builder/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ rust-version = { workspace = true }
1414

1515
[dependencies]
1616
anyhow = { workspace = true }
17-
aptos = { workspace = true, features = [ "no-upload-proposal" ] }
17+
movement = { workspace = true, features = [ "no-upload-proposal" ] }
1818
aptos-build-info = { workspace = true }
1919
aptos-crypto = { workspace = true }
2020
aptos-framework = { workspace = true }

aptos-move/aptos-release-builder/src/components/framework.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ pub fn generate_upgrade_proposals(
3030
"only multi-step proposals can have a next execution hash"
3131
);
3232

33-
const APTOS_GIT_PATH: &str = "https://github.com/aptos-labs/aptos-core.git";
33+
const MVT_APTOS_GIT_PATH: &str = "https://github.com/movementlabsxyz/aptos-core.git";
3434

3535
// NOTE: This is skipping 0x7 (aptos-experimental package) which is only meant to be released
3636
// to devnet (or local testnet) via the genesis process and never released/upgraded in testnet

aptos-move/aptos-release-builder/src/components/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ use crate::{
1010
},
1111
};
1212
use anyhow::{anyhow, bail, Context, Result};
13-
use aptos::governance::GenerateExecutionHash;
1413
use aptos_crypto::HashValue;
1514
use aptos_gas_schedule::LATEST_GAS_FEATURE_VERSION;
1615
use aptos_infallible::duration_since_epoch;
@@ -27,6 +26,7 @@ use aptos_types::{
2726
use futures::executor::block_on;
2827
use handlebars::Handlebars;
2928
use move_binary_format::file_format_common::VERSION_DEFAULT_LANG_V2;
29+
use movement::governance::GenerateExecutionHash;
3030
use once_cell::sync::Lazy;
3131
use serde::{de::Visitor, Deserialize, Deserializer, Serialize, Serializer};
3232
use std::{

aptos-move/aptos-release-builder/src/main.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ impl NetworkSelection {
5656
use NetworkSelection::*;
5757

5858
let s = match &self {
59-
Mainnet => "https://fullnode.mainnet.aptoslabs.com",
60-
Testnet => "https://fullnode.testnet.aptoslabs.com",
61-
Devnet => "https://fullnode.devnet.aptoslabs.com",
59+
Mainnet => "https://mainnet.movementnetwork.xyz",
60+
Testnet => "https://testnet.movementnetwork.xyz",
61+
Devnet => "https://devnet.movementnetwork.xyz",
6262
RestEndpoint(url) => url,
6363
};
6464

@@ -159,7 +159,7 @@ pub enum Commands {
159159
},
160160
/// Print out current values of on chain configs.
161161
PrintConfigs {
162-
/// Url endpoint for the desired network. e.g: https://fullnode.mainnet.aptoslabs.com/v1.
162+
/// Url endpoint for the desired network. e.g: https://mainnet.movementnetwork.xyz/v1.
163163
#[clap(short, long)]
164164
endpoint: url::Url,
165165
/// Whether to print out the full gas schedule.
@@ -175,7 +175,7 @@ pub enum Commands {
175175
/// Usage: --endpoint '<URL>'
176176
/// --package-address <ADDRESS> --package-name <PACKAGE_NAME> [--print-json]
177177
PrintPackageMetadata {
178-
/// Url endpoint for the desired network. e.g: https://fullnode.mainnet.aptoslabs.com/v1.
178+
/// Url endpoint for the desired network. e.g: https://mainnet.movementnetwork.xyz/v1.
179179
#[clap(short, long)]
180180
endpoint: url::Url,
181181
/// The address under which the package is published

0 commit comments

Comments
 (0)