[language] move crates in diem-tools to diem/diem-move

Closes: aptos-labs#9561
GS- · Oct 28, 2021 · b208105 · b208105
1 parent 6b0637d
commit b208105
Show file tree

Hide file tree

Showing 100 changed files with 243 additions and 254 deletions.
diff --git a/.gitignore b/.gitignore
@@ -37,7 +37,7 @@ Temporary Items
 .apdisk
 
 # Generated VM config in vm-genesis
-language/tools/vm-genesis/genesis/vm_config.toml
+diem-move/vm-genesis/genesis/vm_config.toml
 
 # Terraform
 .terraform/

diff --git a/Cargo.toml b/Cargo.toml
@@ -46,6 +46,17 @@ members = [
     "devtools/x",
     "devtools/x-core",
     "devtools/x-lint",
+    "diem-move/df-cli",
+    "diem-move/diem-events-fetcher",
+    "diem-move/diem-keygen",
+    "diem-move/diem-resource-viewer",
+    "diem-move/diem-validator-interface",
+    "diem-move/e2e-tests-replay",
+    "diem-move/genesis-viewer",
+    "diem-move/oncall-trainer",
+    "diem-move/transaction-replay",
+    "diem-move/vm-genesis",
+    "diem-move/writeset-transaction-generator",
     "diem-node",
     "execution/db-bootstrapper",
     "execution/execution-correctness",
@@ -69,14 +80,6 @@ members = [
     "language/compiler/ir-to-bytecode/syntax",
     "language/diem-framework",
     "language/diem-framework/DPN/releases",
-    "language/diem-tools/df-cli",
-    "language/diem-tools/diem-events-fetcher",
-    "language/diem-tools/diem-keygen",
-    "language/diem-tools/diem-validator-interface",
-    "language/diem-tools/e2e-tests-replay",
-    "language/diem-tools/oncall-trainer",
-    "language/diem-tools/transaction-replay",
-    "language/diem-tools/writeset-transaction-generator",
     "language/diem-transaction-benchmarks",
     "language/diem-vm",
     "language/diem-vm/mvhashmap",
@@ -119,9 +122,7 @@ members = [
     "language/testing-infra/module-generation",
     "language/testing-infra/test-generation",
     "language/testing-infra/transactional-test-runner",
-    "language/tools/diem-resource-viewer",
     "language/tools/disassembler",
-    "language/tools/genesis-viewer",
     "language/tools/mirai-dataflow-analysis",
     "language/tools/move-bytecode-utils",
     "language/tools/move-bytecode-viewer",
@@ -134,7 +135,6 @@ members = [
     "language/tools/read-write-set/dynamic",
     "language/tools/read-write-set/types",
     "language/tools/resource-viewer",
-    "language/tools/vm-genesis",
     "language/transaction-builder/generator",
     "mempool",
     "network",
@@ -225,14 +225,14 @@ default-members = [
     "language/move-stdlib",
     "language/tools/disassembler",
     "language/tools/move-bytecode-viewer",
-    "language/tools/genesis-viewer",
     "language/tools/move-cli",
     "language/tools/move-coverage",
     "language/tools/move-unit-test",
-    "language/diem-tools/df-cli",
-    "language/diem-tools/diem-events-fetcher",
-    "language/diem-tools/transaction-replay",
-    "language/diem-tools/writeset-transaction-generator",
+    "diem-move/df-cli",
+    "diem-move/diem-events-fetcher",
+    "diem-move/genesis-viewer",
+    "diem-move/transaction-replay",
+    "diem-move/writeset-transaction-generator",
     "language/tools/move-explain",
     "language/transaction-builder/generator",
     "diem-node",

diff --git a/config/management/genesis/Cargo.toml b/config/management/genesis/Cargo.toml
@@ -34,7 +34,7 @@ diem-temppath = { path = "../../../common/temppath" }
 diem-vm = { path = "../../../language/diem-vm" }
 diemdb = { path = "../../../storage/diemdb" }
 storage-interface = { path = "../../../storage/storage-interface" }
-vm-genesis = { path = "../../../language/tools/vm-genesis" }
+vm-genesis = { path = "../../../diem-move/vm-genesis" }
 
 [dev-dependencies]
 diem-config = { path = "../..", features = ["fuzzing"]}

diff --git a/consensus/Cargo.toml b/consensus/Cargo.toml
@@ -65,7 +65,7 @@ diem-config = { path = "../config", features = ["fuzzing"] }
 diem-mempool = { path = "../mempool", features = ["fuzzing"] }
 network = { path = "../network", features = ["fuzzing"] }
 safety-rules = { path = "safety-rules", features = ["testing"] }
-vm-genesis = { path = "../language/tools/vm-genesis" }
+vm-genesis = { path = "../diem-move/vm-genesis" }
 vm-validator = { path = "../vm-validator" }
 
 [features]

diff --git a/language/diem-tools/df-cli/Cargo.toml → diem-move/df-cli/Cargo.toml b/language/diem-tools/df-cli/Cargo.toml → diem-move/df-cli/Cargo.toml
@@ -14,11 +14,11 @@ anyhow = "1.0.38"
 bcs = "0.1.2"
 structopt = "0.3.21"
 
-diem-workspace-hack = { path = "../../../common/workspace-hack" }
-move-core-types = { path = "../../move-core/types" }
-move-cli = { path = "../../tools/move-cli" }
-diem-vm = { path = "../../diem-vm" }
-diem-framework-releases = { path = "../../diem-framework/DPN/releases" }
+diem-workspace-hack = { path = "../../common/workspace-hack" }
+move-core-types = { path = "../../language/move-core/types" }
+move-cli = { path = "../../language/tools/move-cli" }
+diem-vm = { path = "../../language/diem-vm" }
+diem-framework-releases = { path = "../../language/diem-framework/DPN/releases" }
 
 [dev-dependencies]
 datatest-stable = "0.1.1"

diff --git a/language/diem-tools/df-cli/src/main.rs → diem-move/df-cli/src/main.rs b/language/diem-tools/df-cli/src/main.rs → diem-move/df-cli/src/main.rs
diff --git a/.../diem-tools/df-cli/tests/cli_testsuite.rs → diem-move/df-cli/tests/cli_testsuite.rs b/.../diem-tools/df-cli/tests/cli_testsuite.rs → diem-move/df-cli/tests/cli_testsuite.rs
@@ -8,7 +8,7 @@ use std::path::{Path, PathBuf};
 fn run_all(args_path: &Path) -> datatest_stable::Result<()> {
     test::run_one(
         args_path,
-        &PathBuf::from("../../../target/debug/df-cli"),
+        &PathBuf::from("../../target/debug/df-cli"),
         /* use_temp_dir */ true,
         /* track_cov */ false,
     )?;

diff --git a/...li/tests/testsuite/compare_smoke/args.exp → ...li/tests/testsuite/compare_smoke/args.exp b/...li/tests/testsuite/compare_smoke/args.exp → ...li/tests/testsuite/compare_smoke/args.exp
diff --git a/...li/tests/testsuite/compare_smoke/args.txt → ...li/tests/testsuite/compare_smoke/args.txt b/...li/tests/testsuite/compare_smoke/args.txt → ...li/tests/testsuite/compare_smoke/args.txt
diff --git a/...ompare_smoke/src/modules/NameService.move → ...ompare_smoke/src/modules/NameService.move b/...ompare_smoke/src/modules/NameService.move → ...ompare_smoke/src/modules/NameService.move
diff --git a/...e_smoke/src/modules/NonFungibleToken.move → ...e_smoke/src/modules/NonFungibleToken.move b/...e_smoke/src/modules/NonFungibleToken.move → ...e_smoke/src/modules/NonFungibleToken.move
diff --git a/...tsuite/compare_smoke/src/modules/Set.move → ...tsuite/compare_smoke/src/modules/Set.move b/...tsuite/compare_smoke/src/modules/Set.move → ...tsuite/compare_smoke/src/modules/Set.move
diff --git a/...e/src/modules/SimpleSortedLinkedList.move → ...e/src/modules/SimpleSortedLinkedList.move b/...e/src/modules/SimpleSortedLinkedList.move → ...e/src/modules/SimpleSortedLinkedList.move
diff --git a/...e_smoke/src/modules/SortedLinkedList.move → ...e_smoke/src/modules/SortedLinkedList.move b/...e_smoke/src/modules/SortedLinkedList.move → ...e_smoke/src/modules/SortedLinkedList.move
diff --git a/...tsuite/compare_smoke/src/scripts/set.move → ...tsuite/compare_smoke/src/scripts/set.move b/...tsuite/compare_smoke/src/scripts/set.move → ...tsuite/compare_smoke/src/scripts/set.move
diff --git a/.../concretize_read_write_set_smoke/args.exp → .../concretize_read_write_set_smoke/args.exp b/.../concretize_read_write_set_smoke/args.exp → .../concretize_read_write_set_smoke/args.exp
diff --git a/.../concretize_read_write_set_smoke/args.txt → .../concretize_read_write_set_smoke/args.txt b/.../concretize_read_write_set_smoke/args.txt → .../concretize_read_write_set_smoke/args.txt
diff --git a/...cretize_read_write_set_smoke/genesis.move → ...cretize_read_write_set_smoke/genesis.move b/...cretize_read_write_set_smoke/genesis.move → ...cretize_read_write_set_smoke/genesis.move
diff --git a/...tsuite/diem_read_write_set_smoke/args.exp → ...tsuite/diem_read_write_set_smoke/args.exp b/...tsuite/diem_read_write_set_smoke/args.exp → ...tsuite/diem_read_write_set_smoke/args.exp
diff --git a/...tsuite/diem_read_write_set_smoke/args.txt → ...tsuite/diem_read_write_set_smoke/args.txt b/...tsuite/diem_read_write_set_smoke/args.txt → ...tsuite/diem_read_write_set_smoke/args.txt
diff --git a/...ad_write_set_smoke/src/modules/Dummy.move → ...ad_write_set_smoke/src/modules/Dummy.move b/...ad_write_set_smoke/src/modules/Dummy.move → ...ad_write_set_smoke/src/modules/Dummy.move
diff --git a/...f-cli/tests/testsuite/diem_smoke/args.exp → ...f-cli/tests/testsuite/diem_smoke/args.exp b/...f-cli/tests/testsuite/diem_smoke/args.exp → ...f-cli/tests/testsuite/diem_smoke/args.exp
diff --git a/...f-cli/tests/testsuite/diem_smoke/args.txt → ...f-cli/tests/testsuite/diem_smoke/args.txt b/...f-cli/tests/testsuite/diem_smoke/args.txt → ...f-cli/tests/testsuite/diem_smoke/args.txt
diff --git a/...i/tests/testsuite/diem_smoke/genesis.move → ...i/tests/testsuite/diem_smoke/genesis.move b/...i/tests/testsuite/diem_smoke/genesis.move → ...i/tests/testsuite/diem_smoke/genesis.move
diff --git a/...ke/scripts/create_child_vasp_account.move → ...ke/scripts/create_child_vasp_account.move b/...ke/scripts/create_child_vasp_account.move → ...ke/scripts/create_child_vasp_account.move
diff --git a/...oke/scripts/create_designated_dealer.move → ...oke/scripts/create_designated_dealer.move b/...oke/scripts/create_designated_dealer.move → ...oke/scripts/create_designated_dealer.move
diff --git a/...e/scripts/create_parent_vasp_account.move → ...e/scripts/create_parent_vasp_account.move b/...e/scripts/create_parent_vasp_account.move → ...e/scripts/create_parent_vasp_account.move
diff --git a/...e/scripts/peer_to_peer_with_metadata.move → ...e/scripts/peer_to_peer_with_metadata.move b/...e/scripts/peer_to_peer_with_metadata.move → ...e/scripts/peer_to_peer_with_metadata.move
diff --git a/...suite/diem_smoke/scripts/tiered_mint.move → ...suite/diem_smoke/scripts/tiered_mint.move b/...suite/diem_smoke/scripts/tiered_mint.move → ...suite/diem_smoke/scripts/tiered_mint.move
diff --git a/...diem-tools/diem-events-fetcher/Cargo.toml → diem-move/diem-events-fetcher/Cargo.toml b/...diem-tools/diem-events-fetcher/Cargo.toml → diem-move/diem-events-fetcher/Cargo.toml
@@ -19,7 +19,7 @@ structopt = "0.3.21"
 futures = "0.3.12"
 tokio = { version = "1.8.1", features = ["full"] }
 
-diem-workspace-hack = { path = "../../../common/workspace-hack" }
-diem-client = { path = "../../../sdk/client" }
-diem-types = { path = "../../../types" }
+diem-workspace-hack = { path = "../../common/workspace-hack" }
+diem-client = { path = "../../sdk/client" }
+diem-types = { path = "../../types" }
 bcs = "0.1.2"
diff --git a/...diem-tools/diem-events-fetcher/src/lib.rs → diem-move/diem-events-fetcher/src/lib.rs b/...diem-tools/diem-events-fetcher/src/lib.rs → diem-move/diem-events-fetcher/src/lib.rs
diff --git a/...iem-tools/diem-events-fetcher/src/main.rs → diem-move/diem-events-fetcher/src/main.rs b/...iem-tools/diem-events-fetcher/src/main.rs → diem-move/diem-events-fetcher/src/main.rs
diff --git a/language/diem-tools/diem-keygen/Cargo.toml → diem-move/diem-keygen/Cargo.toml b/language/diem-tools/diem-keygen/Cargo.toml → diem-move/diem-keygen/Cargo.toml
@@ -14,6 +14,6 @@ rand = "0.8.3"
 sha3 = "0.9.1"
 hex = "0.4.3"
 
-diem-crypto = { path = "../../../crypto/crypto" }
-diem-types = { path = "../../../types" }
-diem-workspace-hack = { path = "../../../common/workspace-hack" }
+diem-crypto = { path = "../../crypto/crypto" }
+diem-types = { path = "../../types" }
+diem-workspace-hack = { path = "../../common/workspace-hack" }
diff --git a/language/diem-tools/diem-keygen/src/lib.rs → diem-move/diem-keygen/src/lib.rs b/language/diem-tools/diem-keygen/src/lib.rs → diem-move/diem-keygen/src/lib.rs
diff --git a/language/diem-tools/diem-keygen/src/main.rs → diem-move/diem-keygen/src/main.rs b/language/diem-tools/diem-keygen/src/main.rs → diem-move/diem-keygen/src/main.rs
diff --git a/...age/tools/diem-resource-viewer/Cargo.toml → diem-move/diem-resource-viewer/Cargo.toml b/...age/tools/diem-resource-viewer/Cargo.toml → diem-move/diem-resource-viewer/Cargo.toml
@@ -10,10 +10,10 @@ publish = false
 edition = "2018"
 
 [dependencies]
-diem-workspace-hack = { path = "../../../common/workspace-hack" }
-resource-viewer = { path = "../resource-viewer" }
-diem-types = { path = "../../../types"  }
-move-core-types = { path = "../../move-core/types" }
-move-binary-format = { path = "../../move-binary-format" }
+diem-workspace-hack = { path = "../../common/workspace-hack" }
+resource-viewer = { path = "../../language/tools/resource-viewer" }
+diem-types = { path = "../../types"  }
+move-core-types = { path = "../../language/move-core/types" }
+move-binary-format = { path = "../../language/move-binary-format" }
 
 anyhow = "1.0.38"
diff --git a/...age/tools/diem-resource-viewer/src/lib.rs → diem-move/diem-resource-viewer/src/lib.rs b/...age/tools/diem-resource-viewer/src/lib.rs → diem-move/diem-resource-viewer/src/lib.rs
diff --git a/diem-move/diem-validator-interface/Cargo.toml b/diem-move/diem-validator-interface/Cargo.toml
@@ -0,0 +1,23 @@
+[package]
+name = "diem-validator-interface"
+version = "0.1.0"
+authors = ["Diem Association <[email protected]>"]
+description = "Defines interfaces between the diem nodes and local move infrastructure"
+repository = "https://github.com/diem/diem"
+homepage = "https://diem.com"
+license = "Apache-2.0"
+publish = false
+edition = "2018"
+
+[dependencies]
+anyhow = "1.0.38"
+diem-config = { path = "../../config" }
+diem-client = { path = "../../sdk/client" }
+diem-types = { path = "../../types" }
+diemdb = { path = "../../storage/diemdb" }
+diem-workspace-hack = { path = "../../common/workspace-hack" }
+storage-interface = { path = "../../storage/storage-interface" }
+scratchpad = { path = "../../storage/scratchpad" }
+diem-state-view = { path = "../../storage/state-view" }
+move-binary-format = { path = "../../language/move-binary-format" }
+bcs = "0.1.2"
diff --git a/...dator-interface/src/json_rpc_interface.rs → ...dator-interface/src/json_rpc_interface.rs b/...dator-interface/src/json_rpc_interface.rs → ...dator-interface/src/json_rpc_interface.rs
diff --git a/...tools/diem-validator-interface/src/lib.rs → ...-move/diem-validator-interface/src/lib.rs b/...tools/diem-validator-interface/src/lib.rs → ...-move/diem-validator-interface/src/lib.rs
diff --git a/...idator-interface/src/storage_interface.rs → ...idator-interface/src/storage_interface.rs b/...idator-interface/src/storage_interface.rs → ...idator-interface/src/storage_interface.rs
diff --git a/diem-move/e2e-tests-replay/Cargo.toml b/diem-move/e2e-tests-replay/Cargo.toml
@@ -0,0 +1,26 @@
+[package]
+name = "diem-e2e-tests-replay"
+version = "0.1.0"
+authors = ["Diem Association <[email protected]>"]
+description = "A tool that reconstructs and replays test cases from the trace dump of E2E tests"
+license = "Apache-2.0"
+edition = "2018"
+publish = false
+
+[dependencies]
+anyhow = "1.0.38"
+bcs = "0.1.2"
+structopt = "0.3.21"
+walkdir = "2.3.1"
+
+diem-workspace-hack = { path = "../../common/workspace-hack" }
+bytecode-interpreter = { path = "../../language/move-prover/interpreter" }
+diem-types = { path = "../../types", features = ["fuzzing"] }
+diem-framework = { path = "../../language/diem-framework" }
+diem-vm = { path = "../../language/diem-vm" }
+language-e2e-tests = { path = "../../language/testing-infra/e2e-tests" }
+move-binary-format = { path = "../../language/move-binary-format" }
+move-core-types = { path = "../../language/move-core/types" }
+move-model = { path = "../../language/move-model" }
+move-vm-runtime = { path = "../../language/move-vm/runtime" }
+move-vm-types = { path = "../../language/move-vm/types" }
diff --git a/...ge/diem-tools/e2e-tests-replay/src/lib.rs → diem-move/e2e-tests-replay/src/lib.rs b/...ge/diem-tools/e2e-tests-replay/src/lib.rs → diem-move/e2e-tests-replay/src/lib.rs
diff --git a/...e/diem-tools/e2e-tests-replay/src/main.rs → diem-move/e2e-tests-replay/src/main.rs b/...e/diem-tools/e2e-tests-replay/src/main.rs → diem-move/e2e-tests-replay/src/main.rs
diff --git a/language/tools/genesis-viewer/Cargo.toml → diem-move/genesis-viewer/Cargo.toml b/language/tools/genesis-viewer/Cargo.toml → diem-move/genesis-viewer/Cargo.toml
@@ -11,13 +11,13 @@ edition = "2018"
 
 [dependencies]
 bcs = "0.1.2"
-diem-types = { path = "../../../types" }
-diem-workspace-hack = { path = "../../../common/workspace-hack" }
-move-binary-format = { path = "../../move-binary-format" }
-move-core-types = { path = "../../move-core/types" }
+diem-types = { path = "../../types" }
+diem-workspace-hack = { path = "../../common/workspace-hack" }
+move-binary-format = { path = "../../language/move-binary-format" }
+move-core-types = { path = "../../language/move-core/types" }
 diem-resource-viewer = { path = "../diem-resource-viewer"}
 vm-genesis = { path = "../vm-genesis" }
-diem-framework-releases = { path = "../../diem-framework/DPN/releases" }
-move-vm-test-utils = { path = "../../move-vm/test-utils" }
+diem-framework-releases = { path = "../../language/diem-framework/DPN/releases" }
+move-vm-test-utils = { path = "../../language/move-vm/test-utils" }
 
 structopt = "0.3.21"
diff --git a/language/tools/genesis-viewer/src/main.rs → diem-move/genesis-viewer/src/main.rs b/language/tools/genesis-viewer/src/main.rs → diem-move/genesis-viewer/src/main.rs
diff --git a/...uage/diem-tools/oncall-trainer/Cargo.toml → diem-move/oncall-trainer/Cargo.toml b/...uage/diem-tools/oncall-trainer/Cargo.toml → diem-move/oncall-trainer/Cargo.toml
@@ -21,13 +21,13 @@ rustyline = "8.0.0"
 gag = "0.1.10"
 bcs = "0.1.2"
 
-cli = { path = "../../../testsuite/cli" }
-diem-client = { path = "../../../sdk/client/"}
-diem-config = { path = "../../../config" }
-diem-framework-releases = { path = "../../diem-framework/DPN/releases"}
-diem-genesis-tool = { path = "../../../config/management/genesis" }
-diem-json-rpc-types = { path = "../../../json-rpc/types" }
-diem-types = { path = "../../../types" }
-diem-node = { path = "../../../diem-node"}
-diem-temppath = { path = "../../../common/temppath" }
-diem-workspace-hack = { path = "../../../common/workspace-hack" }
+cli = { path = "../../testsuite/cli" }
+diem-client = { path = "../../sdk/client/"}
+diem-config = { path = "../../config" }
+diem-framework-releases = { path = "../../language/diem-framework/DPN/releases"}
+diem-genesis-tool = { path = "../../config/management/genesis" }
+diem-json-rpc-types = { path = "../../json-rpc/types" }
+diem-types = { path = "../../types" }
+diem-node = { path = "../../diem-node"}
+diem-temppath = { path = "../../common/temppath" }
+diem-workspace-hack = { path = "../../common/workspace-hack" }
diff --git a/...er/src/experiments/get_sequence_number.rs → ...er/src/experiments/get_sequence_number.rs b/...er/src/experiments/get_sequence_number.rs → ...er/src/experiments/get_sequence_number.rs
diff --git a/...r/src/experiments/get_writeset_version.rs → ...r/src/experiments/get_writeset_version.rs b/...r/src/experiments/get_writeset_version.rs → ...r/src/experiments/get_writeset_version.rs
diff --git a/...ols/oncall-trainer/src/experiments/mod.rs → ...ove/oncall-trainer/src/experiments/mod.rs b/...ols/oncall-trainer/src/experiments/mod.rs → ...ove/oncall-trainer/src/experiments/mod.rs
diff --git a/...age/diem-tools/oncall-trainer/src/init.rs → diem-move/oncall-trainer/src/init.rs b/...age/diem-tools/oncall-trainer/src/init.rs → diem-move/oncall-trainer/src/init.rs
diff --git a/...uage/diem-tools/oncall-trainer/src/lib.rs → diem-move/oncall-trainer/src/lib.rs b/...uage/diem-tools/oncall-trainer/src/lib.rs → diem-move/oncall-trainer/src/lib.rs
diff --git a/...age/diem-tools/oncall-trainer/src/main.rs → diem-move/oncall-trainer/src/main.rs b/...age/diem-tools/oncall-trainer/src/main.rs → diem-move/oncall-trainer/src/main.rs
diff --git a/diem-move/transaction-replay/Cargo.toml b/diem-move/transaction-replay/Cargo.toml
@@ -0,0 +1,36 @@
+[package]
+name = "diem-transaction-replay"
+version = "0.1.0"
+authors = ["Diem Association <[email protected]>"]
+description = "Replay transactions stored on chain"
+repository = "https://github.com/diem/diem"
+homepage = "https://diem.com"
+license = "Apache-2.0"
+publish = false
+edition = "2018"
+
+[dependencies]
+anyhow = "1.0.38"
+structopt = "0.3.21"
+hex = "0.4.3"
+diem-workspace-hack = { path = "../../common/workspace-hack" }
+diem-types = { path = "../../types" }
+diem-state-view = { path = "../../storage/state-view" }
+diem-validator-interface = { path = "../diem-validator-interface" }
+diemdb = { path = "../../storage/diemdb" }
+diem-vm = { path = "../../language/diem-vm" }
+move-binary-format = { path = "../../language/move-binary-format"}
+move-cli = { path = "../../language/tools/move-cli" }
+move-vm-types = { path = "../../language/move-vm/types" }
+move-core-types = { path = "../../language/move-core/types" }
+move-vm-runtime = { path = "../../language/move-vm/runtime" }
+move-vm-test-utils = { path = "../../language/move-vm/test-utils" }
+diem-resource-viewer = { path = "../diem-resource-viewer" }
+diem-framework = { path = "../../language/diem-framework" }
+move-lang = { path = "../../language/move-lang" }
+bcs = "0.1.2"
+difference = "2.0.0"
+
+[dev-dependencies]
+vm-genesis = { path = "../vm-genesis" }
+diem-framework-releases = { path = "../../language/diem-framework/DPN/releases" }
diff --git a/...ction-replay/examples/account_exists.move → ...ction-replay/examples/account_exists.move b/...ction-replay/examples/account_exists.move → ...ction-replay/examples/account_exists.move
diff --git a/...saction-replay/examples/time_exceeds.move → ...saction-replay/examples/time_exceeds.move b/...saction-replay/examples/time_exceeds.move → ...saction-replay/examples/time_exceeds.move
diff --git a/.../diem-tools/transaction-replay/src/lib.rs → diem-move/transaction-replay/src/lib.rs b/.../diem-tools/transaction-replay/src/lib.rs → diem-move/transaction-replay/src/lib.rs
diff --git a/...diem-tools/transaction-replay/src/main.rs → diem-move/transaction-replay/src/main.rs b/...diem-tools/transaction-replay/src/main.rs → diem-move/transaction-replay/src/main.rs
diff --git a/...-replay/src/unit_tests/bisection_tests.rs → ...-replay/src/unit_tests/bisection_tests.rs b/...-replay/src/unit_tests/bisection_tests.rs → ...-replay/src/unit_tests/bisection_tests.rs
diff --git a/.../transaction-replay/src/unit_tests/mod.rs → .../transaction-replay/src/unit_tests/mod.rs b/.../transaction-replay/src/unit_tests/mod.rs → .../transaction-replay/src/unit_tests/mod.rs
diff --git a/diem-move/vm-genesis/Cargo.toml b/diem-move/vm-genesis/Cargo.toml
@@ -0,0 +1,41 @@
+[package]
+name = "vm-genesis"
+version = "0.1.0"
+edition = "2018"
+authors = ["Diem Association <[email protected]>"]
+description = "Diem vm genesis"
+repository = "https://github.com/diem/diem"
+homepage = "https://diem.com"
+license = "Apache-2.0"
+publish = false
+
+[dependencies]
+anyhow = "1.0.38"
+once_cell = "1.7.2"
+rand = "0.8.3"
+
+bytecode-verifier = { path = "../../language/bytecode-verifier" }
+bcs = "0.1.2"
+diem-config = { path = "../../config" }
+diem-crypto = { path = "../../crypto/crypto" }
+diem-state-view = { path = "../../storage/state-view" }
+diem-types = { path = "../../types" }
+diem-workspace-hack = { path = "../../common/workspace-hack" }
+move-bytecode-utils = { path = "../../language/tools/move-bytecode-utils" }
+move-core-types = { path = "../../language/move-core/types" }
+move-vm-runtime = { path = "../../language/move-vm/runtime"}
+move-vm-types = { path = "../../language/move-vm/types" }
+diem-framework = { path = "../../language/diem-framework" }
+diem-framework-releases = { path = "../../language/diem-framework/DPN/releases" }
+diem-transaction-builder = { path = "../../sdk/transaction-builder"}
+move-binary-format = { path = "../../language/move-binary-format" }
+diem-vm = { path = "../../language/diem-vm" }
+
+[dev-dependencies]
+proptest = "1.0.0"
+proptest-derive = "0.3.0"
+diem-proptest-helpers = { path = "../../common/proptest-helpers" }
+
+[features]
+default = []
+fuzzing = ["diem-types/fuzzing", "move-vm-types/fuzzing"]
diff --git a/...e/tools/vm-genesis/src/genesis_context.rs → diem-move/vm-genesis/src/genesis_context.rs b/...e/tools/vm-genesis/src/genesis_context.rs → diem-move/vm-genesis/src/genesis_context.rs
diff --git a/language/tools/vm-genesis/src/lib.rs → diem-move/vm-genesis/src/lib.rs b/language/tools/vm-genesis/src/lib.rs → diem-move/vm-genesis/src/lib.rs
diff --git a/diem-move/writeset-transaction-generator/Cargo.toml b/diem-move/writeset-transaction-generator/Cargo.toml
@@ -0,0 +1,42 @@
+[package]
+name = "diem-writeset-generator"
+version = "0.1.0"
+authors = ["Diem Association <[email protected]>"]
+description = "Generating writesets used for incident management"
+repository = "https://github.com/diem/diem"
+homepage = "https://diem.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]
+anyhow = "1.0.38"
+structopt = "0.3.21"
+tempfile = "3.2.0"
+handlebars = "3.5.3"
+hex = "0.4.3"
+serde = { version = "1.0.124", default-features = false }
+serde_json = "1.0.64"
+once_cell = "1.7.2"
+
+bytecode-verifier = { path = "../../language/bytecode-verifier" }
+diem-workspace-hack = { path = "../../common/workspace-hack" }
+diem-crypto-derive = { path = "../../crypto/crypto-derive" }
+diem-crypto = { path = "../../crypto/crypto" }
+diem-types = { path = "../../types" }
+diem-framework-releases = { path = "../../language/diem-framework/DPN/releases" }
+diem-framework = { path = "../../language/diem-framework" }
+move-lang = { path = "../../language/move-lang" }
+bcs = "0.1.2"
+diem-state-view = { path = "../../storage/state-view" }
+diem-validator-interface = { path = "../diem-validator-interface" }
+diem-transaction-replay = { path = "../transaction-replay" }
+diemdb = { path = "../../storage/diemdb" }
+diem-vm = { path = "../../language/diem-vm" }
+move-binary-format = { path = "../../language/move-binary-format"}
+move-vm-types = { path = "../../language/move-vm/types" }
+move-core-types = { path = "../../language/move-core/types" }
+move-vm-runtime = { path = "../../language/move-vm/runtime" }
+move-vm-test-utils = { path = "../../language/move-vm/test-utils" }
diff --git a/...nsaction-generator/release/artifacts.json → ...nsaction-generator/release/artifacts.json b/...nsaction-generator/release/artifacts.json → ...nsaction-generator/release/artifacts.json
diff --git a/...-generator/release/release-1.2.0-rc0.blob → ...-generator/release/release-1.2.0-rc0.blob b/...-generator/release/release-1.2.0-rc0.blob → ...-generator/release/release-1.2.0-rc0.blob
diff --git a/...-generator/release/release-1.4.0-rc0.blob → ...-generator/release/release-1.4.0-rc0.blob b/...-generator/release/release-1.4.0-rc0.blob → ...-generator/release/release-1.4.0-rc0.blob
diff --git a/...ion-generator/src/admin_script_builder.rs → ...ion-generator/src/admin_script_builder.rs b/...ion-generator/src/admin_script_builder.rs → ...ion-generator/src/admin_script_builder.rs
diff --git a/...writeset-transaction-generator/src/lib.rs → ...writeset-transaction-generator/src/lib.rs b/...writeset-transaction-generator/src/lib.rs → ...writeset-transaction-generator/src/lib.rs
diff --git a/...riteset-transaction-generator/src/main.rs → ...riteset-transaction-generator/src/main.rs b/...riteset-transaction-generator/src/main.rs → ...riteset-transaction-generator/src/main.rs
diff --git a/...transaction-generator/src/old_releases.rs → ...transaction-generator/src/old_releases.rs b/...transaction-generator/src/old_releases.rs → ...transaction-generator/src/old_releases.rs
diff --git a/...n-generator/src/release_flow/artifacts.rs → ...n-generator/src/release_flow/artifacts.rs b/...n-generator/src/release_flow/artifacts.rs → ...n-generator/src/release_flow/artifacts.rs
diff --git a/...tion-generator/src/release_flow/create.rs → ...tion-generator/src/release_flow/create.rs b/...tion-generator/src/release_flow/create.rs → ...tion-generator/src/release_flow/create.rs
diff --git a/...saction-generator/src/release_flow/mod.rs → ...saction-generator/src/release_flow/mod.rs b/...saction-generator/src/release_flow/mod.rs → ...saction-generator/src/release_flow/mod.rs
diff --git a/...erator/src/release_flow/unit_tests/mod.rs → ...erator/src/release_flow/unit_tests/mod.rs b/...erator/src/release_flow/unit_tests/mod.rs → ...erator/src/release_flow/unit_tests/mod.rs
diff --git a/.../release_flow/unit_tests/release_tests.rs → .../release_flow/unit_tests/release_tests.rs b/.../release_flow/unit_tests/release_tests.rs → .../release_flow/unit_tests/release_tests.rs
diff --git a/...tion-generator/src/release_flow/verify.rs → ...tion-generator/src/release_flow/verify.rs b/...tion-generator/src/release_flow/verify.rs → ...tion-generator/src/release_flow/verify.rs
diff --git a/...saction-generator/src/writeset_builder.rs → ...saction-generator/src/writeset_builder.rs b/...saction-generator/src/writeset_builder.rs → ...saction-generator/src/writeset_builder.rs
diff --git a/...enerator/templates/halt_transactions.move → ...enerator/templates/halt_transactions.move b/...enerator/templates/halt_transactions.move → ...enerator/templates/halt_transactions.move
diff --git a/...enerator/templates/remove_validators.move → ...enerator/templates/remove_validators.move b/...enerator/templates/remove_validators.move → ...enerator/templates/remove_validators.move
diff --git a/execution/executor-test-helpers/Cargo.toml b/execution/executor-test-helpers/Cargo.toml
@@ -27,4 +27,4 @@ diem-workspace-hack = { path = "../../common/workspace-hack" }
 storage-interface = { path = "../../storage/storage-interface" }
 storage-service = { path = "../../storage/storage-service" }
 diem-transaction-builder = { path = "../../sdk/transaction-builder" }
-vm-genesis = { path = "../../language/tools/vm-genesis" }
+vm-genesis = { path = "../../diem-move/vm-genesis" }
diff --git a/execution/executor/Cargo.toml b/execution/executor/Cargo.toml
@@ -48,7 +48,7 @@ diem-temppath = { path = "../../common/temppath" }
 diemdb = { path = "../../storage/diemdb" }
 storage-interface = { path = "../../storage/storage-interface", features=["fuzzing"] }
 diem-transaction-builder = { path = "../../sdk/transaction-builder" }
-vm-genesis = { path = "../../language/tools/vm-genesis" }
+vm-genesis = { path = "../../diem-move/vm-genesis" }
 
 [features]
 default = []