From 3d10bd1ebe53809625098083a1d605be6f5700e5 Mon Sep 17 00:00:00 2001 From: Bo Wu Date: Mon, 25 Apr 2022 15:36:36 -0700 Subject: [PATCH] update the move to include move-viewer change Closes: #614 --- Cargo.lock | 105 ++++++------------ api/Cargo.toml | 4 +- ..._failed_by_script_function_validation.json | 4 +- api/types/Cargo.toml | 8 +- aptos-move/af-cli/Cargo.toml | 6 +- aptos-move/aptos-resource-viewer/Cargo.toml | 6 +- .../aptos-transaction-benchmarks/Cargo.toml | 4 +- .../Cargo.toml | 50 --------- .../aptos-validator-interface/Cargo.toml | 2 +- aptos-move/aptos-vm/Cargo.toml | 16 +-- aptos-move/aptos-vm/src/aptos_vm.rs | 4 +- aptos-move/e2e-tests-replay/Cargo.toml | 12 +- aptos-move/e2e-tests/Cargo.toml | 14 +-- aptos-move/e2e-testsuite/Cargo.toml | 14 +-- aptos-move/framework/Cargo.toml | 38 +++---- .../framework/cached-packages/Cargo.toml | 8 +- aptos-move/genesis-viewer/Cargo.toml | 6 +- aptos-move/move-examples/Cargo.toml | 10 +- .../transaction-builder-generator/Cargo.toml | 2 +- aptos-move/transaction-replay/Cargo.toml | 14 +-- aptos-move/vm-genesis/Cargo.toml | 14 +-- .../writeset-transaction-generator/Cargo.toml | 16 +-- crates/aptos-rest-client/Cargo.toml | 2 +- crates/aptos/Cargo.toml | 12 +- execution/executor/Cargo.toml | 4 +- network/discovery/Cargo.toml | 2 +- sdk/Cargo.toml | 2 +- sdk/transaction-builder/Cargo.toml | 4 +- .../consensus-notifications/Cargo.toml | 2 +- .../event-notifications/Cargo.toml | 2 +- state-sync/state-sync-v1/Cargo.toml | 2 +- .../state-sync-driver/Cargo.toml | 2 +- state-sync/storage-service/server/Cargo.toml | 2 +- storage/aptosdb/Cargo.toml | 2 +- storage/storage-interface/Cargo.toml | 2 +- testsuite/aptos-fuzzer/Cargo.toml | 6 +- testsuite/generate-format/Cargo.toml | 2 +- testsuite/smoke-test/Cargo.toml | 8 +- types/Cargo.toml | 6 +- vm-validator/Cargo.toml | 2 +- x.toml | 10 +- 41 files changed, 173 insertions(+), 258 deletions(-) delete mode 100644 aptos-move/aptos-transactional-test-harness/Cargo.toml diff --git a/Cargo.lock b/Cargo.lock index 7ecbf329a5cf8..0f598a78e0686 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1691,7 +1691,7 @@ checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" [[package]] name = "bytecode-interpreter-crypto" version = "0.1.0" -source = "git+https://github.com/move-language/move?rev=a8d6aa915d4cdcdbd16151f0941b85da8c50e097#a8d6aa915d4cdcdbd16151f0941b85da8c50e097" +source = "git+https://github.com/move-language/move?rev=1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e#1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" dependencies = [ "anyhow", "curve25519-dalek-fiat", @@ -4517,7 +4517,7 @@ dependencies = [ [[package]] name = "move-abigen" version = "0.1.0" -source = "git+https://github.com/move-language/move?rev=a8d6aa915d4cdcdbd16151f0941b85da8c50e097#a8d6aa915d4cdcdbd16151f0941b85da8c50e097" +source = "git+https://github.com/move-language/move?rev=1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e#1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" dependencies = [ "anyhow", "bcs", @@ -4533,7 +4533,7 @@ dependencies = [ [[package]] name = "move-binary-format" version = "0.0.3" -source = "git+https://github.com/move-language/move?rev=a8d6aa915d4cdcdbd16151f0941b85da8c50e097#a8d6aa915d4cdcdbd16151f0941b85da8c50e097" +source = "git+https://github.com/move-language/move?rev=1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e#1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" dependencies = [ "anyhow", "mirai-annotations", @@ -4549,7 +4549,7 @@ dependencies = [ [[package]] name = "move-borrow-graph" version = "0.0.1" -source = "git+https://github.com/move-language/move?rev=a8d6aa915d4cdcdbd16151f0941b85da8c50e097#a8d6aa915d4cdcdbd16151f0941b85da8c50e097" +source = "git+https://github.com/move-language/move?rev=1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e#1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" dependencies = [ "mirai-annotations", ] @@ -4557,7 +4557,7 @@ dependencies = [ [[package]] name = "move-bytecode-source-map" version = "0.1.0" -source = "git+https://github.com/move-language/move?rev=a8d6aa915d4cdcdbd16151f0941b85da8c50e097#a8d6aa915d4cdcdbd16151f0941b85da8c50e097" +source = "git+https://github.com/move-language/move?rev=1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e#1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" dependencies = [ "anyhow", "bcs", @@ -4572,7 +4572,7 @@ dependencies = [ [[package]] name = "move-bytecode-utils" version = "0.1.0" -source = "git+https://github.com/move-language/move?rev=a8d6aa915d4cdcdbd16151f0941b85da8c50e097#a8d6aa915d4cdcdbd16151f0941b85da8c50e097" +source = "git+https://github.com/move-language/move?rev=1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e#1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" dependencies = [ "anyhow", "move-binary-format", @@ -4584,7 +4584,7 @@ dependencies = [ [[package]] name = "move-bytecode-verifier" version = "0.1.0" -source = "git+https://github.com/move-language/move?rev=a8d6aa915d4cdcdbd16151f0941b85da8c50e097#a8d6aa915d4cdcdbd16151f0941b85da8c50e097" +source = "git+https://github.com/move-language/move?rev=1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e#1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" dependencies = [ "anyhow", "mirai-annotations", @@ -4597,7 +4597,7 @@ dependencies = [ [[package]] name = "move-bytecode-viewer" version = "0.1.0" -source = "git+https://github.com/move-language/move?rev=a8d6aa915d4cdcdbd16151f0941b85da8c50e097#a8d6aa915d4cdcdbd16151f0941b85da8c50e097" +source = "git+https://github.com/move-language/move?rev=1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e#1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" dependencies = [ "anyhow", "clap 3.1.9", @@ -4614,7 +4614,7 @@ dependencies = [ [[package]] name = "move-cli" version = "0.1.0" -source = "git+https://github.com/move-language/move?rev=a8d6aa915d4cdcdbd16151f0941b85da8c50e097#a8d6aa915d4cdcdbd16151f0941b85da8c50e097" +source = "git+https://github.com/move-language/move?rev=1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e#1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" dependencies = [ "anyhow", "bcs", @@ -4655,7 +4655,7 @@ dependencies = [ [[package]] name = "move-command-line-common" version = "0.1.0" -source = "git+https://github.com/move-language/move?rev=a8d6aa915d4cdcdbd16151f0941b85da8c50e097#a8d6aa915d4cdcdbd16151f0941b85da8c50e097" +source = "git+https://github.com/move-language/move?rev=1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e#1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" dependencies = [ "anyhow", "difference", @@ -4668,7 +4668,7 @@ dependencies = [ [[package]] name = "move-compiler" version = "0.0.1" -source = "git+https://github.com/move-language/move?rev=a8d6aa915d4cdcdbd16151f0941b85da8c50e097#a8d6aa915d4cdcdbd16151f0941b85da8c50e097" +source = "git+https://github.com/move-language/move?rev=1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e#1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" dependencies = [ "anyhow", "bcs", @@ -4697,7 +4697,7 @@ dependencies = [ [[package]] name = "move-core-types" version = "0.0.4" -source = "git+https://github.com/move-language/move?rev=a8d6aa915d4cdcdbd16151f0941b85da8c50e097#a8d6aa915d4cdcdbd16151f0941b85da8c50e097" +source = "git+https://github.com/move-language/move?rev=1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e#1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" dependencies = [ "anyhow", "bcs", @@ -4715,7 +4715,7 @@ dependencies = [ [[package]] name = "move-coverage" version = "0.1.0" -source = "git+https://github.com/move-language/move?rev=a8d6aa915d4cdcdbd16151f0941b85da8c50e097#a8d6aa915d4cdcdbd16151f0941b85da8c50e097" +source = "git+https://github.com/move-language/move?rev=1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e#1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" dependencies = [ "anyhow", "bcs", @@ -4735,7 +4735,7 @@ dependencies = [ [[package]] name = "move-disassembler" version = "0.1.0" -source = "git+https://github.com/move-language/move?rev=a8d6aa915d4cdcdbd16151f0941b85da8c50e097#a8d6aa915d4cdcdbd16151f0941b85da8c50e097" +source = "git+https://github.com/move-language/move?rev=1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e#1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" dependencies = [ "anyhow", "clap 3.1.9", @@ -4753,7 +4753,7 @@ dependencies = [ [[package]] name = "move-docgen" version = "0.1.0" -source = "git+https://github.com/move-language/move?rev=a8d6aa915d4cdcdbd16151f0941b85da8c50e097#a8d6aa915d4cdcdbd16151f0941b85da8c50e097" +source = "git+https://github.com/move-language/move?rev=1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e#1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" dependencies = [ "anyhow", "codespan", @@ -4771,7 +4771,7 @@ dependencies = [ [[package]] name = "move-errmapgen" version = "0.1.0" -source = "git+https://github.com/move-language/move?rev=a8d6aa915d4cdcdbd16151f0941b85da8c50e097#a8d6aa915d4cdcdbd16151f0941b85da8c50e097" +source = "git+https://github.com/move-language/move?rev=1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e#1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" dependencies = [ "anyhow", "bcs", @@ -4800,7 +4800,7 @@ dependencies = [ [[package]] name = "move-ir-compiler" version = "0.1.0" -source = "git+https://github.com/move-language/move?rev=a8d6aa915d4cdcdbd16151f0941b85da8c50e097#a8d6aa915d4cdcdbd16151f0941b85da8c50e097" +source = "git+https://github.com/move-language/move?rev=1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e#1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" dependencies = [ "anyhow", "bcs", @@ -4819,7 +4819,7 @@ dependencies = [ [[package]] name = "move-ir-to-bytecode" version = "0.1.0" -source = "git+https://github.com/move-language/move?rev=a8d6aa915d4cdcdbd16151f0941b85da8c50e097#a8d6aa915d4cdcdbd16151f0941b85da8c50e097" +source = "git+https://github.com/move-language/move?rev=1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e#1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" dependencies = [ "anyhow", "codespan-reporting", @@ -4838,7 +4838,7 @@ dependencies = [ [[package]] name = "move-ir-to-bytecode-syntax" version = "0.1.0" -source = "git+https://github.com/move-language/move?rev=a8d6aa915d4cdcdbd16151f0941b85da8c50e097#a8d6aa915d4cdcdbd16151f0941b85da8c50e097" +source = "git+https://github.com/move-language/move?rev=1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e#1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" dependencies = [ "anyhow", "hex", @@ -4851,7 +4851,7 @@ dependencies = [ [[package]] name = "move-ir-types" version = "0.1.0" -source = "git+https://github.com/move-language/move?rev=a8d6aa915d4cdcdbd16151f0941b85da8c50e097#a8d6aa915d4cdcdbd16151f0941b85da8c50e097" +source = "git+https://github.com/move-language/move?rev=1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e#1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" dependencies = [ "anyhow", "hex", @@ -4865,7 +4865,7 @@ dependencies = [ [[package]] name = "move-model" version = "0.1.0" -source = "git+https://github.com/move-language/move?rev=a8d6aa915d4cdcdbd16151f0941b85da8c50e097#a8d6aa915d4cdcdbd16151f0941b85da8c50e097" +source = "git+https://github.com/move-language/move?rev=1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e#1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" dependencies = [ "anyhow", "codespan", @@ -4891,7 +4891,7 @@ dependencies = [ [[package]] name = "move-package" version = "0.1.0" -source = "git+https://github.com/move-language/move?rev=a8d6aa915d4cdcdbd16151f0941b85da8c50e097#a8d6aa915d4cdcdbd16151f0941b85da8c50e097" +source = "git+https://github.com/move-language/move?rev=1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e#1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" dependencies = [ "anyhow", "bcs", @@ -4923,7 +4923,7 @@ dependencies = [ [[package]] name = "move-prover" version = "0.1.0" -source = "git+https://github.com/move-language/move?rev=a8d6aa915d4cdcdbd16151f0941b85da8c50e097#a8d6aa915d4cdcdbd16151f0941b85da8c50e097" +source = "git+https://github.com/move-language/move?rev=1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e#1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" dependencies = [ "anyhow", "async-trait", @@ -4960,7 +4960,7 @@ dependencies = [ [[package]] name = "move-prover-boogie-backend" version = "0.1.0" -source = "git+https://github.com/move-language/move?rev=a8d6aa915d4cdcdbd16151f0941b85da8c50e097#a8d6aa915d4cdcdbd16151f0941b85da8c50e097" +source = "git+https://github.com/move-language/move?rev=1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e#1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" dependencies = [ "anyhow", "async-trait", @@ -4988,7 +4988,7 @@ dependencies = [ [[package]] name = "move-read-write-set-types" version = "0.0.3" -source = "git+https://github.com/move-language/move?rev=a8d6aa915d4cdcdbd16151f0941b85da8c50e097#a8d6aa915d4cdcdbd16151f0941b85da8c50e097" +source = "git+https://github.com/move-language/move?rev=1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e#1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" dependencies = [ "anyhow", "move-binary-format", @@ -4999,7 +4999,7 @@ dependencies = [ [[package]] name = "move-resource-viewer" version = "0.1.0" -source = "git+https://github.com/move-language/move?rev=a8d6aa915d4cdcdbd16151f0941b85da8c50e097#a8d6aa915d4cdcdbd16151f0941b85da8c50e097" +source = "git+https://github.com/move-language/move?rev=1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e#1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" dependencies = [ "anyhow", "bcs", @@ -5014,7 +5014,7 @@ dependencies = [ [[package]] name = "move-stackless-bytecode" version = "0.1.0" -source = "git+https://github.com/move-language/move?rev=a8d6aa915d4cdcdbd16151f0941b85da8c50e097#a8d6aa915d4cdcdbd16151f0941b85da8c50e097" +source = "git+https://github.com/move-language/move?rev=1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e#1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" dependencies = [ "codespan", "codespan-reporting", @@ -5040,7 +5040,7 @@ dependencies = [ [[package]] name = "move-stackless-bytecode-interpreter" version = "0.1.0" -source = "git+https://github.com/move-language/move?rev=a8d6aa915d4cdcdbd16151f0941b85da8c50e097#a8d6aa915d4cdcdbd16151f0941b85da8c50e097" +source = "git+https://github.com/move-language/move?rev=1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e#1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" dependencies = [ "anyhow", "bytecode-interpreter-crypto", @@ -5058,7 +5058,7 @@ dependencies = [ [[package]] name = "move-stdlib" version = "0.1.0" -source = "git+https://github.com/move-language/move?rev=a8d6aa915d4cdcdbd16151f0941b85da8c50e097#a8d6aa915d4cdcdbd16151f0941b85da8c50e097" +source = "git+https://github.com/move-language/move?rev=1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e#1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" dependencies = [ "log", "move-binary-format", @@ -5079,7 +5079,7 @@ dependencies = [ [[package]] name = "move-symbol-pool" version = "0.1.0" -source = "git+https://github.com/move-language/move?rev=a8d6aa915d4cdcdbd16151f0941b85da8c50e097#a8d6aa915d4cdcdbd16151f0941b85da8c50e097" +source = "git+https://github.com/move-language/move?rev=1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e#1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" dependencies = [ "once_cell", "serde 1.0.136", @@ -5088,7 +5088,7 @@ dependencies = [ [[package]] name = "move-table-extension" version = "0.1.0" -source = "git+https://github.com/move-language/move?rev=a8d6aa915d4cdcdbd16151f0941b85da8c50e097#a8d6aa915d4cdcdbd16151f0941b85da8c50e097" +source = "git+https://github.com/move-language/move?rev=1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e#1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" dependencies = [ "anyhow", "bcs", @@ -5102,41 +5102,10 @@ dependencies = [ "smallvec", ] -[[package]] -name = "move-transactional-test-runner" -version = "0.1.0" -source = "git+https://github.com/move-language/move?rev=a8d6aa915d4cdcdbd16151f0941b85da8c50e097#a8d6aa915d4cdcdbd16151f0941b85da8c50e097" -dependencies = [ - "anyhow", - "clap 3.1.9", - "colored", - "move-binary-format", - "move-bytecode-source-map", - "move-bytecode-utils", - "move-cli", - "move-command-line-common", - "move-compiler", - "move-core-types", - "move-disassembler", - "move-ir-compiler", - "move-ir-types", - "move-resource-viewer", - "move-stackless-bytecode-interpreter", - "move-stdlib", - "move-symbol-pool", - "move-vm-runtime", - "move-vm-test-utils", - "move-vm-types", - "once_cell", - "rayon", - "regex", - "tempfile", -] - [[package]] name = "move-unit-test" version = "0.1.0" -source = "git+https://github.com/move-language/move?rev=a8d6aa915d4cdcdbd16151f0941b85da8c50e097#a8d6aa915d4cdcdbd16151f0941b85da8c50e097" +source = "git+https://github.com/move-language/move?rev=1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e#1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" dependencies = [ "anyhow", "clap 3.1.9", @@ -5166,7 +5135,7 @@ dependencies = [ [[package]] name = "move-vm-runtime" version = "0.1.0" -source = "git+https://github.com/move-language/move?rev=a8d6aa915d4cdcdbd16151f0941b85da8c50e097#a8d6aa915d4cdcdbd16151f0941b85da8c50e097" +source = "git+https://github.com/move-language/move?rev=1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e#1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" dependencies = [ "better_any", "fail", @@ -5184,7 +5153,7 @@ dependencies = [ [[package]] name = "move-vm-test-utils" version = "0.1.0" -source = "git+https://github.com/move-language/move?rev=a8d6aa915d4cdcdbd16151f0941b85da8c50e097#a8d6aa915d4cdcdbd16151f0941b85da8c50e097" +source = "git+https://github.com/move-language/move?rev=1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e#1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" dependencies = [ "anyhow", "move-core-types", @@ -5193,7 +5162,7 @@ dependencies = [ [[package]] name = "move-vm-types" version = "0.1.0" -source = "git+https://github.com/move-language/move?rev=a8d6aa915d4cdcdbd16151f0941b85da8c50e097#a8d6aa915d4cdcdbd16151f0941b85da8c50e097" +source = "git+https://github.com/move-language/move?rev=1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e#1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" dependencies = [ "bcs", "mirai-annotations", @@ -6440,7 +6409,7 @@ dependencies = [ [[package]] name = "read-write-set" version = "0.1.0" -source = "git+https://github.com/move-language/move?rev=a8d6aa915d4cdcdbd16151f0941b85da8c50e097#a8d6aa915d4cdcdbd16151f0941b85da8c50e097" +source = "git+https://github.com/move-language/move?rev=1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e#1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" dependencies = [ "anyhow", "move-binary-format", @@ -6455,7 +6424,7 @@ dependencies = [ [[package]] name = "read-write-set-dynamic" version = "0.1.0" -source = "git+https://github.com/move-language/move?rev=a8d6aa915d4cdcdbd16151f0941b85da8c50e097#a8d6aa915d4cdcdbd16151f0941b85da8c50e097" +source = "git+https://github.com/move-language/move?rev=1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e#1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" dependencies = [ "anyhow", "move-binary-format", diff --git a/api/Cargo.toml b/api/Cargo.toml index 96d480711b814..19a0c1cd4ead8 100644 --- a/api/Cargo.toml +++ b/api/Cargo.toml @@ -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 = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097", version = "0.0.4", features=["address32"] } -move-resource-viewer = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } +move-core-types = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e", version = "0.0.4", features=["address32"] } +move-resource-viewer = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } [dev-dependencies] goldenfile = "1.1.0" diff --git a/api/goldens/aptos_api__tests__transactions_test__test_get_txn_execute_failed_by_script_function_validation.json b/api/goldens/aptos_api__tests__transactions_test__test_get_txn_execute_failed_by_script_function_validation.json index d11eacb6ed975..59efb9ed0784c 100644 --- a/api/goldens/aptos_api__tests__transactions_test__test_get_txn_execute_failed_by_script_function_validation.json +++ b/api/goldens/aptos_api__tests__transactions_test__test_get_txn_execute_failed_by_script_function_validation.json @@ -58,8 +58,8 @@ "function": "0x1::TestCoin::transfer", "type_arguments": [], "arguments": [ - "0x00000000000000000000000000000000000000000000000000000000000000dd", - "0x7b00000000000000" + "0xdd", + "123" ] }, "signature": { diff --git a/api/types/Cargo.toml b/api/types/Cargo.toml index 1f5330bcf98cb..0219e001874cb 100644 --- a/api/types/Cargo.toml +++ b/api/types/Cargo.toml @@ -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 = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } -move-core-types = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097", features=["address32"] } -move-resource-viewer = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } +move-binary-format = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } +move-core-types = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e", features=["address32"] } +move-resource-viewer = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } [dev-dependencies] -move-binary-format = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } +move-binary-format = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } diff --git a/aptos-move/af-cli/Cargo.toml b/aptos-move/af-cli/Cargo.toml index 65482966f399a..c4e0ada03f9a6 100644 --- a/aptos-move/af-cli/Cargo.toml +++ b/aptos-move/af-cli/Cargo.toml @@ -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 = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097", features=["address32"] } -move-vm-types = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } -move-cli = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } +move-core-types = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e", features=["address32"] } +move-vm-types = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } +move-cli = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } [dev-dependencies] datatest-stable = "0.1.1" diff --git a/aptos-move/aptos-resource-viewer/Cargo.toml b/aptos-move/aptos-resource-viewer/Cargo.toml index 49de25d43aa1f..4cc493d73c6b8 100644 --- a/aptos-move/aptos-resource-viewer/Cargo.toml +++ b/aptos-move/aptos-resource-viewer/Cargo.toml @@ -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 = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } +move-resource-viewer = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } aptos-types = { path = "../../types" } -move-core-types = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097", features=["address32"] } -move-binary-format = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } +move-core-types = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e", features=["address32"] } +move-binary-format = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } anyhow = "1.0.52" diff --git a/aptos-move/aptos-transaction-benchmarks/Cargo.toml b/aptos-move/aptos-transaction-benchmarks/Cargo.toml index dd0666c42bd02..79a7d06bc122e 100644 --- a/aptos-move/aptos-transaction-benchmarks/Cargo.toml +++ b/aptos-move/aptos-transaction-benchmarks/Cargo.toml @@ -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 = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } -read-write-set-dynamic = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } +read-write-set = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } +read-write-set-dynamic = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } aptos-vm = { path = "../aptos-vm" } [[bench]] diff --git a/aptos-move/aptos-transactional-test-harness/Cargo.toml b/aptos-move/aptos-transactional-test-harness/Cargo.toml deleted file mode 100644 index a41dbe108bfe3..0000000000000 --- a/aptos-move/aptos-transactional-test-harness/Cargo.toml +++ /dev/null @@ -1,50 +0,0 @@ -[package] -name = "aptos-transactional-test-harness" -version = "0.1.0" -authors = ["Aptos Labs "] -description = "Transactional testing framework for Move" -repository = "https://github.com/aptos-labs/aptos-core" -homepage = "https://aptoslabs.com" -license = "Apache-2.0" -publish = false -edition = "2018" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[dependencies] -clap = "3.1.8" -once_cell = "1.7.2" -anyhow = "1.0.52" -bcs = "0.1.2" -hex = "0.4.3" - -# Move dependencies -move-transactional-test-runner = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } -move-compiler = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } -move-binary-format = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } -move-core-types = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097", features=["address32"] } -move-command-line-common = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } -move-vm-runtime = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } - - -# Diem-Move dependencies -aptos-keygen = { path = "../aptos-keygen" } -aptos-vm = { path = "../aptos-vm" } -cached-framework-packages = { path = "../framework/cached-packages" } -framework = { path = "../framework" } -language-e2e-tests = { path = "../e2e-tests" } -vm-genesis= { path = "../vm-genesis" } - -# Other Diem dependencies -aptos-types = { path = "../../types", features = ["fuzzing"] } -aptos-transaction-builder = { path = "../../sdk/transaction-builder" } -aptos-crypto = { path = "../../crates/aptos-crypto" } -aptos-state-view = { path = "../../storage/state-view" } -aptos-workspace-hack = { version = "0.1", path = "../../crates/aptos-workspace-hack" } - -[dev-dependencies] -datatest-stable = "0.1.1" - -#[[test]] -#name = "tests" -#harness = false diff --git a/aptos-move/aptos-validator-interface/Cargo.toml b/aptos-move/aptos-validator-interface/Cargo.toml index f68dd075f360e..a3461244219f8 100644 --- a/aptos-move/aptos-validator-interface/Cargo.toml +++ b/aptos-move/aptos-validator-interface/Cargo.toml @@ -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 = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } +move-binary-format = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } diff --git a/aptos-move/aptos-vm/Cargo.toml b/aptos-move/aptos-vm/Cargo.toml index 54bac0c1a7aab..3700bc1bf0ab4 100644 --- a/aptos-move/aptos-vm/Cargo.toml +++ b/aptos-move/aptos-vm/Cargo.toml @@ -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 = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } -move-bytecode-utils = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } -move-core-types = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097", features=["address32"] } -move-stdlib = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } -move-table-extension = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } -move-vm-runtime = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } -move-vm-types = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } -read-write-set-dynamic = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097"} +move-binary-format = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } +move-bytecode-utils = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } +move-core-types = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e", features=["address32"] } +move-stdlib = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } +move-table-extension = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } +move-vm-runtime = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } +move-vm-types = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } +read-write-set-dynamic = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e"} aptos-crypto = { path = "../../crates/aptos-crypto" } aptos-crypto-derive = { path = "../../crates/aptos-crypto-derive" } diff --git a/aptos-move/aptos-vm/src/aptos_vm.rs b/aptos-move/aptos-vm/src/aptos_vm.rs index 840ad4b4a062c..18c4f1f733c2d 100644 --- a/aptos-move/aptos-vm/src/aptos_vm.rs +++ b/aptos-move/aptos-vm/src/aptos_vm.rs @@ -128,8 +128,8 @@ impl AptosVM { if matches!(&**inner_type, Type::Signer) { signer_param_cnt += 1; } - }, - _ => () + } + _ => (), } } // validate all non_signer params diff --git a/aptos-move/e2e-tests-replay/Cargo.toml b/aptos-move/e2e-tests-replay/Cargo.toml index 60cf0f8395ead..d862710159ad6 100644 --- a/aptos-move/e2e-tests-replay/Cargo.toml +++ b/aptos-move/e2e-tests-replay/Cargo.toml @@ -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 = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } +move-stackless-bytecode-interpreter = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } 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 = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } -move-core-types = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097", features=["address32"] } -move-model = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } -move-vm-runtime = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } -move-vm-types = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } +move-binary-format = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } +move-core-types = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e", features=["address32"] } +move-model = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } +move-vm-runtime = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } +move-vm-types = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } diff --git a/aptos-move/e2e-tests/Cargo.toml b/aptos-move/e2e-tests/Cargo.toml index 329559f21d9e9..b27e034b1a013 100644 --- a/aptos-move/e2e-tests/Cargo.toml +++ b/aptos-move/e2e-tests/Cargo.toml @@ -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 = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } -move-command-line-common = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } -move-core-types = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097", features=["address32"] } -move-ir-compiler = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } -move-vm-runtime = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } -move-vm-types = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } -read-write-set = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } +move-binary-format = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } +move-command-line-common = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } +move-core-types = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e", features=["address32"] } +move-ir-compiler = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } +move-vm-runtime = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } +move-vm-types = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } +read-write-set = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } ## Diem-Move dependencies aptos-keygen = { path = "../aptos-keygen" } diff --git a/aptos-move/e2e-testsuite/Cargo.toml b/aptos-move/e2e-testsuite/Cargo.toml index 84cde9a30faec..1f68fcf9d0a86 100644 --- a/aptos-move/e2e-testsuite/Cargo.toml +++ b/aptos-move/e2e-testsuite/Cargo.toml @@ -13,13 +13,13 @@ publish = false proptest = "1.0.0" ## Move dependencies -move-core-types = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097", features=["address32"] } -move-ir-compiler = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } -move-vm-runtime = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } -move-vm-types = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } -move-binary-format = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } -move-bytecode-verifier = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } -read-write-set = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } +move-core-types = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e", features=["address32"] } +move-ir-compiler = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } +move-vm-runtime = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } +move-vm-types = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } +move-binary-format = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } +move-bytecode-verifier = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } +read-write-set = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } ## Aptos-Move dependencies aptos-keygen = { path = "../aptos-keygen" } diff --git a/aptos-move/framework/Cargo.toml b/aptos-move/framework/Cargo.toml index 7f0b9e1ddb5e8..8c8d149f24003 100644 --- a/aptos-move/framework/Cargo.toml +++ b/aptos-move/framework/Cargo.toml @@ -10,25 +10,25 @@ license = "Apache-2.0" publish = false [dependencies] -move-bytecode-verifier = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } -move-abigen = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } -move-docgen = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } -move-command-line-common = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } -move-errmapgen = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } -move-compiler = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } -move-prover = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } +move-bytecode-verifier = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } +move-abigen = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } +move-docgen = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } +move-command-line-common = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } +move-errmapgen = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } +move-compiler = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } +move-prover = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } aptos-crypto = { path = "../../crates/aptos-crypto" } aptos-types = { path = "../../types" } aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" } -move-binary-format = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } +move-binary-format = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } transaction-builder-generator = { path = "../transaction-builder-generator" } -move-stdlib = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } -move-symbol-pool = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } -move-core-types = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097", features=["address32"] } -move-vm-types = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } -move-vm-runtime = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } -move-package = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } -move-bytecode-utils = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } +move-stdlib = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } +move-symbol-pool = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } +move-core-types = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e", features=["address32"] } +move-vm-types = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } +move-vm-runtime = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } +move-package = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } +move-bytecode-utils = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } bcs = "0.1.2" anyhow = "1.0.52" @@ -45,12 +45,8 @@ tempfile = "3.2.0" [dev-dependencies] datatest-stable = "0.1.1" aptos-vm = { path = "../../aptos-move/aptos-vm" } -move-cli = { git = "https://github.com/move-language/move", rev = "476305d239ce6afafce15a297c8c3839dd8465b6" } -move-unit-test = { git = "https://github.com/move-language/move", rev = "476305d239ce6afafce15a297c8c3839dd8465b6" } -move-cli = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } -move-unit-test = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } -aptos-transactional-test-harness = { path = "../aptos-transactional-test-harness" } - +move-cli = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } +move-unit-test = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } dir-diff = "0.3.2" [features] diff --git a/aptos-move/framework/cached-packages/Cargo.toml b/aptos-move/framework/cached-packages/Cargo.toml index a3249c2cd8e0d..3ce814a94ca54 100644 --- a/aptos-move/framework/cached-packages/Cargo.toml +++ b/aptos-move/framework/cached-packages/Cargo.toml @@ -13,17 +13,17 @@ publish = false aptos-types = { path = "../../../types" } aptos-workspace-hack = { path = "../../../crates/aptos-workspace-hack" } bcs = "0.1.2" -move-core-types = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097", features=["address32"] } +move-core-types = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e", features=["address32"] } include_dir = { version = "0.7.2", features = ["glob"] } -move-binary-format = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } -move-bytecode-utils = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } +move-binary-format = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } +move-bytecode-utils = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } once_cell = "1.7.2" proptest = { version = "1.0.0", optional = true } proptest-derive = { version = "0.3.0", optional = true } [build-dependencies] -move-command-line-common = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } +move-command-line-common = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } framework = { path = ".." } [features] diff --git a/aptos-move/genesis-viewer/Cargo.toml b/aptos-move/genesis-viewer/Cargo.toml index 65cf9fae2ed1b..348d485e375ae 100644 --- a/aptos-move/genesis-viewer/Cargo.toml +++ b/aptos-move/genesis-viewer/Cargo.toml @@ -16,7 +16,7 @@ aptos-resource-viewer = { path = "../aptos-resource-viewer"} aptos-types = { path = "../../types" } aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" } cached-framework-packages = { path = "../framework/cached-packages" } -move-binary-format = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } -move-core-types = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097", features=["address32"] } -move-vm-test-utils = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } +move-binary-format = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } +move-core-types = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e", features=["address32"] } +move-vm-test-utils = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } vm-genesis = { path = "../vm-genesis" } diff --git a/aptos-move/move-examples/Cargo.toml b/aptos-move/move-examples/Cargo.toml index aebb0d1cb8740..a1e0d0ddaddf9 100644 --- a/aptos-move/move-examples/Cargo.toml +++ b/aptos-move/move-examples/Cargo.toml @@ -12,11 +12,11 @@ edition = "2018" aptos-vm = { path = "../aptos-vm" } aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" } structopt = "0.3.21" -move-compiler = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } -move-package = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } -move-stdlib = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } -move-unit-test = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } +move-compiler = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } +move-package = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } +move-stdlib = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } +move-unit-test = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } [dev-dependencies] -move-cli = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } +move-cli = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } tempfile = "3.2.0" diff --git a/aptos-move/transaction-builder-generator/Cargo.toml b/aptos-move/transaction-builder-generator/Cargo.toml index c7dc13038963a..2241b3dd9b681 100644 --- a/aptos-move/transaction-builder-generator/Cargo.toml +++ b/aptos-move/transaction-builder-generator/Cargo.toml @@ -20,7 +20,7 @@ textwrap = "0.13.4" aptos-types = { path = "../../types" } aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" } -move-core-types = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097", features=["address32"] } +move-core-types = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e", features=["address32"] } serde-reflection = { git = "https://github.com/aptos-labs/serde-reflection" } serde-generate = { git = "https://github.com/aptos-labs/serde-reflection" } diff --git a/aptos-move/transaction-replay/Cargo.toml b/aptos-move/transaction-replay/Cargo.toml index 659a6e634b4cb..31daa93d9c0d7 100644 --- a/aptos-move/transaction-replay/Cargo.toml +++ b/aptos-move/transaction-replay/Cargo.toml @@ -25,13 +25,13 @@ aptos-vm = { path = "../aptos-vm" } aptosdb = { path = "../../storage/aptosdb" } cached-framework-packages = { path = "../framework/cached-packages" } framework = { path = "../framework" } -move-binary-format = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097"} -move-cli = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } -move-compiler = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } -move-core-types = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097", features=["address32"] } -move-vm-runtime = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } -move-vm-test-utils = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } -move-vm-types = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } +move-binary-format = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e"} +move-cli = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } +move-compiler = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } +move-core-types = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e", features=["address32"] } +move-vm-runtime = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } +move-vm-test-utils = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } +move-vm-types = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } [dev-dependencies] vm-genesis = { path = "../vm-genesis" } diff --git a/aptos-move/vm-genesis/Cargo.toml b/aptos-move/vm-genesis/Cargo.toml index f5870a0ee78ea..5aafa36576f31 100644 --- a/aptos-move/vm-genesis/Cargo.toml +++ b/aptos-move/vm-genesis/Cargo.toml @@ -24,13 +24,13 @@ aptos-vm = { path = "../aptos-vm" } aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" } cached-framework-packages = { path = "../framework/cached-packages" } framework = { path = "../framework" } -move-binary-format = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } -move-bytecode-utils = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } -move-bytecode-verifier = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } -move-core-types = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097", features=["address32"] } -move-vm-runtime = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097"} -move-vm-types = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } -read-write-set = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } +move-binary-format = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } +move-bytecode-utils = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } +move-bytecode-verifier = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } +move-core-types = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e", features=["address32"] } +move-vm-runtime = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e"} +move-vm-types = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } +read-write-set = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } [dev-dependencies] proptest = "1.0.0" diff --git a/aptos-move/writeset-transaction-generator/Cargo.toml b/aptos-move/writeset-transaction-generator/Cargo.toml index a21f211de3cb1..dc79b586c1577 100644 --- a/aptos-move/writeset-transaction-generator/Cargo.toml +++ b/aptos-move/writeset-transaction-generator/Cargo.toml @@ -28,11 +28,11 @@ aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" } aptosdb = { path = "../../storage/aptosdb" } cached-framework-packages = { path = "../framework/cached-packages" } framework = { path = "../framework" } -move-binary-format = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097"} -move-bytecode-verifier = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } -move-compiler = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } -move-core-types = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097", features=["address32"] } -move-vm-runtime = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } -move-vm-test-utils = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } -move-vm-types = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } -read-write-set = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } +move-binary-format = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e"} +move-bytecode-verifier = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } +move-compiler = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } +move-core-types = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e", features=["address32"] } +move-vm-runtime = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } +move-vm-test-utils = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } +move-vm-types = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } +read-write-set = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } diff --git a/crates/aptos-rest-client/Cargo.toml b/crates/aptos-rest-client/Cargo.toml index 921a52569b5d3..3a6e70474348e 100644 --- a/crates/aptos-rest-client/Cargo.toml +++ b/crates/aptos-rest-client/Cargo.toml @@ -28,4 +28,4 @@ aptos-crypto = { path = "../aptos-crypto" } aptos-transaction-builder = { path = "../../sdk/transaction-builder" } aptos-types = { path = "../../types" } aptos-workspace-hack = { version = "0.1", path = "../aptos-workspace-hack" } -move-core-types = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097", features=["address32"] } +move-core-types = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e", features=["address32"] } diff --git a/crates/aptos/Cargo.toml b/crates/aptos/Cargo.toml index e75adfd7739a2..9609a38c415f3 100644 --- a/crates/aptos/Cargo.toml +++ b/crates/aptos/Cargo.toml @@ -40,9 +40,9 @@ aptos-vm = { path = "../../aptos-move/aptos-vm" } bcs = "0.1.2" short-hex-str = { path = "../short-hex-str" } cached-framework-packages = { path = "../../aptos-move/framework/cached-packages" } -move-binary-format = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } -move-cli = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } -move-core-types = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097", features=["address32"] } -move-package = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } -move-unit-test = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } -move-vm-types = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } +move-binary-format = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } +move-cli = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } +move-core-types = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e", features=["address32"] } +move-package = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } +move-unit-test = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } +move-vm-types = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } diff --git a/execution/executor/Cargo.toml b/execution/executor/Cargo.toml index 4d58ff036e52b..b5ec7b45abbc3 100644 --- a/execution/executor/Cargo.toml +++ b/execution/executor/Cargo.toml @@ -26,7 +26,7 @@ aptos-infallible = { path = "../../crates/aptos-infallible" } aptos-secure-net = { path = "../../secure/net" } aptos-state-view = { path = "../../storage/state-view" } aptos-types = { path = "../../types" } -move-core-types = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097", features=["address32"] } +move-core-types = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e", features=["address32"] } aptos-vm = { path = "../../aptos-move/aptos-vm" } aptos-workspace-hack = { version = "0.1", path = "../../crates/aptos-workspace-hack" } scratchpad = { path = "../../storage/scratchpad" } @@ -41,7 +41,7 @@ aptos-config = { path = "../../config" } aptos-genesis-tool = {path = "../../config/management/genesis", features = ["testing"] } aptos-temppath = { path = "../../crates/aptos-temppath" } aptosdb = { path = "../../storage/aptosdb" } -move-ir-compiler = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } +move-ir-compiler = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } storage-interface = { path = "../../storage/storage-interface", features=["fuzzing"] } aptos-transaction-builder = { path = "../../sdk/transaction-builder" } vm-genesis = { path = "../../aptos-move/vm-genesis" } diff --git a/network/discovery/Cargo.toml b/network/discovery/Cargo.toml index 4b3fc98b13fc9..2d2192344b39b 100644 --- a/network/discovery/Cargo.toml +++ b/network/discovery/Cargo.toml @@ -27,7 +27,7 @@ aptos-time-service = {path = "../../crates/aptos-time-service"} aptos-secure-storage = { path = "../../secure/storage" } aptos-types = {path = "../../types"} aptos-workspace-hack = { version = "0.1", path = "../../crates/aptos-workspace-hack" } -move-core-types = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097", features=["address32"] } +move-core-types = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e", features=["address32"] } network = {path = "../../network"} short-hex-str = { path = "../../crates/short-hex-str" } diff --git a/sdk/Cargo.toml b/sdk/Cargo.toml index 5882f1eda62da..45e26ac2935e6 100644 --- a/sdk/Cargo.toml +++ b/sdk/Cargo.toml @@ -16,6 +16,6 @@ serde = { version = "1.0.124", features = ["derive"] } aptos-crypto = { path = "../crates/aptos-crypto" } aptos-types = { path = "../types" } -move-core-types = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097", features=["address32"] } +move-core-types = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e", features=["address32"] } aptos-transaction-builder = { path = "./transaction-builder" } aptos-workspace-hack = { version = "0.1", path = "../crates/aptos-workspace-hack" } diff --git a/sdk/transaction-builder/Cargo.toml b/sdk/transaction-builder/Cargo.toml index 64fd9eb2149c4..97ef88c938be4 100644 --- a/sdk/transaction-builder/Cargo.toml +++ b/sdk/transaction-builder/Cargo.toml @@ -13,7 +13,7 @@ edition = "2018" bcs = "0.1.2" once_cell = "1.7.2" -move-core-types = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097", features=["address32"] } +move-core-types = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e", features=["address32"] } aptos-types = { path = "../../types" } proptest-derive = { version = "0.3.0", optional = true } aptos-workspace-hack = { version = "0.1", path = "../../crates/aptos-workspace-hack" } @@ -22,7 +22,7 @@ cached-framework-packages = {path = "../../aptos-move/framework/cached-packages" [dev-dependencies] proptest = "1.0.0" proptest-derive = "0.3.0" -move-core-types = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097", features = ["fuzzing", "address32"] } +move-core-types = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e", features = ["fuzzing", "address32"] } [features] default = [] diff --git a/state-sync/inter-component/consensus-notifications/Cargo.toml b/state-sync/inter-component/consensus-notifications/Cargo.toml index 92b4913335d7a..ea8668a7ccb1b 100644 --- a/state-sync/inter-component/consensus-notifications/Cargo.toml +++ b/state-sync/inter-component/consensus-notifications/Cargo.toml @@ -23,4 +23,4 @@ aptos-workspace-hack = { version = "0.1", path = "../../../crates/aptos-workspac [dev-dependencies] claim = "0.5.0" -move-core-types = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097", features=["address32"] } +move-core-types = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e", features=["address32"] } diff --git a/state-sync/inter-component/event-notifications/Cargo.toml b/state-sync/inter-component/event-notifications/Cargo.toml index af8d8fd9a7a1b..34a98a4ebf644 100644 --- a/state-sync/inter-component/event-notifications/Cargo.toml +++ b/state-sync/inter-component/event-notifications/Cargo.toml @@ -32,5 +32,5 @@ aptos-temppath = { path = "../../../crates/aptos-temppath" } aptos-vm = { path = "../../../aptos-move/aptos-vm" } aptosdb = { path = "../../../storage/aptosdb" } executor-test-helpers = { path = "../../../execution/executor-test-helpers" } -move-core-types = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097", features=["address32"] } +move-core-types = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e", features=["address32"] } vm-genesis = { path = "../../../aptos-move/vm-genesis", features = ["fuzzing"] } diff --git a/state-sync/state-sync-v1/Cargo.toml b/state-sync/state-sync-v1/Cargo.toml index c85d9bc454eec..b76eb60e44c51 100644 --- a/state-sync/state-sync-v1/Cargo.toml +++ b/state-sync/state-sync-v1/Cargo.toml @@ -62,7 +62,7 @@ aptos-proptest-helpers = { path = "../../crates/aptos-proptest-helpers" } aptosdb = { path = "../../storage/aptosdb" } executor-test-helpers = { path = "../../execution/executor-test-helpers" } memsocket = { path = "../../network/memsocket" } -move-core-types = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097", features=["address32"] } +move-core-types = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e", features=["address32"] } network = { path = "../../network", features = ["fuzzing", "testing"] } network-builder = { path = "../../network/builder" } storage-service = { path = "../../storage/storage-service" } diff --git a/state-sync/state-sync-v2/state-sync-driver/Cargo.toml b/state-sync/state-sync-v2/state-sync-driver/Cargo.toml index d969416f3059b..75c15bff1963f 100644 --- a/state-sync/state-sync-v2/state-sync-driver/Cargo.toml +++ b/state-sync/state-sync-v2/state-sync-driver/Cargo.toml @@ -46,7 +46,7 @@ aptos-temppath = { path = "../../../crates/aptos-temppath" } aptos-time-service = { path = "../../../crates/aptos-time-service", features = ["async", "testing"] } aptos-vm = { path = "../../../aptos-move/aptos-vm" } executor-test-helpers = { path = "../../../execution/executor-test-helpers" } -move-core-types = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097", features=["address32"] } +move-core-types = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e", features=["address32"] } network = { path = "../../../network", features = ["fuzzing"] } storage-service-client = { path = "../../storage-service/client" } vm-genesis = { path = "../../../aptos-move/vm-genesis", features = ["fuzzing"] } diff --git a/state-sync/storage-service/server/Cargo.toml b/state-sync/storage-service/server/Cargo.toml index fcf72e523f49a..912099a84a899 100644 --- a/state-sync/storage-service/server/Cargo.toml +++ b/state-sync/storage-service/server/Cargo.toml @@ -38,5 +38,5 @@ claim = "0.5.0" aptos-crypto = { path = "../../../crates/aptos-crypto" } aptos-time-service = { path = "../../../crates/aptos-time-service", features = ["async", "testing"] } aptos-types = { path = "../../../types" } -move-core-types = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097", features=["address32"] } +move-core-types = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e", features=["address32"] } storage-interface = { path = "../../../storage/storage-interface" } diff --git a/storage/aptosdb/Cargo.toml b/storage/aptosdb/Cargo.toml index b6f033f85898e..95839c2a69f73 100644 --- a/storage/aptosdb/Cargo.toml +++ b/storage/aptosdb/Cargo.toml @@ -35,7 +35,7 @@ aptos-temppath = { path = "../../crates/aptos-temppath", optional = true } aptos-types = { path = "../../types" } aptos-workspace-hack = { version = "0.1", path = "../../crates/aptos-workspace-hack" } executor-types = { path = "../../execution/executor-types", optional = true } -move-core-types = {git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097", features=["address32"]} +move-core-types = {git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e", features=["address32"]} num-variants = { path = "../../crates/num-variants" } schemadb = { path = "../schemadb" } scratchpad = { path = "../scratchpad", optional = true } diff --git a/storage/storage-interface/Cargo.toml b/storage/storage-interface/Cargo.toml index c2f362c68e99a..9cee836cdb75d 100644 --- a/storage/storage-interface/Cargo.toml +++ b/storage/storage-interface/Cargo.toml @@ -22,7 +22,7 @@ aptos-state-view = { path = "../state-view" } aptos-types = { path = "../../types" } aptos-workspace-hack = { version = "0.1", path = "../../crates/aptos-workspace-hack" } scratchpad = { path = "../scratchpad" } -move-core-types = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097", features=["address32"] } +move-core-types = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e", features=["address32"] } [features] default = [] diff --git a/testsuite/aptos-fuzzer/Cargo.toml b/testsuite/aptos-fuzzer/Cargo.toml index 4f6da32153a88..96431c109ca7a 100644 --- a/testsuite/aptos-fuzzer/Cargo.toml +++ b/testsuite/aptos-fuzzer/Cargo.toml @@ -39,14 +39,14 @@ aptos-mempool = { path = "../../mempool" } aptos-types = { path = "../../types", features = ["fuzzing"] } aptos-vault-client = { path = "../../secure/storage/vault", features = ["fuzzing"] } aptosdb = { path = "../../storage/aptosdb", features = ["fuzzing"] } -move-vm-types = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097", features = ["fuzzing"] } -move-core-types = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097", features = ["fuzzing", "address32"] } +move-vm-types = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e", features = ["fuzzing"] } +move-core-types = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e", features = ["fuzzing", "address32"] } network = { path = "../../network", features = ["fuzzing"] } safety-rules = { path = "../../consensus/safety-rules", features = ["fuzzing", "testing"] } scratchpad = { path = "../../storage/scratchpad", features = ["fuzzing"]} state-sync-v1 = { path = "../../state-sync/state-sync-v1", features = ["fuzzing", "aptosdb"] } storage-interface = { path = "../../storage/storage-interface" } -move-binary-format = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097", features = ["fuzzing"] } +move-binary-format = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e", features = ["fuzzing"] } [dev-dependencies] rusty-fork = "0.3.0" diff --git a/testsuite/generate-format/Cargo.toml b/testsuite/generate-format/Cargo.toml index 141382e8f5595..22e03657ea9e8 100644 --- a/testsuite/generate-format/Cargo.toml +++ b/testsuite/generate-format/Cargo.toml @@ -25,7 +25,7 @@ aptos-crypto-derive = { path = "../../crates/aptos-crypto-derive"} aptos-types = { path = "../../types", features=["fuzzing"] } aptos-workspace-hack = { version = "0.1", path = "../../crates/aptos-workspace-hack" } network = { path = "../../network" } -move-core-types = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097", features=["fuzzing", "address32"] } +move-core-types = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e", features=["fuzzing", "address32"] } [[bin]] name = "compute" diff --git a/testsuite/smoke-test/Cargo.toml b/testsuite/smoke-test/Cargo.toml index abb95625322cb..b698e0fc9392c 100644 --- a/testsuite/smoke-test/Cargo.toml +++ b/testsuite/smoke-test/Cargo.toml @@ -31,10 +31,10 @@ aptos-workspace-hack = { version = "0.1", path = "../../crates/aptos-workspace-h cached-framework-packages = { path = "../../aptos-move/framework/cached-packages" } forge = { path = "../forge" } hex = "0.4.3" -move-command-line-common = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } -move-ir-compiler = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } -move-stdlib = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } -move-package = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } +move-command-line-common = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } +move-ir-compiler = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } +move-stdlib = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } +move-package = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } [dev-dependencies] diff --git a/types/Cargo.toml b/types/Cargo.toml index 101d2344cf490..4fa8133b47d3a 100644 --- a/types/Cargo.toml +++ b/types/Cargo.toml @@ -31,8 +31,8 @@ tiny-keccak = { version = "2.0.2", default-features = false, features = ["sha3"] bcs = "0.1.2" aptos-crypto = { path = "../crates/aptos-crypto" } aptos-crypto-derive = { path = "../crates/aptos-crypto-derive" } -move-core-types = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097", features=["address32"] } -move-read-write-set-types = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" } +move-core-types = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e", features=["address32"] } +move-read-write-set-types = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" } aptos-workspace-hack = { version = "0.1", path = "../crates/aptos-workspace-hack" } [dev-dependencies] @@ -42,7 +42,7 @@ proptest-derive = "0.3.0" serde_json = "1.0.64" aptos-crypto = { path = "../crates/aptos-crypto", features = ["fuzzing"] } -move-core-types = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097", features = ["fuzzing","address32"] } +move-core-types = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e", features = ["fuzzing","address32"] } [features] default = [] diff --git a/vm-validator/Cargo.toml b/vm-validator/Cargo.toml index a22e637bd22cc..96e9528fa4e69 100644 --- a/vm-validator/Cargo.toml +++ b/vm-validator/Cargo.toml @@ -30,7 +30,7 @@ aptos-types = { path = "../types", features = ["fuzzing"] } aptos-vm = { path = "../aptos-move/aptos-vm" } aptosdb = { path = "../storage/aptosdb", features = ["fuzzing"] } vm-genesis = { path = "../aptos-move/vm-genesis" } -move-core-types = { git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097", features=["address32"] } +move-core-types = { git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e", features=["address32"] } [features] default = [] diff --git a/x.toml b/x.toml index 19757b1c37a35..5da7d2a6f3718 100644 --- a/x.toml +++ b/x.toml @@ -78,11 +78,11 @@ third-party = [ # Exclude the fail crate because the failpoints feature should only be enabled # for certain builds. { name = "fail" }, - { name = "move-binary-format", git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" }, - { name = "move-core-types", git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097", features=["address32"] }, - { name = "move-stdlib", git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" }, - { name = "move-vm-runtime", git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" }, - { name = "move-vm-types", git = "https://github.com/move-language/move", rev = "a8d6aa915d4cdcdbd16151f0941b85da8c50e097" }, + { name = "move-binary-format", git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" }, + { name = "move-core-types", git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e", features=["address32"] }, + { name = "move-stdlib", git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" }, + { name = "move-vm-runtime", git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" }, + { name = "move-vm-types", git = "https://github.com/move-language/move", rev = "1b6b7513dcc1a5c866f178ca5c1e74beb2ce181e" }, ] # This follows the same syntax as CargoOptionsSummary in guppy.