Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

updated to aptos-cli 1.0.4 #134

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/actions/preinstall/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
38 changes: 19 additions & 19 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,27 +11,27 @@ 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 = "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" }
Expand Down
2 changes: 1 addition & 1 deletion cli/e2m/resources/template_move.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "3527183f390975e5b9b3189041d7455c81395af6" }

[addresses]
Std = "0x1"
Expand Down
1 change: 1 addition & 0 deletions rust-toolchain
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1.64.0
6 changes: 4 additions & 2 deletions translator/me/src/resolver/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -20,7 +20,9 @@ pub struct Resolver {
pub handler_data: HashMap<AccountAddress, HandleRequest>,
}

impl StateView for Resolver {
impl TStateView for Resolver {
type Key = StateKey;

fn get_state_value(&self, state_key: &StateKey) -> Result<Option<Vec<u8>>> {
log::info!("get_state_value: {}", state_key.to_string());

Expand Down