Merge pull request #30 from l-monninger/main

Cargo.toml reflects intended rust 1.68.0

m1/Cargo.toml

@@ -2,8 +2,8 @@
 resolver = "2"
 members = [
     "subnet",
-    # "movement",
-    # "movement-benchmark",
+    "movement",
+    "movement-benchmark",
 ]
 
 [workspace.package]
@@ -14,14 +14,94 @@ authors = ["Liam Monninger <liam@movementlabs.xyz>"]
 homepage = "https://www.movementlabs.xyz"
 publish = false
 repository = "https://github.com/movemntdev/m2"
-rust-version = "1.66"
+rust-version = "1.68" # not accurate
 
 [workspace.dependencies]
 anyhow = "1.0.62"
 futures = "0.3.28"
 rand = { version =  "0.7.3" }
 bcs = { git = "https://github.com/aptos-labs/bcs.git", rev = "d31fab9d81748e2594be5cd5cdf845786a30562d" }
 
+
+
+async-trait = "0.1.53"
+base64 = "0.13.0"
+backoff = { version = "0.4.0", features = ["tokio"] }
+chrono = { version = "0.4.19", features = ["clock", "serde"] }
+clap = { version = "3.2.23", features = ["derive", "env", "suggestions"] }
+clap_complete = "3.2.3"
+codespan-reporting = "0.11.1"
+criterion = "0.3.5"
+criterion-cpu-time = "0.1.0"
+dirs = "4.0.0"
+hex = "0.4.3"
+hkdf = "0.10.0"
+hostname = "0.3.1"
+http = "0.2.3"
+httpmock = "0.6"
+hyper = { version = "0.14.18", features = ["full"] }
+hyper-tls = "0.5.0"
+include_dir = { version = "0.7.2", features = ["glob"] }
+indicatif = "0.15.0"
+indoc = "1.0.6"
+inferno = "0.11.14"
+ipnet = "2.5.0"
+itertools = "0.10.3"
+num_cpus = "1.13.1"
+proptest = "1.0.0"
+proptest-derive = "0.3.0"
+regex = "1.5.5"
+reqwest = { version = "0.11.11", features = ["blocking", "cookies", "json", "stream"] }
+serde = { version = "1.0.137", features = ["derive", "rc"] }
+serde_json = { version = "1.0.81", features = ["preserve_order"] }
+serde_yaml = "0.8.24"
+shadow-rs = "0.16.2"
+tempfile = "3.3.0"
+termcolor = "1.1.2"
+thiserror = "1.0.37"
+tokio = { version = "1.21.0", features = ["full"] }
+tokio-util = { version = "0.7.2", features = ["compat", "codec"] }
+toml = "0.5.9"
+walkdir = "2.3.2"
+
+jemallocator = { version = "0.3.2", features = [
+    "profiling",
+    "unprefixed_malloc_on_supported_platforms",
+] }
+
+# MOVE DEPENDENCIES
+move-abigen = { path = "../aptos-pre-core/third_party/move/move-prover/move-abigen" }
+move-binary-format = { path = "../aptos-pre-core/third_party/move/move-binary-format" }
+move-bytecode-verifier = { path = "../aptos-pre-core/third_party/move/move-bytecode-verifier" }
+move-bytecode-utils = { path = "../aptos-pre-core/third_party/move/tools/move-bytecode-utils" }
+move-cli = { path = "../aptos-pre-core/third_party/move/tools/move-cli" }
+move-command-line-common = { path = "../aptos-pre-core/third_party/move/move-command-line-common" }
+move-coverage = { path = "../aptos-pre-core/third_party/move/tools/move-coverage" }
+move-compiler = { path = "../aptos-pre-core/third_party/move/move-compiler" }
+move-core-types = { path = "../aptos-pre-core/third_party/move/move-core/types" }
+move-docgen = { path = "../aptos-pre-core/third_party/move/move-prover/move-docgen" }
+move-disassembler = { path = "../aptos-pre-core/third_party/move/tools/move-disassembler" }
+move-ir-types = { path = "../aptos-pre-core/third_party/move/move-ir/types" }
+move-ir-compiler = { path = "../aptos-pre-core/third_party/move/move-ir-compiler" }
+move-bytecode-source-map = { path = "../aptos-pre-core/third_party/move/move-ir-compiler/move-bytecode-source-map" }
+move-model = { path = "../aptos-pre-core/third_party/move/move-model" }
+move-package = { path = "../aptos-pre-core/third_party/move/tools/move-package" }
+move-prover = { path = "../aptos-pre-core/third_party/move/move-prover" }
+move-prover-boogie-backend = { path = "../aptos-pre-core/third_party/move/move-prover/boogie-backend" }
+move-stackless-bytecode = { path = "../aptos-pre-core/third_party/move/move-prover/bytecode" }
+aptos-move-stdlib = { path = "aptos-move/framework/move-stdlib" }
+move-prover-test-utils = { path = "../aptos-pre-core/third_party/move/move-prover/test-utils" }
+move-resource-viewer = { path = "../aptos-pre-core/third_party/move/tools/move-resource-viewer" }
+move-symbol-pool = { path = "../aptos-pre-core/third_party/move/move-symbol-pool" }
+move-table-extension = { path = "../aptos-pre-core/third_party/move/extensions/move-table-extension" }
+move-transactional-test-runner = { path = "../aptos-pre-core/third_party/move/testing-infra/transactional-test-runner" }
+move-unit-test = { path = "../aptos-pre-core/third_party/move/tools/move-unit-test", features = ["table-extension"] }
+move-vm-runtime = { path = "../aptos-pre-core/third_party/move/move-vm/runtime" }
+move-vm-test-utils = { path = "../aptos-pre-core/third_party/move/move-vm/test-utils", features = ["table-extension"] }
+move-vm-types = { path = "../aptos-pre-core/third_party/move/move-vm/types" }
+read-write-set = { path = "../aptos-pre-core/third_party/move/tools/read-write-set" }
+read-write-set-dynamic = { path = "../aptos-pre-core/third_party/move/tools/read-write-set/dynamic" }
+
 # aptos
 # TODO: pleas remove unused dependencies
 aptos = { path = "../aptos-pre-core/crates/aptos" }
@@ -74,7 +154,7 @@ aptos-gas = { path = "../aptos-pre-core/aptos-move/aptos-gas" }
 aptos-gas-algebra-ext = { path = "../aptos-pre-core/aptos-move/gas-algebra-ext" }
 aptos-gas-profiling = { path = "../aptos-pre-core/aptos-move/aptos-gas-profiling" }
 aptos-genesis = { path = "../aptos-pre-core/crates/aptos-genesis" }
-aptos-github-client = { path = "../aptos-pre-core/crates/aptos-github-client" }
+aptos-github-client = { path = "../aptos-pre-core/secure/storage/github" }
 aptos-global-constants = { path = "../aptos-pre-core/config/global-constants" }
 aptos-id-generator = { path = "../aptos-pre-core/crates/aptos-id-generator" }
 aptos-indexer = { path = "../aptos-pre-core/crates/indexer" }