Skip to content

Commit

Permalink
[move] Upgrade move to 6a80792ecbf16d74bf1d57e48a576377f0879646
Browse files Browse the repository at this point in the history 
The 0x upgrade for addresses caused a lot of issues, so I'm reverting
it by upgrading move

Closes: aptos-labs#579
  • Loading branch information
@gregnazario @aptos-bot
gregnazario authored and aptos-bot committed Apr 20, 2022
1 parent 62b1c6d commit e2b0c45
Show file tree
Hide file tree
Showing 45 changed files with 224 additions and 754 deletions.
646 changes: 57 additions & 589 deletions Cargo.lock
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions api/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ aptos-vm = { path = "../aptos-move/aptos-vm" }
aptos-workspace-hack = { version = "0.1", path = "../crates/aptos-workspace-hack" }
aptos-api-types = { path = "./types", package = "aptos-api-types" }
storage-interface = { path = "../storage/storage-interface" }
move-core-types = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65", features=["address32"] }
move-resource-viewer = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
move-core-types = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646", features=["address32"] }
move-resource-viewer = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }

[dev-dependencies]
goldenfile = "1.1.0"
Expand Down
8 changes: 4 additions & 4 deletions api/types/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ aptos-transaction-builder = { path = "../../sdk/transaction-builder" }
aptos-types = { path = "../../types" }
aptos-vm = { path = "../../aptos-move/aptos-vm" }
aptos-workspace-hack = { version = "0.1", path = "../../crates/aptos-workspace-hack" }
move-binary-format = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
move-core-types = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65", features=["address32"] }
move-resource-viewer = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
move-binary-format = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
move-core-types = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646", features=["address32"] }
move-resource-viewer = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }

[dev-dependencies]
move-binary-format = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
move-binary-format = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
10 changes: 2 additions & 8 deletions api/types/src/address.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,10 +112,7 @@ mod tests {
let address: Address = serde_json::from_value(json!("0x1")).unwrap();

let account_address: AccountAddress = address.into();
assert_eq!(
account_address.short_str_lossless().as_str(),
AccountAddress::ONE.to_hex().as_str()
);
assert_eq!(account_address, AccountAddress::ONE);

let new_address: Address = account_address.into();
assert_eq!(new_address, address);
Expand All @@ -126,10 +123,7 @@ mod tests {
let address: Address = serde_json::from_value(json!("0x1")).unwrap();

let account_address: AccountAddress = (&address).into();
assert_eq!(
account_address.short_str_lossless().as_str(),
AccountAddress::ONE.to_hex().as_str()
);
assert_eq!(account_address, AccountAddress::ONE);

let new_address: Address = account_address.into();
assert_eq!(new_address, address);
Expand Down
6 changes: 3 additions & 3 deletions aptos-move/af-cli/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ clap = "3.1.8"
aptos-vm = { path = "../aptos-vm" }
aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" }
cached-framework-packages = { path = "../framework/cached-packages" }
move-core-types = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65", features=["address32"] }
move-vm-types = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
move-cli = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
move-core-types = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646", features=["address32"] }
move-vm-types = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
move-cli = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }

[dev-dependencies]
datatest-stable = "0.1.1"
Expand Down
6 changes: 3 additions & 3 deletions aptos-move/aptos-resource-viewer/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ edition = "2018"

[dependencies]
aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" }
move-resource-viewer = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
move-resource-viewer = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
aptos-types = { path = "../../types" }
move-core-types = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65", features=["address32"] }
move-binary-format = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
move-core-types = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646", features=["address32"] }
move-binary-format = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }

anyhow = "1.0.52"
4 changes: 2 additions & 2 deletions aptos-move/aptos-transaction-benchmarks/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ language-e2e-tests = { path = "../e2e-tests" }
aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" }
aptos-crypto = { path = "../../crates/aptos-crypto" }

read-write-set = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
read-write-set-dynamic = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
read-write-set = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
read-write-set-dynamic = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
aptos-vm = { path = "../aptos-vm" }

