From 02ce24a33a0677e226625b670d1c1fdd1bbc9103 Mon Sep 17 00:00:00 2001 From: vmm Date: Tue, 20 Dec 2022 11:57:16 +0500 Subject: [PATCH 1/3] updated to aptos-cli 1.0.3 --- Cargo.toml | 18 +++++++++--------- cli/e2m/resources/template_move.toml | 2 +- rust-toolchain | 1 + translator/me/src/resolver/mod.rs | 6 ++++-- 4 files changed, 15 insertions(+), 12 deletions(-) create mode 100644 rust-toolchain diff --git a/Cargo.toml b/Cargo.toml index 9e48a445..e51ea877 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,15 +11,15 @@ members = [ [workspace.dependencies] #Aptos -aptos = { git = "https://github.com/aptos-labs/aptos-core", rev = "1798cfade82b55a5e484eddb73e1667fd429a77a" } -aptos-vm = { git = "https://github.com/aptos-labs/aptos-core", rev = "1798cfade82b55a5e484eddb73e1667fd429a77a" } -aptos-types = { git = "https://github.com/aptos-labs/aptos-core", rev = "1798cfade82b55a5e484eddb73e1667fd429a77a" } -aptos-framework = { git = "https://github.com/aptos-labs/aptos-core", rev = "1798cfade82b55a5e484eddb73e1667fd429a77a" } -aptos-cached-packages = { git = "https://github.com/aptos-labs/aptos-core", rev = "1798cfade82b55a5e484eddb73e1667fd429a77a" } -aptos-aggregator = { git = "https://github.com/aptos-labs/aptos-core", rev = "1798cfade82b55a5e484eddb73e1667fd429a77a" } -aptos-crypto = { git = "https://github.com/aptos-labs/aptos-core", rev = "1798cfade82b55a5e484eddb73e1667fd429a77a" } -aptos-gas = { git = "https://github.com/aptos-labs/aptos-core", rev = "1798cfade82b55a5e484eddb73e1667fd429a77a" } -aptos-state-view = { git = "https://github.com/aptos-labs/aptos-core", rev = "1798cfade82b55a5e484eddb73e1667fd429a77a" } +aptos = { git = "https://github.com/aptos-labs/aptos-core", rev = "c22cfa5ac018f0affe35a3f7e9e8b9e89f8f49f4" } +aptos-vm = { git = "https://github.com/aptos-labs/aptos-core", rev = "c22cfa5ac018f0affe35a3f7e9e8b9e89f8f49f4" } +aptos-types = { git = "https://github.com/aptos-labs/aptos-core", rev = "c22cfa5ac018f0affe35a3f7e9e8b9e89f8f49f4" } +aptos-framework = { git = "https://github.com/aptos-labs/aptos-core", rev = "c22cfa5ac018f0affe35a3f7e9e8b9e89f8f49f4" } +aptos-cached-packages = { git = "https://github.com/aptos-labs/aptos-core", rev = "c22cfa5ac018f0affe35a3f7e9e8b9e89f8f49f4" } +aptos-aggregator = { git = "https://github.com/aptos-labs/aptos-core", rev = "c22cfa5ac018f0affe35a3f7e9e8b9e89f8f49f4" } +aptos-crypto = { git = "https://github.com/aptos-labs/aptos-core", rev = "c22cfa5ac018f0affe35a3f7e9e8b9e89f8f49f4" } +aptos-gas = { git = "https://github.com/aptos-labs/aptos-core", rev = "c22cfa5ac018f0affe35a3f7e9e8b9e89f8f49f4" } +aptos-state-view = { git = "https://github.com/aptos-labs/aptos-core", rev = "c22cfa5ac018f0affe35a3f7e9e8b9e89f8f49f4" } #MOVE move-binary-format = { git = "https://github.com/move-language/move", rev = "81d19fce20d73675b7ac129abe6b6797513cc8d0" } diff --git a/cli/e2m/resources/template_move.toml b/cli/e2m/resources/template_move.toml index 29ef2238..5457fd9c 100644 --- a/cli/e2m/resources/template_move.toml +++ b/cli/e2m/resources/template_move.toml @@ -3,7 +3,7 @@ name = "###NAME###" version = "0.0.0" [dependencies] -AptosFramework = { git = "https://github.com/aptos-labs/aptos-core.git", subdir = "aptos-move/framework/aptos-framework/", rev = "1798cfade82b55a5e484eddb73e1667fd429a77a" } +AptosFramework = { git = "https://github.com/aptos-labs/aptos-core.git", subdir = "aptos-move/framework/aptos-framework/", rev = "c22cfa5ac018f0affe35a3f7e9e8b9e89f8f49f4" } [addresses] Std = "0x1" diff --git a/rust-toolchain b/rust-toolchain new file mode 100644 index 00000000..94057304 --- /dev/null +++ b/rust-toolchain @@ -0,0 +1 @@ +1.64.0 diff --git a/translator/me/src/resolver/mod.rs b/translator/me/src/resolver/mod.rs index a28dbe3a..9f38f5c4 100644 --- a/translator/me/src/resolver/mod.rs +++ b/translator/me/src/resolver/mod.rs @@ -4,7 +4,7 @@ use anyhow::Result; use reqwest::Url; use aptos_aggregator::transaction::ChangeSetExt; -use aptos_state_view::StateView; +use aptos_state_view::TStateView; use aptos_types::state_store::{state_key::StateKey, state_storage_usage::StateStorageUsage}; use aptos_types::write_set::WriteOp; @@ -20,7 +20,9 @@ pub struct Resolver { pub handler_data: HashMap, } -impl StateView for Resolver { +impl TStateView for Resolver { + type Key = StateKey; + fn get_state_value(&self, state_key: &StateKey) -> Result>> { log::info!("get_state_value: {}", state_key.to_string()); From 2277fc1772f0526eb8d5c1e24f31087d213e9ecb Mon Sep 17 00:00:00 2001 From: vmm Date: Tue, 20 Dec 2022 12:27:01 +0500 Subject: [PATCH 2/3] github ci: rust version 1.64.0 --- .github/actions/preinstall/action.yml | 4 ++-- .github/workflows/release.yml | 12 ++++++------ CHANGELOG.md | 3 +++ 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.github/actions/preinstall/action.yml b/.github/actions/preinstall/action.yml index c76262ab..ec79a027 100644 --- a/.github/actions/preinstall/action.yml +++ b/.github/actions/preinstall/action.yml @@ -19,10 +19,10 @@ runs: ~/.move key: ${{ inputs.os }}-compile - - name: Install Rust toolchain + - name: Install Rust toolchain 1.64.0 uses: actions-rs/toolchain@v1 with: - toolchain: stable + toolchain: 1.64.0 override: true components: rustfmt, clippy diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 67bb14eb..a7f21da9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -17,10 +17,10 @@ jobs: run: | echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV - - name: Install latest nightly + - name: Install Rust toolchain 1.64.0 uses: actions-rs/toolchain@v1 with: - toolchain: nightly + toolchain: 1.64.0 override: true components: cargo @@ -62,11 +62,11 @@ jobs: run: | echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV - - name: Install latest nightly + - name: Install Rust toolchain 1.64.0 uses: actions-rs/toolchain@v1 with: target: x86_64-apple-darwin - toolchain: nightly + toolchain: 1.64.0 override: true components: cargo @@ -108,11 +108,11 @@ jobs: run: | echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV - - name: Install latest nightly + - name: Install Rust toolchain 1.64.0 uses: actions-rs/toolchain@v1 with: target: aarch64-apple-darwin - toolchain: nightly + toolchain: 1.64.0 override: true components: cargo diff --git a/CHANGELOG.md b/CHANGELOG.md index 7cb1d78c..a92083f1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,9 @@ - calling a local contract without a profile configuration file ".aptos/config.yaml". `e2m call .. --how vm --profile 0x42` - block.timestamp +### Updated +- to aptos-cli 1.0.3 + ## [0.0.5] - 2022-11-17 ### Added - Running a locally remote/local contract From 71fcec2d60d10c34d041424740b4a9def14f71ef Mon Sep 17 00:00:00 2001 From: vmm Date: Thu, 12 Jan 2023 12:20:49 +0500 Subject: [PATCH 3/3] aptos 1.0.4 --- Cargo.toml | 38 ++++++++++++++-------------- cli/e2m/resources/template_move.toml | 2 +- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index e51ea877..b33a90e3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,27 +11,27 @@ members = [ [workspace.dependencies] #Aptos -aptos = { git = "https://github.com/aptos-labs/aptos-core", rev = "c22cfa5ac018f0affe35a3f7e9e8b9e89f8f49f4" } -aptos-vm = { git = "https://github.com/aptos-labs/aptos-core", rev = "c22cfa5ac018f0affe35a3f7e9e8b9e89f8f49f4" } -aptos-types = { git = "https://github.com/aptos-labs/aptos-core", rev = "c22cfa5ac018f0affe35a3f7e9e8b9e89f8f49f4" } -aptos-framework = { git = "https://github.com/aptos-labs/aptos-core", rev = "c22cfa5ac018f0affe35a3f7e9e8b9e89f8f49f4" } -aptos-cached-packages = { git = "https://github.com/aptos-labs/aptos-core", rev = "c22cfa5ac018f0affe35a3f7e9e8b9e89f8f49f4" } -aptos-aggregator = { git = "https://github.com/aptos-labs/aptos-core", rev = "c22cfa5ac018f0affe35a3f7e9e8b9e89f8f49f4" } -aptos-crypto = { git = "https://github.com/aptos-labs/aptos-core", rev = "c22cfa5ac018f0affe35a3f7e9e8b9e89f8f49f4" } -aptos-gas = { git = "https://github.com/aptos-labs/aptos-core", rev = "c22cfa5ac018f0affe35a3f7e9e8b9e89f8f49f4" } -aptos-state-view = { git = "https://github.com/aptos-labs/aptos-core", rev = "c22cfa5ac018f0affe35a3f7e9e8b9e89f8f49f4" } +aptos = { git = "https://github.com/aptos-labs/aptos-core", rev = "3527183f390975e5b9b3189041d7455c81395af6" } +aptos-vm = { git = "https://github.com/aptos-labs/aptos-core", rev = "3527183f390975e5b9b3189041d7455c81395af6" } +aptos-types = { git = "https://github.com/aptos-labs/aptos-core", rev = "3527183f390975e5b9b3189041d7455c81395af6" } +aptos-framework = { git = "https://github.com/aptos-labs/aptos-core", rev = "3527183f390975e5b9b3189041d7455c81395af6" } +aptos-cached-packages = { git = "https://github.com/aptos-labs/aptos-core", rev = "3527183f390975e5b9b3189041d7455c81395af6" } +aptos-aggregator = { git = "https://github.com/aptos-labs/aptos-core", rev = "3527183f390975e5b9b3189041d7455c81395af6" } +aptos-crypto = { git = "https://github.com/aptos-labs/aptos-core", rev = "3527183f390975e5b9b3189041d7455c81395af6" } +aptos-gas = { git = "https://github.com/aptos-labs/aptos-core", rev = "3527183f390975e5b9b3189041d7455c81395af6" } +aptos-state-view = { git = "https://github.com/aptos-labs/aptos-core", rev = "3527183f390975e5b9b3189041d7455c81395af6" } #MOVE -move-binary-format = { git = "https://github.com/move-language/move", rev = "81d19fce20d73675b7ac129abe6b6797513cc8d0" } -move-core-types = { git = "https://github.com/move-language/move", rev = "81d19fce20d73675b7ac129abe6b6797513cc8d0", features = ["address32"] } -move-bytecode-source-map = { git = "https://github.com/move-language/move", rev = "81d19fce20d73675b7ac129abe6b6797513cc8d0" } -dependencies = { git = "https://github.com/move-language/move", rev = "81d19fce20d73675b7ac129abe6b6797513cc8d0" } -move-bytecode-verifier = { git = "https://github.com/move-language/move", rev = "81d19fce20d73675b7ac129abe6b6797513cc8d0" } -move-disassembler = { git = "https://github.com/move-language/move", rev = "81d19fce20d73675b7ac129abe6b6797513cc8d0" } -move-ir-types = { git = "https://github.com/move-language/move", rev = "81d19fce20d73675b7ac129abe6b6797513cc8d0" } -move-stdlib = { git = "https://github.com/move-language/move", rev = "81d19fce20d73675b7ac129abe6b6797513cc8d0" } -move-vm-runtime = { git = "https://github.com/move-language/move", rev = "81d19fce20d73675b7ac129abe6b6797513cc8d0" } -move-vm-types = { git = "https://github.com/move-language/move", rev = "81d19fce20d73675b7ac129abe6b6797513cc8d0" } +move-binary-format = { git = "https://github.com/move-language/move", rev = "2336fe284b6db095e8f0a7ce5850ee165b3816fe" } +move-core-types = { git = "https://github.com/move-language/move", rev = "2336fe284b6db095e8f0a7ce5850ee165b3816fe", features = ["address32"] } +move-bytecode-source-map = { git = "https://github.com/move-language/move", rev = "2336fe284b6db095e8f0a7ce5850ee165b3816fe" } +dependencies = { git = "https://github.com/move-language/move", rev = "2336fe284b6db095e8f0a7ce5850ee165b3816fe" } +move-bytecode-verifier = { git = "https://github.com/move-language/move", rev = "2336fe284b6db095e8f0a7ce5850ee165b3816fe" } +move-disassembler = { git = "https://github.com/move-language/move", rev = "2336fe284b6db095e8f0a7ce5850ee165b3816fe" } +move-ir-types = { git = "https://github.com/move-language/move", rev = "2336fe284b6db095e8f0a7ce5850ee165b3816fe" } +move-stdlib = { git = "https://github.com/move-language/move", rev = "2336fe284b6db095e8f0a7ce5850ee165b3816fe" } +move-vm-runtime = { git = "https://github.com/move-language/move", rev = "2336fe284b6db095e8f0a7ce5850ee165b3816fe" } +move-vm-types = { git = "https://github.com/move-language/move", rev = "2336fe284b6db095e8f0a7ce5850ee165b3816fe" } #EVM evm = { git = "https://github.com/pontem-network/evm.git", branch = "Keccak256" } diff --git a/cli/e2m/resources/template_move.toml b/cli/e2m/resources/template_move.toml index 5457fd9c..c6988fc3 100644 --- a/cli/e2m/resources/template_move.toml +++ b/cli/e2m/resources/template_move.toml @@ -3,7 +3,7 @@ name = "###NAME###" version = "0.0.0" [dependencies] -AptosFramework = { git = "https://github.com/aptos-labs/aptos-core.git", subdir = "aptos-move/framework/aptos-framework/", rev = "c22cfa5ac018f0affe35a3f7e9e8b9e89f8f49f4" } +AptosFramework = { git = "https://github.com/aptos-labs/aptos-core.git", subdir = "aptos-move/framework/aptos-framework/", rev = "3527183f390975e5b9b3189041d7455c81395af6" } [addresses] Std = "0x1"