[[bench]]
Expand Down
12 changes: 6 additions & 6 deletions aptos-move/aptos-transactional-test-harness/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ bcs = "0.1.2"
hex = "0.4.3"

# Move dependencies
move-transactional-test-runner = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
move-compiler = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
move-binary-format = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
move-core-types = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65", features=["address32"] }
move-command-line-common = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
move-vm-runtime = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
move-transactional-test-runner = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
move-compiler = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
move-binary-format = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
move-core-types = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646", features=["address32"] }
move-command-line-common = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
move-vm-runtime = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }


# Diem-Move dependencies
Expand Down
2 changes: 1 addition & 1 deletion aptos-move/aptos-validator-interface/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ aptosdb = { path = "../../storage/aptosdb" }
aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" }
storage-interface = { path = "../../storage/storage-interface" }
aptos-state-view = { path = "../../storage/state-view" }
move-binary-format = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
move-binary-format = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
16 changes: 8 additions & 8 deletions aptos-move/aptos-vm/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ once_cell = "1.7.2"
rayon = "1.5.0"
tracing = "0.1.16"

move-binary-format = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
move-bytecode-utils = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
move-core-types = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65", features=["address32"] }
move-stdlib = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
move-table-extension = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
move-vm-runtime = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
move-vm-types = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
read-write-set-dynamic = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65"}
move-binary-format = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
move-bytecode-utils = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
move-core-types = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646", features=["address32"] }
move-stdlib = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
move-table-extension = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
move-vm-runtime = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
move-vm-types = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
read-write-set-dynamic = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646"}

aptos-crypto = { path = "../../crates/aptos-crypto" }
aptos-crypto-derive = { path = "../../crates/aptos-crypto-derive" }
Expand Down
12 changes: 6 additions & 6 deletions aptos-move/e2e-tests-replay/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ structopt = "0.3.21"
walkdir = "2.3.1"

aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" }
move-stackless-bytecode-interpreter = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
move-stackless-bytecode-interpreter = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
aptos-types = { path = "../../types", features = ["fuzzing"] }
framework = { path = "../framework" }
aptos-vm = { path = "../../aptos-move/aptos-vm" }
language-e2e-tests = { path = "../e2e-tests" }
move-binary-format = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
move-core-types = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65", features=["address32"] }
move-model = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
move-vm-runtime = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
move-vm-types = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
move-binary-format = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
move-core-types = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646", features=["address32"] }
move-model = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
move-vm-runtime = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
move-vm-types = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
14 changes: 7 additions & 7 deletions aptos-move/e2e-tests/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ rand = "0.8.3"
serde = { version = "1.0.124", default-features = false }

## Move dependencies
move-binary-format = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
move-command-line-common = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
move-core-types = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65", features=["address32"] }
move-ir-compiler = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
move-vm-runtime = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
move-vm-types = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
read-write-set = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
move-binary-format = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
move-command-line-common = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
move-core-types = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646", features=["address32"] }
move-ir-compiler = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
move-vm-runtime = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
move-vm-types = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
read-write-set = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }

## Diem-Move dependencies
aptos-keygen = { path = "../aptos-keygen" }
Expand Down
14 changes: 7 additions & 7 deletions aptos-move/e2e-testsuite/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ publish = false
proptest = "1.0.0"

## Move dependencies
move-core-types = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65", features=["address32"] }
move-ir-compiler = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
move-vm-runtime = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
move-vm-types = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
move-binary-format = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
move-bytecode-verifier = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
read-write-set = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
move-core-types = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646", features=["address32"] }
move-ir-compiler = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
move-vm-runtime = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
move-vm-types = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
move-binary-format = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
move-bytecode-verifier = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }
read-write-set = { git = "https://github.com/move-language/move", rev = "6a80792ecbf16d74bf1d57e48a576377f0879646" }

## Aptos-Move dependencies
aptos-keygen = { path = "../aptos-keygen" }
Expand Down
Loading

0 comments on commit e2b0c45

Please sign in to comment.