diff --git a/.circleci/config.yml b/.circleci/config.yml index 12295f42678ef..6ed35e8283e83 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -18,8 +18,8 @@ jobs: resource_class: medium steps: - dev-setup - - run: cargo nextest --nextest-profile ci --package diem-crypto --features='u32' --no-default-features - - run: cargo nextest --nextest-profile ci --package diem-crypto --features='u64' --no-default-features + - run: cargo nextest --nextest-profile ci --package aptos-crypto --features='u32' --no-default-features + - run: cargo nextest --nextest-profile ci --package aptos-crypto --features='u64' --no-default-features lint: docker: - image: cimg/base:2020.01 diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS deleted file mode 100644 index 9015556b58647..0000000000000 --- a/.github/CODEOWNERS +++ /dev/null @@ -1,35 +0,0 @@ -# Substribe to CI changes -/.github/ @diem/diem-oss-admin-team - -# Subscribe to diem-core changes -/config @diem/diem-core -/consensus @diem/diem-core -/diem-node @diem/diem-core -/execution @diem/diem-core -/mempool @diem/diem-core -/network @diem/diem-core -/secure @diem/diem-core -/state-sync @diem/diem-core -/storage @diem/diem-core -/types @diem/diem-core - -# Subscribe to diem-ecosystem changes -/api @diem/diem-ecosystem -/json-rpc @diem/diem-ecosystem -/sdk @diem/diem-ecosystem -/shuffle @diem/diem-ecosystem - -# Subscribe to crypto crate changing PRs -/crypto @kchalkias @valerini - -# Subscribe to potential JSON API changing PRs -/json-rpc/json-rpc-spec.md @xli -/json-rpc/types/ @xli -/json-rpc/src/methods.rs @xli -/client/ @xli - -# Subscribe to LCS format changes -/testsuite/generate-format/tests/staged/libra.yaml @matbd @xli - -# Code freeze -# * @libra/release-gatekeepers diff --git a/.github/workflows/ci-test.yml b/.github/workflows/ci-test.yml index fb390740213fa..65a9b8e719222 100644 --- a/.github/workflows/ci-test.yml +++ b/.github/workflows/ci-test.yml @@ -168,7 +168,7 @@ jobs: # needs: prepare # if: ${{ needs.prepare.outputs.test-rust == 'true' && needs.prepare.outputs.test-compatibility == 'true' }} # container: -# image: ghcr.io/diem/diem_build_environment:${{ needs.prepare.outputs.changes-target-branch }} +# image: ghcr.io/diem/aptos_build_environment:${{ needs.prepare.outputs.changes-target-branch }} # volumes: # - "${{github.workspace}}:/opt/git/diem" # steps: @@ -202,9 +202,9 @@ jobs: # with: # ref: ${{ github.event.pull_request.head.sha }} # - name: build validator docker image -# run: docker/diem-build.sh docker/validator/Dockerfile diem/validator:test +# run: docker/aptos-build.sh docker/validator/Dockerfile diem/validator:test # - name: build faucet image -# run: docker/diem-build.sh docker/faucet/Dockerfile diem/faucet:test +# run: docker/aptos-build.sh docker/faucet/Dockerfile diem/faucet:test # - name: run validator-client test # run: docker/compose/test_docker_compose.sh # env: @@ -265,7 +265,7 @@ jobs: # run: | # echo "Sleep 30s while fullnode starts" # sleep 30 -# kubectl wait -l statefulset.kubernetes.io/pod-name=fullnode-diem-fullnode-0 --for=condition=ready pod --timeout=5m +# kubectl wait -l statefulset.kubernetes.io/pod-name=fullnode-aptos-fullnode-0 --for=condition=ready pod --timeout=5m # echo "Sleep 1m while fullnode syncs" # sleep 60 # kubectl get pods @@ -283,9 +283,9 @@ jobs: # kubectl describe pvc # echo "===== pods =====" # kubectl get pods -# kubectl describe pod fullnode-diem-fullnode-0 -# kubectl logs fullnode-diem-fullnode-0 -# kubectl logs fullnode-diem-fullnode-sync-test +# kubectl describe pod fullnode-aptos-fullnode-0 +# kubectl logs fullnode-aptos-fullnode-0 +# kubectl logs fullnode-aptos-fullnode-sync-test # - name: Clean up # if: ${{ always() }} # run: minikube delete @@ -302,7 +302,7 @@ jobs: # needs: prepare # if: ${{ needs.prepare.outputs.test-api-spec == 'true' }} # container: -# image: ghcr.io/diem/diem_build_environment:${{ needs.prepare.outputs.changes-target-branch }} +# image: ghcr.io/diem/aptos_build_environment:${{ needs.prepare.outputs.changes-target-branch }} # volumes: # - "${{github.workspace}}:/opt/git/diem" # steps: diff --git a/.gitignore b/.gitignore index 569e8e80c0d65..a52189e3cb1b2 100644 --- a/.gitignore +++ b/.gitignore @@ -37,7 +37,7 @@ Temporary Items .apdisk # Generated VM config in vm-genesis -diem-move/vm-genesis/genesis/vm_config.toml +aptos-move/vm-genesis/genesis/vm_config.toml # Terraform .terraform/ @@ -59,8 +59,9 @@ build/ # Do not ignore the Move build output under the releases for DPN, core, and # experimental -- these are the release code. -!diem-move/diem-framework/DPN/releases/artifacts/** -!diem-move/diem-framework/experimental/releases/artifacts/** +!aptos-move/diem-framework/DPN/releases/artifacts/** +!aptos-move/diem-framework/experimental/releases/artifacts/** +!aptos-move/diem-framework/aptos-framework/releases/artifacts/** # Docker incremental build temporary files and directories target-out-docker diff --git a/Cargo.lock b/Cargo.lock index 876c1bab9884c..1b243fdd57392 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -17,9 +17,9 @@ name = "accumulator" version = "0.1.0" dependencies = [ "anyhow", - "diem-crypto", - "diem-types", - "diem-workspace-hack", + "aptos-crypto", + "aptos-types", + "aptos-workspace-hack", "mirai-annotations", "proptest", "rand 0.8.4", @@ -146,2367 +146,2367 @@ dependencies = [ ] [[package]] -name = "aptos-framework-releases" +name = "aptos-api" version = "0.1.0" dependencies = [ "anyhow", + "aptos-api-types", + "aptos-config", + "aptos-crypto", + "aptos-genesis-tool", + "aptos-global-constants", + "aptos-logger", + "aptos-mempool", + "aptos-metrics", + "aptos-sdk", + "aptos-secure-storage", + "aptos-temppath", + "aptos-types", + "aptos-vm", + "aptos-workspace-hack", + "aptosdb", "bcs", - "diem-crypto", - "diem-types", - "diem-workspace-hack", - "framework-releases", - "include_dir", - "move-binary-format", - "move-command-line-common", + "bytes", + "diem-framework-releases", + "executor", + "executor-types", + "fail", + "futures", + "hex", + "hyper", + "mempool-notifications", + "move-core-types", + "move-resource-viewer", "once_cell", + "percent-encoding", + "rand 0.8.4", + "reqwest", + "serde 1.0.130", + "serde_json", + "storage-interface", + "tokio", + "vm-validator", + "warp", ] [[package]] -name = "arbitrary" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db55d72333851e17d572bec876e390cd3b11eb1ef53ae821dd9f3b653d2b4569" - -[[package]] -name = "arc-swap" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4d7d63395147b81a9e570bcc6243aaf71c017bd666d4909cfef0085bdda8d73" - -[[package]] -name = "array_tool" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f8cb5d814eb646a863c4f24978cff2880c4be96ad8cde2c0f0678732902e271" - -[[package]] -name = "arrayvec" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" +name = "aptos-api-types" +version = "0.0.1" +dependencies = [ + "anyhow", + "aptos-crypto", + "aptos-transaction-builder", + "aptos-types", + "aptos-workspace-hack", + "bcs", + "hex", + "move-binary-format", + "move-core-types", + "move-resource-viewer", + "serde 1.0.130", + "serde_json", + "warp", +] [[package]] -name = "assert_approx_eq" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c07dab4369547dbe5114677b33fbbf724971019f3818172d59a97a61c774ffd" +name = "aptos-bitvec" +version = "0.1.0" +dependencies = [ + "aptos-workspace-hack", + "bcs", + "proptest", + "proptest-derive", + "serde 1.0.130", + "serde_bytes", +] [[package]] -name = "async-stream" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3670df70cbc01729f901f94c887814b3c68db038aad1329a418bae178bc5295c" +name = "aptos-config" +version = "0.1.0" dependencies = [ - "async-stream-impl", - "futures-core", + "aptos-crypto", + "aptos-crypto-derive", + "aptos-global-constants", + "aptos-logger", + "aptos-secure-storage", + "aptos-temppath", + "aptos-types", + "aptos-workspace-hack", + "bcs", + "get_if_addrs", + "log", + "mirai-annotations", + "rand 0.8.4", + "serde 1.0.130", + "serde_yaml", + "short-hex-str", + "thiserror", ] [[package]] -name = "async-stream-impl" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3548b8efc9f8e8a5a0a2808c5bd8451a9031b9e5b879a79590304ae928b0a70" +name = "aptos-crypto" +version = "0.0.3" dependencies = [ - "proc-macro2 1.0.28", - "quote 1.0.9", - "syn 1.0.74", + "aes-gcm", + "anyhow", + "aptos-crypto-derive", + "aptos-workspace-hack", + "bcs", + "bitvec", + "byteorder", + "bytes", + "criterion", + "curve25519-dalek-fiat", + "digest 0.9.0", + "ed25519-dalek-fiat", + "hex", + "hkdf", + "mirai-annotations", + "once_cell", + "proptest", + "proptest-derive", + "rand 0.8.4", + "rand_core 0.6.2", + "ripemd160", + "serde 1.0.130", + "serde-name", + "serde_bytes", + "serde_json", + "sha2", + "sha3", + "static_assertions", + "thiserror", + "tiny-keccak", + "trybuild", + "x25519-dalek-fiat", ] [[package]] -name = "async-trait" -version = "0.1.48" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36ea56748e10732c49404c153638a15ec3d6211ec5ff35d9bb20e13b93576adf" +name = "aptos-crypto-derive" +version = "0.0.3" dependencies = [ + "anyhow", + "aptos-workspace-hack", "proc-macro2 1.0.28", "quote 1.0.9", "syn 1.0.74", ] [[package]] -name = "atomicwrites" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4830ac690261d0b47f06e86d18c47eaa65d0184e576cf9b62c3a49b28cb876b" +name = "aptos-data-client" +version = "0.1.0" dependencies = [ - "nix 0.20.0", - "tempfile", - "winapi 0.3.9", + "aptos-config", + "aptos-crypto", + "aptos-id-generator", + "aptos-infallible", + "aptos-logger", + "aptos-metrics", + "aptos-time-service", + "aptos-types", + "aptos-workspace-hack", + "async-trait", + "bcs", + "channel", + "claim", + "futures", + "itertools 0.10.1", + "maplit", + "network", + "rand 0.8.4", + "serde 1.0.130", + "storage-service-client", + "storage-service-server", + "storage-service-types", + "thiserror", + "tokio", ] [[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +name = "aptos-documentation-tool" +version = "0.1.0" dependencies = [ - "hermit-abi", - "libc", - "winapi 0.3.9", + "anyhow", + "aptos-workspace-hack", + "once_cell", + "regex", + "serde 1.0.130", + "serde-generate", + "serde-reflection", + "serde_yaml", + "structopt", + "tempfile", ] [[package]] -name = "autocfg" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" - -[[package]] -name = "backtrace" -version = "0.3.56" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d117600f438b1707d4e4ae15d3595657288f8235a0eb593e80ecc98ab34e1bc" +name = "aptos-e2e-tests-replay" +version = "0.1.0" dependencies = [ - "addr2line", - "cfg-if 1.0.0", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", - "serde 1.0.130", + "anyhow", + "aptos-types", + "aptos-vm", + "aptos-workspace-hack", + "bcs", + "diem-framework", + "language-e2e-tests", + "move-binary-format", + "move-core-types", + "move-model", + "move-stackless-bytecode-interpreter", + "move-vm-runtime", + "move-vm-types", + "structopt", + "walkdir", ] [[package]] -name = "backup-cli" +name = "aptos-faucet" version = "0.1.0" dependencies = [ "anyhow", - "async-trait", - "backup-service", + "aptos-config", + "aptos-crypto", + "aptos-infallible", + "aptos-logger", + "aptos-rest-client", + "aptos-sdk", + "aptos-workspace-hack", "bcs", - "byteorder", "bytes", - "diem-config", - "diem-crypto", - "diem-infallible", - "diem-jellyfish-merkle", - "diem-logger", - "diem-proptest-helpers", - "diem-secure-push-metrics", - "diem-temppath", - "diem-types", - "diem-vm", - "diem-workspace-hack", - "diemdb", - "executor", - "executor-test-helpers", - "executor-types", "futures", + "generate-key", "hex", - "itertools 0.10.1", - "num_cpus", - "once_cell", - "pin-project", - "proptest", "rand 0.8.4", - "regex", "reqwest", "serde 1.0.130", "serde_json", - "storage-interface", "structopt", + "tempfile", "tokio", - "tokio-stream", - "tokio-util", - "toml", + "url", "warp", ] [[package]] -name = "backup-service" +name = "aptos-framework-releases" version = "0.1.0" dependencies = [ "anyhow", + "aptos-crypto", + "aptos-types", + "aptos-workspace-hack", "bcs", - "bytes", - "diem-config", - "diem-crypto", - "diem-logger", - "diem-metrics", - "diem-temppath", - "diem-types", - "diem-workspace-hack", - "diemdb", - "futures", - "hyper", + "framework-releases", + "include_dir", + "move-binary-format", + "move-command-line-common", "once_cell", - "reqwest", - "serde 1.0.130", - "storage-interface", - "tokio", - "warp", ] [[package]] -name = "base-x" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b" - -[[package]] -name = "base64" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" - -[[package]] -name = "base64ct" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b8a45dc8036c7e52889226a96edacd45831c0dbdb8b803a58b8e0e12613b1a6" +name = "aptos-fuzz" +version = "0.1.0" +dependencies = [ + "aptos-fuzzer", + "aptos-workspace-hack", + "libfuzzer-sys", + "once_cell", +] [[package]] -name = "bcs" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "510fd83e3eaf7263b06182f3550b4c0af2af42cb36ab8024969ff5ea7fcb2833" +name = "aptos-fuzzer" +version = "0.1.0" dependencies = [ - "serde 1.0.130", - "thiserror", + "accumulator", + "anyhow", + "aptos-crypto", + "aptos-jellyfish-merkle", + "aptos-mempool", + "aptos-proptest-helpers", + "aptos-types", + "aptos-vault-client", + "aptos-workspace-hack", + "aptosdb", + "bcs", + "byteorder", + "consensus", + "consensus-types", + "datatest-stable", + "executor", + "executor-types", + "hex", + "language-e2e-tests", + "move-binary-format", + "move-core-types", + "move-vm-types", + "network", + "once_cell", + "proptest", + "proptest-derive", + "rand 0.8.4", + "rusty-fork", + "safety-rules", + "scratchpad", + "serde_json", + "sha-1 0.9.4", + "state-sync-v1", + "stats_alloc", + "storage-interface", + "structopt", + "ureq", ] [[package]] -name = "bech32" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c7f7096bc256f5e5cb960f60dfc4f4ef979ca65abe7fb9d5a4f77150d3783d4" - -[[package]] -name = "bimap" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50ae17cabbc8a38a1e3e4c1a6a664e9a09672dc14d0896fa8d865d3a5a446b07" - -[[package]] -name = "bincode" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +name = "aptos-genesis-tool" +version = "0.1.0" dependencies = [ + "anyhow", + "aptos-config", + "aptos-crypto", + "aptos-global-constants", + "aptos-management", + "aptos-secure-storage", + "aptos-temppath", + "aptos-types", + "aptos-vm", + "aptos-workspace-hack", + "aptosdb", + "bcs", + "consensus-types", + "diem-framework-releases", + "executor", + "generate-key", + "rand 0.8.4", "serde 1.0.130", + "storage-interface", + "structopt", + "thiserror", + "toml", + "vm-genesis", ] [[package]] -name = "bindgen" -version = "0.59.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453c49e5950bb0eb63bb3df640e31618846c89d5b7faa54040d76e98e0134375" -dependencies = [ - "bitflags", - "cexpr", - "clang-sys", - "lazy_static 1.4.0", - "lazycell", - "peeking_take_while", - "proc-macro2 1.0.28", - "quote 1.0.9", - "regex", - "rustc-hash", - "shlex 1.1.0", -] - -[[package]] -name = "bit-set" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e11e16035ea35e4e5997b393eacbf6f63983188f7a2ad25bfb13465f5ad59de" +name = "aptos-github-client" +version = "0.1.0" dependencies = [ - "bit-vec", + "aptos-workspace-hack", + "base64", + "proxy", + "serde 1.0.130", + "serde_json", + "thiserror", + "ureq", ] [[package]] -name = "bit-vec" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" - -[[package]] -name = "bitflags" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" +name = "aptos-global-constants" +version = "0.1.0" [[package]] -name = "bitmaps" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "031043d04099746d8db04daf1fa424b2bc8bd69d92b25962dcde24da39ab64a2" +name = "aptos-id-generator" +version = "0.1.0" dependencies = [ - "typenum", + "aptos-workspace-hack", ] [[package]] -name = "bitvec" -version = "0.19.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8942c8d352ae1838c9dda0b0ca2ab657696ef2232a20147cf1b30ae1a9cb4321" +name = "aptos-infallible" +version = "0.1.0" dependencies = [ - "funty", - "radium", - "tap", - "wyz", + "aptos-workspace-hack", ] [[package]] -name = "block-buffer" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" +name = "aptos-jellyfish-merkle" +version = "0.1.0" dependencies = [ - "block-padding 0.1.5", - "byte-tools", + "anyhow", + "aptos-crypto", + "aptos-crypto-derive", + "aptos-infallible", + "aptos-metrics", + "aptos-types", + "aptos-workspace-hack", + "bcs", "byteorder", - "generic-array 0.12.4", + "itertools 0.10.1", + "mirai-annotations", + "num-derive", + "num-traits 0.2.14", + "once_cell", + "proptest", + "proptest-derive", + "rand 0.8.4", + "serde 1.0.130", + "storage-interface", + "thiserror", ] [[package]] -name = "block-buffer" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" +name = "aptos-keygen" +version = "0.1.0" dependencies = [ - "block-padding 0.2.1", - "generic-array 0.14.4", + "aptos-crypto", + "aptos-types", + "aptos-workspace-hack", + "hex", + "rand 0.8.4", + "sha3", ] [[package]] -name = "block-padding" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5" +name = "aptos-log-derive" +version = "0.1.0" dependencies = [ - "byte-tools", + "aptos-workspace-hack", + "proc-macro2 1.0.28", + "quote 1.0.9", + "syn 1.0.74", ] [[package]] -name = "block-padding" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" - -[[package]] -name = "bounded-executor" +name = "aptos-logger" version = "0.1.0" dependencies = [ - "diem-workspace-hack", - "futures", - "tokio", + "aptos-infallible", + "aptos-log-derive", + "aptos-workspace-hack", + "backtrace", + "chrono", + "erased-serde", + "hostname", + "once_cell", + "prometheus", + "serde 1.0.130", + "serde_json", + "tracing", + "tracing-subscriber", ] [[package]] -name = "bstr" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a40b47ad93e1a5404e6c18dec46b628214fee441c70f4ab5d6942142cc268a3d" +name = "aptos-management" +version = "0.1.0" dependencies = [ - "lazy_static 1.4.0", - "memchr", - "regex-automata", + "anyhow", + "aptos-config", + "aptos-crypto", + "aptos-global-constants", + "aptos-secure-storage", + "aptos-temppath", + "aptos-time-service", + "aptos-transaction-builder", + "aptos-types", + "aptos-workspace-hack", + "bcs", + "hex", "serde 1.0.130", + "serde_yaml", + "structopt", + "thiserror", + "toml", ] [[package]] -name = "buf_redux" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b953a6887648bb07a535631f2bc00fbdb2a2216f135552cb3f534ed136b9c07f" +name = "aptos-mempool" +version = "0.1.0" dependencies = [ - "memchr", - "safemem", + "anyhow", + "aptos-config", + "aptos-crypto", + "aptos-id-generator", + "aptos-infallible", + "aptos-logger", + "aptos-metrics", + "aptos-proptest-helpers", + "aptos-types", + "aptos-workspace-hack", + "async-trait", + "bcs", + "bounded-executor", + "channel", + "enum_dispatch", + "event-notifications", + "fail", + "futures", + "itertools 0.10.1", + "mempool-notifications", + "mirai-annotations", + "netcore", + "network", + "once_cell", + "proptest", + "rand 0.8.4", + "rayon", + "serde 1.0.130", + "serde_json", + "short-hex-str", + "storage-interface", + "storage-service", + "thiserror", + "tokio", + "tokio-stream", + "vm-validator", ] [[package]] -name = "bumpalo" -version = "3.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63396b8a4b9de3f4fdfb320ab6080762242f66a8ef174c49d8e19b674db4cdbe" +name = "aptos-metrics" +version = "0.1.0" +dependencies = [ + "anyhow", + "aptos-logger", + "aptos-metrics-core", + "aptos-workspace-hack", + "assert_approx_eq", + "futures", + "hyper", + "once_cell", + "prometheus", + "rusty-fork", + "serde_json", + "tokio", +] [[package]] -name = "byte-tools" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" +name = "aptos-metrics-core" +version = "0.1.0" +dependencies = [ + "aptos-workspace-hack", + "prometheus", +] [[package]] -name = "bytecode-interpreter-crypto" +name = "aptos-node" version = "0.1.0" -source = "git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860#98ed299a7e3a9223019c9bdf4dd92fea9faef860" dependencies = [ - "anyhow", - "curve25519-dalek-fiat", - "ed25519-dalek-fiat", - "sha2", - "sha3", - "workspace-hack 0.1.0 (git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860)", + "aptos-api", + "aptos-config", + "aptos-crypto", + "aptos-data-client", + "aptos-genesis-tool", + "aptos-infallible", + "aptos-logger", + "aptos-mempool", + "aptos-metrics", + "aptos-secure-storage", + "aptos-temppath", + "aptos-time-service", + "aptos-types", + "aptos-vm", + "aptos-workspace-hack", + "aptosdb", + "backup-service", + "bcs", + "consensus", + "consensus-notifications", + "crash-handler", + "data-streaming-service", + "debug-interface", + "diem-framework-releases", + "event-notifications", + "executor", + "executor-types", + "fail", + "futures", + "hex", + "jemallocator", + "mempool-notifications", + "network", + "network-builder", + "rand 0.8.4", + "state-sync-multiplexer", + "state-sync-v1", + "storage-client", + "storage-interface", + "storage-service", + "storage-service-client", + "storage-service-server", + "structopt", + "tokio", + "tokio-stream", ] [[package]] -name = "byteorder" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +name = "aptos-operational-tool" +version = "0.1.0" +dependencies = [ + "anyhow", + "aptos-config", + "aptos-crypto", + "aptos-global-constants", + "aptos-infallible", + "aptos-management", + "aptos-rest-client", + "aptos-secure-storage", + "aptos-temppath", + "aptos-transaction-builder", + "aptos-types", + "aptos-workspace-hack", + "base64", + "bcs", + "fallible", + "futures", + "hex", + "itertools 0.10.1", + "netcore", + "network", + "rand 0.8.4", + "serde 1.0.130", + "serde_json", + "serde_yaml", + "structopt", + "thiserror", + "tokio", + "tokio-util", + "toml", + "url", +] [[package]] -name = "bytes" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040" +name = "aptos-parallel-executor" +version = "0.1.0" dependencies = [ - "serde 1.0.130", + "anyhow", + "aptos-workspace-hack", + "criterion", + "crossbeam-queue", + "mvhashmap", + "num_cpus", + "once_cell", + "proptest", + "proptest-derive", + "rand 0.8.4", + "rayon", ] [[package]] -name = "c_linked_list" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4964518bd3b4a8190e832886cdc0da9794f12e8e6c1613a9e90ff331c4c8724b" +name = "aptos-proptest-helpers" +version = "0.1.0" +dependencies = [ + "aptos-workspace-hack", + "crossbeam", + "proptest", + "proptest-derive", +] [[package]] -name = "camino" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52d74260d9bf6944e2208aa46841b4b8f0d7ffc0849a06837b2f510337f86b2b" +name = "aptos-rate-limiter" +version = "0.1.0" dependencies = [ - "serde 1.0.130", + "aptos-infallible", + "aptos-logger", + "aptos-metrics", + "aptos-workspace-hack", + "futures", + "pin-project", + "tokio", + "tokio-util", ] [[package]] -name = "cargo-platform" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0226944a63d1bf35a3b5f948dd7c59e263db83695c9e8bffc4037de02e30f1d7" +name = "aptos-resource-viewer" +version = "0.1.0" dependencies = [ - "serde 1.0.130", + "anyhow", + "aptos-types", + "aptos-workspace-hack", + "move-binary-format", + "move-core-types", + "move-resource-viewer", ] [[package]] -name = "cargo_metadata" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba2ae6de944143141f6155a473a6b02f66c7c3f9f47316f802f80204ebfe6e12" +name = "aptos-rest-client" +version = "0.0.0" dependencies = [ - "camino", - "cargo-platform", - "semver 1.0.4", + "anyhow", + "aptos-api-types", + "aptos-crypto", + "aptos-transaction-builder", + "aptos-types", + "aptos-workspace-hack", + "bcs", + "hex", + "move-core-types", + "reqwest", "serde 1.0.130", "serde_json", + "tokio", + "url", ] [[package]] -name = "cassowary" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" - -[[package]] -name = "cast" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b9434b9a5aa1450faa3f9cb14ea0e8c53bb5d2b3c1bfd1ab4fc03e9f33fbfb0" +name = "aptos-retrier" +version = "0.1.0" dependencies = [ - "rustc_version 0.2.3", + "aptos-logger", + "aptos-workspace-hack", + "tokio", ] [[package]] -name = "cc" -version = "1.0.67" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd" +name = "aptos-sdk" +version = "0.0.3" dependencies = [ - "jobserver", + "aptos-crypto", + "aptos-transaction-builder", + "aptos-types", + "aptos-workspace-hack", + "bcs", + "move-core-types", + "rand_core 0.6.2", + "serde 1.0.130", ] [[package]] -name = "cexpr" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db507a7679252d2276ed0dd8113c6875ec56d3089f9225b2b42c30cc1f8e5c89" +name = "aptos-secure-net" +version = "0.1.0" dependencies = [ - "nom 6.1.2", + "aptos-config", + "aptos-logger", + "aptos-secure-push-metrics", + "aptos-workspace-hack", + "once_cell", + "serde 1.0.130", + "thiserror", ] [[package]] -name = "cfg-expr" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edae0b9625d1fce32f7d64b71784d9b1bf8469ec1a9c417e44aaf16a9cbd7571" +name = "aptos-secure-push-metrics" +version = "0.1.0" dependencies = [ - "smallvec", - "target-lexicon", + "aptos-logger", + "aptos-metrics-core", + "aptos-workspace-hack", + "ureq", ] [[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +name = "aptos-secure-storage" +version = "0.1.0" +dependencies = [ + "aptos-crypto", + "aptos-crypto-derive", + "aptos-github-client", + "aptos-infallible", + "aptos-logger", + "aptos-temppath", + "aptos-time-service", + "aptos-vault-client", + "aptos-workspace-hack", + "base64", + "bcs", + "chrono", + "enum_dispatch", + "rand 0.8.4", + "serde 1.0.130", + "serde_json", + "thiserror", +] [[package]] -name = "channel" +name = "aptos-state-view" version = "0.1.0" dependencies = [ "anyhow", - "diem-infallible", - "diem-metrics", - "diem-types", - "diem-workspace-hack", - "futures", - "tokio", + "aptos-crypto", + "aptos-types", + "aptos-workspace-hack", ] [[package]] -name = "chrono" -version = "0.4.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" +name = "aptos-storage-inspector" +version = "0.1.0" dependencies = [ - "libc", - "num-integer", - "num-traits 0.2.14", - "serde 1.0.130", - "time 0.1.44", - "winapi 0.3.9", + "anyhow", + "aptos-config", + "aptos-crypto", + "aptos-logger", + "aptos-types", + "aptos-workspace-hack", + "aptosdb", + "diem-framework-releases", + "storage-interface", + "structopt", + "tempfile", ] [[package]] -name = "chrono-tz" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2554a3155fec064362507487171dcc4edc3df60cb10f3a1fb10ed8094822b120" +name = "aptos-temppath" +version = "0.1.0" dependencies = [ - "chrono", - "parse-zoneinfo", + "aptos-workspace-hack", + "hex", + "rand 0.8.4", ] [[package]] -name = "chunked_transfer" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff857943da45f546682664a79488be82e69e43c1a7a2307679ab9afb3a66d2e" +name = "aptos-time-service" +version = "0.1.0" +dependencies = [ + "aptos-infallible", + "aptos-workspace-hack", + "enum_dispatch", + "futures", + "pin-project", + "thiserror", + "tokio", + "tokio-test", +] [[package]] -name = "cipher" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801" +name = "aptos-transaction-benchmarks" +version = "0.1.0" dependencies = [ - "generic-array 0.14.4", + "aptos-crypto", + "aptos-types", + "aptos-vm", + "aptos-workspace-hack", + "criterion", + "criterion-cpu-time", + "diem-framework-releases", + "language-e2e-tests", + "proptest", + "read-write-set", + "read-write-set-dynamic", ] [[package]] -name = "claim" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f81099d6bb72e1df6d50bb2347224b666a670912bb7f06dbe867a4a070ab3ce8" +name = "aptos-transaction-builder" +version = "0.0.3" dependencies = [ - "autocfg", + "anyhow", + "aptos-types", + "aptos-workspace-hack", + "bcs", + "move-core-types", + "once_cell", + "proptest", + "proptest-derive", + "serde 1.0.130", ] [[package]] -name = "clang-sys" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cf2cc85830eae84823884db23c5306442a6c3d5bfd3beb2f2a2c829faa1816" +name = "aptos-transaction-replay" +version = "0.1.0" dependencies = [ - "glob", - "libc", - "libloading", + "anyhow", + "aptos-resource-viewer", + "aptos-state-view", + "aptos-types", + "aptos-validator-interface", + "aptos-vm", + "aptos-workspace-hack", + "aptosdb", + "bcs", + "diem-framework", + "diem-framework-releases", + "difference", + "hex", + "move-binary-format", + "move-cli", + "move-compiler", + "move-core-types", + "move-vm-runtime", + "move-vm-test-utils", + "move-vm-types", + "structopt", + "vm-genesis", ] [[package]] -name = "clap" -version = "2.33.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" +name = "aptos-transactional-test-harness" +version = "0.1.0" dependencies = [ - "ansi_term 0.11.0", - "atty", - "bitflags", - "strsim", - "textwrap 0.11.0", - "unicode-width", - "vec_map", + "anyhow", + "aptos-crypto", + "aptos-keygen", + "aptos-state-view", + "aptos-transaction-builder", + "aptos-types", + "aptos-vm", + "aptos-workspace-hack", + "bcs", + "datatest-stable", + "diem-framework", + "either", + "hex", + "language-e2e-tests", + "move-binary-format", + "move-command-line-common", + "move-compiler", + "move-core-types", + "move-transactional-test-runner", + "once_cell", + "structopt", + "vm-genesis", ] [[package]] -name = "codespan" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3362992a0d9f1dd7c3d0e89e0ab2bb540b7a95fea8cd798090e758fda2899b5e" +name = "aptos-types" +version = "0.0.3" dependencies = [ - "codespan-reporting", + "aes-gcm", + "anyhow", + "aptos-crypto", + "aptos-crypto-derive", + "aptos-workspace-hack", + "bcs", + "bytes", + "chrono", + "hex", + "itertools 0.10.1", + "mirai-annotations", + "move-core-types", + "move-read-write-set-types", + "once_cell", + "proptest", + "proptest-derive", + "rand 0.8.4", + "regex", "serde 1.0.130", + "serde_bytes", + "serde_json", + "thiserror", + "tiny-keccak", ] [[package]] -name = "codespan-reporting" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +name = "aptos-validator-interface" +version = "0.1.0" +dependencies = [ + "anyhow", + "aptos-config", + "aptos-state-view", + "aptos-types", + "aptos-workspace-hack", + "aptosdb", + "bcs", + "move-binary-format", + "scratchpad", + "storage-interface", +] + +[[package]] +name = "aptos-vault-client" +version = "0.1.0" dependencies = [ + "aptos-crypto", + "aptos-proptest-helpers", + "aptos-types", + "aptos-workspace-hack", + "base64", + "chrono", + "native-tls", + "once_cell", + "proptest", "serde 1.0.130", - "termcolor", - "unicode-width", + "serde_json", + "thiserror", + "ureq", ] [[package]] -name = "colored" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd" +name = "aptos-vm" +version = "0.1.0" dependencies = [ - "atty", - "lazy_static 1.4.0", - "winapi 0.3.9", + "anyhow", + "aptos-crypto", + "aptos-logger", + "aptos-metrics", + "aptos-parallel-executor", + "aptos-state-view", + "aptos-types", + "aptos-workspace-hack", + "bcs", + "diem-framework", + "diem-framework-releases", + "fail", + "mirai-annotations", + "move-binary-format", + "move-bytecode-utils", + "move-core-types", + "move-stdlib", + "move-vm-runtime", + "move-vm-types", + "mvhashmap", + "once_cell", + "proptest", + "rayon", + "read-write-set-dynamic", + "serde 1.0.130", + "serde_json", + "tracing", ] [[package]] -name = "colored-diff" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "516f260afc909bb0d056b76891ad91b3275b83682d851b566792077eee946efd" +name = "aptos-wallet" +version = "0.1.0" dependencies = [ - "ansi_term 0.11.0", - "difference", - "itertools 0.7.11", + "anyhow", + "aptos-crypto", + "aptos-temppath", + "aptos-types", + "aptos-workspace-hack", + "byteorder", + "hex", + "hmac", + "mirai-annotations", + "pbkdf2", + "rand 0.8.4", + "serde 1.0.130", + "sha2", + "thiserror", ] [[package]] -name = "combine" -version = "4.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2b2f5d0ee456f3928812dfc8c6d9a1d592b98678f6d56db9b0cd2b7bc6c8db5" +name = "aptos-workspace-hack" +version = "0.1.0" dependencies = [ + "Inflector", + "anyhow", + "backtrace", + "bitvec", + "byteorder", "bytes", + "cc", + "chrono", + "clap", + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-queue", + "crossbeam-utils", + "either", + "futures-channel", + "futures-core", + "futures-io", + "futures-sink", + "futures-util", + "hyper", + "indexmap", + "itertools 0.10.1", + "libc", + "log", "memchr", + "num-integer", + "num-traits 0.2.14", + "plotters", + "rand 0.8.4", + "regex", + "regex-automata", + "reqwest", + "rusty-fork", + "serde 1.0.130", + "serde_json", + "sha-1 0.9.4", + "standback", + "subtle", + "syn 1.0.74", + "tiny-keccak", + "tokio", + "tokio-util", + "toml", + "tracing", + "warp", + "zeroize", ] [[package]] -name = "config" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1b9d958c2b1368a663f05538fc1b5975adce1e19f435acceae987aceeeb369" +name = "aptos-writeset-generator" +version = "0.1.0" dependencies = [ - "lazy_static 1.4.0", - "nom 5.1.2", - "rust-ini", + "anyhow", + "aptos-crypto", + "aptos-crypto-derive", + "aptos-state-view", + "aptos-transaction-replay", + "aptos-types", + "aptos-vm", + "aptos-workspace-hack", + "aptosdb", + "bcs", + "diem-framework", + "diem-framework-releases", + "handlebars", + "hex", + "move-binary-format", + "move-bytecode-verifier", + "move-compiler", + "move-core-types", + "move-vm-runtime", + "move-vm-test-utils", + "move-vm-types", + "once_cell", + "read-write-set", "serde 1.0.130", - "serde-hjson", "serde_json", - "toml", - "yaml-rust", + "structopt", + "tempfile", ] [[package]] -name = "consensus" +name = "aptosdb" version = "0.1.0" dependencies = [ + "accumulator", "anyhow", - "async-trait", + "aptos-config", + "aptos-crypto", + "aptos-infallible", + "aptos-jellyfish-merkle", + "aptos-logger", + "aptos-metrics", + "aptos-proptest-helpers", + "aptos-temppath", + "aptos-types", + "aptos-workspace-hack", + "arc-swap", "bcs", "byteorder", - "bytes", - "channel", - "claim", - "consensus-notifications", - "consensus-types", - "diem-config", - "diem-crypto", - "diem-infallible", - "diem-logger", - "diem-mempool", - "diem-metrics", - "diem-secure-storage", - "diem-temppath", - "diem-types", - "diem-vm", - "diem-workspace-hack", - "event-notifications", - "execution-correctness", - "executor", - "executor-test-helpers", "executor-types", - "fail", - "fallible", - "futures", "itertools 0.10.1", - "mirai-annotations", - "network", + "move-core-types", "num-derive", "num-traits 0.2.14", + "num-variants", "once_cell", "proptest", + "proptest-derive", "rand 0.8.4", - "safety-rules", "schemadb", + "scratchpad", "serde 1.0.130", - "serde_json", - "short-hex-str", "storage-interface", - "tempfile", - "termion", "thiserror", - "tokio", - "vm-genesis", - "vm-validator", ] [[package]] -name = "consensus-notifications" +name = "aptossum" version = "0.1.0" dependencies = [ - "async-trait", - "claim", - "diem-crypto", - "diem-types", - "diem-workspace-hack", - "futures", - "move-core-types", - "serde 1.0.130", - "thiserror", - "tokio", -] - -[[package]] -name = "consensus-types" -version = "0.1.0" -dependencies = [ - "anyhow", - "bcs", - "diem-crypto", - "diem-crypto-derive", - "diem-infallible", - "diem-types", - "diem-workspace-hack", - "executor-types", - "itertools 0.10.1", - "mirai-annotations", - "proptest", + "anyhow", + "aptos-crypto", + "aptos-types", + "aptos-workspace-hack", + "aptosdb", "serde 1.0.130", "serde_json", - "short-hex-str", + "storage-interface", + "structopt", ] [[package]] -name = "console" -version = "0.14.0" +name = "arbitrary" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cc80946b3480f421c2f17ed1cb841753a371c7c5104f51d507e13f532c856aa" -dependencies = [ - "encode_unicode", - "lazy_static 1.4.0", - "libc", - "regex", - "terminal_size", - "unicode-width", - "winapi 0.3.9", -] +checksum = "db55d72333851e17d572bec876e390cd3b11eb1ef53ae821dd9f3b653d2b4569" [[package]] -name = "const-random" -version = "0.1.13" +name = "arc-swap" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f590d95d011aa80b063ffe3253422ed5aa462af4e9867d43ce8337562bac77c4" -dependencies = [ - "const-random-macro", - "proc-macro-hack", -] +checksum = "d4d7d63395147b81a9e570bcc6243aaf71c017bd666d4909cfef0085bdda8d73" [[package]] -name = "const-random-macro" -version = "0.1.13" +name = "array_tool" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "615f6e27d000a2bffbc7f2f6a8669179378fa27ee4d0a509e985dfc0a7defb40" -dependencies = [ - "getrandom 0.2.2", - "lazy_static 1.4.0", - "proc-macro-hack", - "tiny-keccak", -] +checksum = "8f8cb5d814eb646a863c4f24978cff2880c4be96ad8cde2c0f0678732902e271" [[package]] -name = "const_fn" -version = "0.4.5" +name = "arrayvec" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b9d6de7f49e22cf97ad17fc4036ece69300032f45f78f30b4a4482cdc3f4a6" +checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" [[package]] -name = "core-foundation" -version = "0.9.1" +name = "assert_approx_eq" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a89e2ae426ea83155dccf10c0fa6b1463ef6d5fcb44cee0b224a408fa640a62" +checksum = "3c07dab4369547dbe5114677b33fbbf724971019f3818172d59a97a61c774ffd" + +[[package]] +name = "async-stream" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3670df70cbc01729f901f94c887814b3c68db038aad1329a418bae178bc5295c" dependencies = [ - "core-foundation-sys", - "libc", + "async-stream-impl", + "futures-core", ] [[package]] -name = "core-foundation-sys" -version = "0.8.2" +name = "async-stream-impl" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b" +checksum = "a3548b8efc9f8e8a5a0a2808c5bd8451a9031b9e5b879a79590304ae928b0a70" +dependencies = [ + "proc-macro2 1.0.28", + "quote 1.0.9", + "syn 1.0.74", +] [[package]] -name = "cpuid-bool" -version = "0.1.2" +name = "async-trait" +version = "0.1.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634" +checksum = "36ea56748e10732c49404c153638a15ec3d6211ec5ff35d9bb20e13b93576adf" +dependencies = [ + "proc-macro2 1.0.28", + "quote 1.0.9", + "syn 1.0.74", +] [[package]] -name = "cpuid-bool" -version = "0.2.0" +name = "atomicwrites" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba" +checksum = "d4830ac690261d0b47f06e86d18c47eaa65d0184e576cf9b62c3a49b28cb876b" +dependencies = [ + "nix 0.20.0", + "tempfile", + "winapi 0.3.9", +] [[package]] -name = "crash-handler" -version = "0.1.0" +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ - "backtrace", - "diem-logger", - "diem-workspace-hack", - "serde 1.0.130", - "toml", + "hermit-abi", + "libc", + "winapi 0.3.9", ] [[package]] -name = "crc32fast" -version = "1.2.1" +name = "autocfg" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a" +checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" + +[[package]] +name = "backtrace" +version = "0.3.56" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d117600f438b1707d4e4ae15d3595657288f8235a0eb593e80ecc98ab34e1bc" dependencies = [ + "addr2line", "cfg-if 1.0.0", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", + "serde 1.0.130", ] [[package]] -name = "criterion" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab327ed7354547cc2ef43cbe20ef68b988e70b4b593cbd66a2a61733123a3d23" +name = "backup-cli" +version = "0.1.0" dependencies = [ - "atty", - "cast", - "clap", - "criterion-plot", - "csv", + "anyhow", + "aptos-config", + "aptos-crypto", + "aptos-infallible", + "aptos-jellyfish-merkle", + "aptos-logger", + "aptos-proptest-helpers", + "aptos-secure-push-metrics", + "aptos-temppath", + "aptos-types", + "aptos-vm", + "aptos-workspace-hack", + "aptosdb", + "async-trait", + "backup-service", + "bcs", + "byteorder", + "bytes", + "executor", + "executor-test-helpers", + "executor-types", + "futures", + "hex", "itertools 0.10.1", - "lazy_static 1.4.0", - "num-traits 0.2.14", - "oorandom", - "plotters", - "rayon", + "num_cpus", + "once_cell", + "pin-project", + "proptest", + "rand 0.8.4", "regex", + "reqwest", "serde 1.0.130", - "serde_cbor", - "serde_derive", "serde_json", - "tinytemplate", - "walkdir", + "storage-interface", + "structopt", + "tokio", + "tokio-stream", + "tokio-util", + "toml", + "warp", ] [[package]] -name = "criterion-cpu-time" +name = "backup-service" version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63aaaf47e457badbcb376c65a49d0f182c317ebd97dc6d1ced94c8e1d09c0f3a" dependencies = [ - "criterion", - "libc", + "anyhow", + "aptos-config", + "aptos-crypto", + "aptos-logger", + "aptos-metrics", + "aptos-temppath", + "aptos-types", + "aptos-workspace-hack", + "aptosdb", + "bcs", + "bytes", + "futures", + "hyper", + "once_cell", + "reqwest", + "serde 1.0.130", + "storage-interface", + "tokio", + "warp", ] [[package]] -name = "criterion-plot" -version = "0.4.3" +name = "base-x" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e022feadec601fba1649cfa83586381a4ad31c6bf3a9ab7d408118b05dd9889d" -dependencies = [ - "cast", - "itertools 0.9.0", -] +checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b" [[package]] -name = "crossbeam" -version = "0.8.0" +name = "base64" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd01a6eb3daaafa260f6fc94c3a6c36390abc2080e38e3e34ced87393fb77d80" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-epoch", - "crossbeam-queue", - "crossbeam-utils", -] +checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" [[package]] -name = "crossbeam-channel" -version = "0.5.1" +name = "base64ct" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-utils", -] +checksum = "7b8a45dc8036c7e52889226a96edacd45831c0dbdb8b803a58b8e0e12613b1a6" [[package]] -name = "crossbeam-deque" -version = "0.8.1" +name = "bcs" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" +checksum = "510fd83e3eaf7263b06182f3550b4c0af2af42cb36ab8024969ff5ea7fcb2833" dependencies = [ - "cfg-if 1.0.0", - "crossbeam-epoch", - "crossbeam-utils", + "serde 1.0.130", + "thiserror", ] [[package]] -name = "crossbeam-epoch" -version = "0.9.3" +name = "bech32" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2584f639eb95fea8c798496315b297cf81b9b58b6d30ab066a75455333cf4b12" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-utils", - "lazy_static 1.4.0", - "memoffset", - "scopeguard", -] +checksum = "6c7f7096bc256f5e5cb960f60dfc4f4ef979ca65abe7fb9d5a4f77150d3783d4" [[package]] -name = "crossbeam-queue" -version = "0.3.1" +name = "bimap" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f6cb3c7f5b8e51bc3ebb73a2327ad4abdbd119dc13223f14f961d2f38486756" +checksum = "50ae17cabbc8a38a1e3e4c1a6a664e9a09672dc14d0896fa8d865d3a5a446b07" + +[[package]] +name = "bincode" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" dependencies = [ - "cfg-if 1.0.0", - "crossbeam-utils", + "serde 1.0.130", ] [[package]] -name = "crossbeam-utils" -version = "0.8.3" +name = "bindgen" +version = "0.59.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7e9d99fa91428effe99c5c6d4634cdeba32b8cf784fc428a2a687f61a952c49" +checksum = "453c49e5950bb0eb63bb3df640e31618846c89d5b7faa54040d76e98e0134375" dependencies = [ - "autocfg", - "cfg-if 1.0.0", + "bitflags", + "cexpr", + "clang-sys", "lazy_static 1.4.0", + "lazycell", + "peeking_take_while", + "proc-macro2 1.0.28", + "quote 1.0.9", + "regex", + "rustc-hash", + "shlex 1.1.0", ] [[package]] -name = "crunchy" -version = "0.2.2" +name = "bit-set" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" +checksum = "6e11e16035ea35e4e5997b393eacbf6f63983188f7a2ad25bfb13465f5ad59de" +dependencies = [ + "bit-vec", +] [[package]] -name = "crypto-mac" -version = "0.10.0" +name = "bit-vec" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4857fd85a0c34b3c3297875b747c1e02e06b6a0ea32dd892d8192b9ce0813ea6" -dependencies = [ - "generic-array 0.14.4", - "subtle", -] +checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" [[package]] -name = "csv" -version = "1.1.6" +name = "bitflags" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1" -dependencies = [ - "bstr", - "csv-core", - "itoa 0.4.7", - "ryu", - "serde 1.0.130", -] +checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" [[package]] -name = "csv-core" -version = "0.1.10" +name = "bitmaps" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" +checksum = "031043d04099746d8db04daf1fa424b2bc8bd69d92b25962dcde24da39ab64a2" dependencies = [ - "memchr", + "typenum", ] [[package]] -name = "ctr" -version = "0.6.0" +name = "bitvec" +version = "0.19.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb4a30d54f7443bf3d6191dcd486aca19e67cb3c49fa7a06a319966346707e7f" +checksum = "8942c8d352ae1838c9dda0b0ca2ab657696ef2232a20147cf1b30ae1a9cb4321" dependencies = [ - "cipher", + "funty", + "radium", + "tap", + "wyz", ] [[package]] -name = "ctrlc" -version = "3.2.1" +name = "block-buffer" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19c6cedffdc8c03a3346d723eb20bd85a13362bb96dc2ac000842c6381ec7bf" +checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" dependencies = [ - "nix 0.23.1", - "winapi 0.3.9", + "block-padding 0.1.5", + "byte-tools", + "byteorder", + "generic-array 0.12.4", ] [[package]] -name = "curve25519-dalek-fiat" -version = "0.1.0" +name = "block-buffer" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44339b9ecede7f72a0d3b012bf9bb5a616dc8bfde23ce544e42da075c87198f0" +checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" dependencies = [ - "byteorder", - "digest 0.9.0", - "fiat-crypto", - "rand_core 0.6.2", - "subtle", - "zeroize", + "block-padding 0.2.1", + "generic-array 0.14.4", ] [[package]] -name = "dashmap" -version = "3.11.10" +name = "block-padding" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f260e2fc850179ef410018660006951c1b55b79e8087e87111a2c388994b9b5" +checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5" dependencies = [ - "ahash 0.3.8", - "cfg-if 0.1.10", - "num_cpus", + "byte-tools", ] [[package]] -name = "data-streaming-service" +name = "block-padding" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" + +[[package]] +name = "bounded-executor" version = "0.1.0" dependencies = [ - "async-trait", - "channel", - "claim", - "diem-config", - "diem-crypto", - "diem-data-client", - "diem-id-generator", - "diem-infallible", - "diem-logger", - "diem-metrics", - "diem-types", - "diem-workspace-hack", - "enum_dispatch", + "aptos-workspace-hack", "futures", - "network", - "once_cell", - "rand 0.8.4", - "serde 1.0.130", - "short-hex-str", - "storage-service-types", - "thiserror", "tokio", - "tokio-stream", ] [[package]] -name = "datatest-stable" -version = "0.1.1" +name = "bstr" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0ff02642cff6f40d39f61c8d51cb394fd313e1aa2057833b91ad788c4e9331f" +checksum = "a40b47ad93e1a5404e6c18dec46b628214fee441c70f4ab5d6942142cc268a3d" dependencies = [ - "regex", - "structopt", - "termcolor", - "walkdir", + "lazy_static 1.4.0", + "memchr", + "regex-automata", + "serde 1.0.130", ] [[package]] -name = "db-bootstrapper" -version = "0.1.0" +name = "buf_redux" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b953a6887648bb07a535631f2bc00fbdb2a2216f135552cb3f534ed136b9c07f" dependencies = [ - "anyhow", - "bcs", - "diem-config", - "diem-crypto", - "diem-temppath", - "diem-types", - "diem-vm", - "diem-workspace-hack", - "diemdb", - "executor", - "storage-interface", - "structopt", + "memchr", + "safemem", ] [[package]] -name = "debug-ignore" -version = "1.0.1" +name = "bumpalo" +version = "3.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "223089cd5a4e4491f0a0dddd9933f9575123160cf96ca2bb56a690046ecf1745" +checksum = "63396b8a4b9de3f4fdfb320ab6080762242f66a8ef174c49d8e19b674db4cdbe" [[package]] -name = "debug-interface" +name = "byte-tools" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" + +[[package]] +name = "bytecode-interpreter-crypto" version = "0.1.0" +source = "git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860#98ed299a7e3a9223019c9bdf4dd92fea9faef860" dependencies = [ "anyhow", - "bytes", - "diem-config", - "diem-logger", - "diem-metrics", - "diem-workspace-hack", - "reqwest", - "serde 1.0.130", - "serde_json", - "tokio", - "warp", + "curve25519-dalek-fiat", + "ed25519-dalek-fiat", + "sha2", + "sha3", + "workspace-hack 0.1.0 (git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860)", ] [[package]] -name = "determinator" -version = "0.7.0" +name = "byteorder" +version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d6cd961d655fa64c18f515cf6c2e4bd38deaeaa1a8c7d0142c18d750ef73d18" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + +[[package]] +name = "bytes" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040" dependencies = [ - "camino", - "globset", - "guppy", - "itertools 0.10.1", - "once_cell", - "petgraph 0.6.0", - "rayon", "serde 1.0.130", - "toml", ] [[package]] -name = "deunicode" -version = "0.4.3" +name = "c_linked_list" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "850878694b7933ca4c9569d30a34b55031b9b139ee1fc7b94a527c4ef960d690" +checksum = "4964518bd3b4a8190e832886cdc0da9794f12e8e6c1613a9e90ff331c4c8724b" [[package]] -name = "df-cli" -version = "0.1.0" +name = "camino" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52d74260d9bf6944e2208aa46841b4b8f0d7ffc0849a06837b2f510337f86b2b" dependencies = [ - "anyhow", - "bcs", - "datatest-stable", - "diem-framework-releases", - "diem-vm", - "diem-workspace-hack", - "move-cli", - "move-core-types", - "structopt", + "serde 1.0.130", ] [[package]] -name = "diem-api" -version = "0.1.0" +name = "cargo-platform" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0226944a63d1bf35a3b5f948dd7c59e263db83695c9e8bffc4037de02e30f1d7" dependencies = [ - "anyhow", - "bcs", - "bytes", - "diem-api-types", - "diem-config", - "diem-crypto", - "diem-framework-releases", - "diem-genesis-tool", - "diem-global-constants", - "diem-logger", - "diem-mempool", - "diem-metrics", - "diem-sdk", - "diem-secure-storage", - "diem-temppath", - "diem-types", - "diem-vm", - "diem-workspace-hack", - "diemdb", - "executor", - "executor-types", - "fail", - "futures", - "hex", - "hyper", - "mempool-notifications", - "move-core-types", - "move-resource-viewer", - "once_cell", - "percent-encoding", - "rand 0.8.4", - "reqwest", "serde 1.0.130", - "serde_json", - "storage-interface", - "tokio", - "vm-validator", - "warp", ] [[package]] -name = "diem-api-types" -version = "0.0.1" +name = "cargo_metadata" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba2ae6de944143141f6155a473a6b02f66c7c3f9f47316f802f80204ebfe6e12" dependencies = [ - "anyhow", - "bcs", - "diem-crypto", - "diem-transaction-builder", - "diem-types", - "diem-workspace-hack", - "hex", - "move-binary-format", - "move-core-types", - "move-resource-viewer", + "camino", + "cargo-platform", + "semver 1.0.4", "serde 1.0.130", "serde_json", - "warp", ] [[package]] -name = "diem-bitvec" -version = "0.1.0" -dependencies = [ - "bcs", - "diem-workspace-hack", - "proptest", - "proptest-derive", - "serde 1.0.130", - "serde_bytes", -] - -[[package]] -name = "diem-config" -version = "0.1.0" -dependencies = [ - "bcs", - "diem-crypto", - "diem-crypto-derive", - "diem-global-constants", - "diem-logger", - "diem-secure-storage", - "diem-temppath", - "diem-types", - "diem-workspace-hack", - "get_if_addrs", - "log", - "mirai-annotations", - "rand 0.8.4", - "serde 1.0.130", - "serde_yaml", - "short-hex-str", - "thiserror", -] +name = "cassowary" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" [[package]] -name = "diem-crypto" -version = "0.0.3" +name = "cast" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b9434b9a5aa1450faa3f9cb14ea0e8c53bb5d2b3c1bfd1ab4fc03e9f33fbfb0" dependencies = [ - "aes-gcm", - "anyhow", - "bcs", - "bitvec", - "byteorder", - "bytes", - "criterion", - "curve25519-dalek-fiat", - "diem-crypto-derive", - "diem-workspace-hack", - "digest 0.9.0", - "ed25519-dalek-fiat", - "hex", - "hkdf", - "mirai-annotations", - "once_cell", - "proptest", - "proptest-derive", - "rand 0.8.4", - "rand_core 0.6.2", - "ripemd160", - "serde 1.0.130", - "serde-name", - "serde_bytes", - "serde_json", - "sha2", - "sha3", - "static_assertions", - "thiserror", - "tiny-keccak", - "trybuild", - "x25519-dalek-fiat", + "rustc_version 0.2.3", ] [[package]] -name = "diem-crypto-derive" -version = "0.0.3" +name = "cc" +version = "1.0.67" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd" dependencies = [ - "anyhow", - "diem-workspace-hack", - "proc-macro2 1.0.28", - "quote 1.0.9", - "syn 1.0.74", + "jobserver", ] [[package]] -name = "diem-data-client" -version = "0.1.0" +name = "cexpr" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db507a7679252d2276ed0dd8113c6875ec56d3089f9225b2b42c30cc1f8e5c89" dependencies = [ - "async-trait", - "bcs", - "channel", - "claim", - "diem-config", - "diem-crypto", - "diem-id-generator", - "diem-infallible", - "diem-logger", - "diem-metrics", - "diem-time-service", - "diem-types", - "diem-workspace-hack", - "futures", - "itertools 0.10.1", - "maplit", - "network", - "rand 0.8.4", - "serde 1.0.130", - "storage-service-client", - "storage-service-server", - "storage-service-types", - "thiserror", - "tokio", + "nom 6.1.2", ] [[package]] -name = "diem-documentation-tool" -version = "0.1.0" +name = "cfg-expr" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edae0b9625d1fce32f7d64b71784d9b1bf8469ec1a9c417e44aaf16a9cbd7571" dependencies = [ - "anyhow", - "diem-workspace-hack", - "once_cell", - "regex", - "serde 1.0.130", - "serde-generate", - "serde-reflection", - "serde_yaml", - "structopt", - "tempfile", + "smallvec", + "target-lexicon", ] [[package]] -name = "diem-e2e-tests-replay" -version = "0.1.0" -dependencies = [ - "anyhow", - "bcs", - "diem-framework", - "diem-types", - "diem-vm", - "diem-workspace-hack", - "language-e2e-tests", - "move-binary-format", - "move-core-types", - "move-model", - "move-stackless-bytecode-interpreter", - "move-vm-runtime", - "move-vm-types", - "structopt", - "walkdir", -] +name = "cfg-if" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" [[package]] -name = "diem-experimental-framework-releases" -version = "0.1.0" -dependencies = [ - "anyhow", - "bcs", - "diem-crypto", - "diem-types", - "diem-workspace-hack", - "framework-releases", - "include_dir", - "move-binary-format", - "move-command-line-common", - "once_cell", -] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] -name = "diem-faucet" +name = "channel" version = "0.1.0" dependencies = [ "anyhow", - "bcs", - "bytes", - "diem-config", - "diem-crypto", - "diem-infallible", - "diem-logger", - "diem-rest-client", - "diem-sdk", - "diem-workspace-hack", + "aptos-infallible", + "aptos-metrics", + "aptos-types", + "aptos-workspace-hack", "futures", - "generate-key", - "hex", - "rand 0.8.4", - "reqwest", - "serde 1.0.130", - "serde_json", - "structopt", - "tempfile", "tokio", - "url", - "warp", -] - -[[package]] -name = "diem-framework" -version = "0.1.0" -dependencies = [ - "anyhow", - "bcs", - "clap", - "datatest-stable", - "diem-crypto", - "diem-transactional-test-harness", - "diem-types", - "diem-vm", - "diem-workspace-hack", - "dir-diff", - "include_dir", - "log", - "move-abigen", - "move-binary-format", - "move-bytecode-utils", - "move-bytecode-verifier", - "move-cli", - "move-command-line-common", - "move-compiler", - "move-core-types", - "move-docgen", - "move-errmapgen", - "move-package", - "move-prover", - "move-stdlib", - "move-symbol-pool", - "move-unit-test", - "move-vm-runtime", - "move-vm-types", - "once_cell", - "rayon", - "sha2", - "smallvec", - "structopt", - "tempfile", - "transaction-builder-generator", ] [[package]] -name = "diem-framework-releases" -version = "0.1.0" +name = "chrono" +version = "0.4.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" dependencies = [ - "anyhow", - "bcs", - "diem-crypto", - "diem-types", - "diem-workspace-hack", - "framework-releases", - "include_dir", - "move-binary-format", - "move-bytecode-verifier", - "move-command-line-common", - "once_cell", + "libc", + "num-integer", + "num-traits 0.2.14", + "serde 1.0.130", + "time 0.1.44", + "winapi 0.3.9", ] [[package]] -name = "diem-fuzz" -version = "0.1.0" +name = "chrono-tz" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2554a3155fec064362507487171dcc4edc3df60cb10f3a1fb10ed8094822b120" dependencies = [ - "diem-fuzzer", - "diem-workspace-hack", - "libfuzzer-sys", - "once_cell", + "chrono", + "parse-zoneinfo", ] [[package]] -name = "diem-fuzzer" -version = "0.1.0" -dependencies = [ - "accumulator", - "anyhow", - "bcs", - "byteorder", - "consensus", - "consensus-types", - "datatest-stable", - "diem-crypto", - "diem-jellyfish-merkle", - "diem-mempool", - "diem-proptest-helpers", - "diem-types", - "diem-vault-client", - "diem-workspace-hack", - "diemdb", - "executor", - "executor-types", - "hex", - "language-e2e-tests", - "move-binary-format", - "move-core-types", - "move-vm-types", - "network", - "once_cell", - "proptest", - "proptest-derive", - "rand 0.8.4", - "rusty-fork", - "safety-rules", - "scratchpad", - "serde_json", - "sha-1 0.9.4", - "state-sync-v1", - "stats_alloc", - "storage-interface", - "structopt", - "ureq", -] +name = "chunked_transfer" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fff857943da45f546682664a79488be82e69e43c1a7a2307679ab9afb3a66d2e" [[package]] -name = "diem-genesis-tool" -version = "0.1.0" +name = "cipher" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801" dependencies = [ - "anyhow", - "bcs", - "consensus-types", - "diem-config", - "diem-crypto", - "diem-framework-releases", - "diem-global-constants", - "diem-management", - "diem-secure-storage", - "diem-temppath", - "diem-types", - "diem-vm", - "diem-workspace-hack", - "diemdb", - "executor", - "generate-key", - "rand 0.8.4", - "serde 1.0.130", - "storage-interface", - "structopt", - "thiserror", - "toml", - "vm-genesis", + "generic-array 0.14.4", ] [[package]] -name = "diem-github-client" -version = "0.1.0" +name = "claim" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f81099d6bb72e1df6d50bb2347224b666a670912bb7f06dbe867a4a070ab3ce8" dependencies = [ - "base64", - "diem-workspace-hack", - "proxy", - "serde 1.0.130", - "serde_json", - "thiserror", - "ureq", + "autocfg", ] [[package]] -name = "diem-global-constants" -version = "0.1.0" +name = "clang-sys" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81cf2cc85830eae84823884db23c5306442a6c3d5bfd3beb2f2a2c829faa1816" +dependencies = [ + "glob", + "libc", + "libloading", +] [[package]] -name = "diem-id-generator" -version = "0.1.0" +name = "clap" +version = "2.33.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" dependencies = [ - "diem-workspace-hack", + "ansi_term 0.11.0", + "atty", + "bitflags", + "strsim", + "textwrap 0.11.0", + "unicode-width", + "vec_map", ] [[package]] -name = "diem-infallible" -version = "0.1.0" +name = "codespan" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3362992a0d9f1dd7c3d0e89e0ab2bb540b7a95fea8cd798090e758fda2899b5e" dependencies = [ - "diem-workspace-hack", + "codespan-reporting", + "serde 1.0.130", ] [[package]] -name = "diem-jellyfish-merkle" -version = "0.1.0" +name = "codespan-reporting" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" dependencies = [ - "anyhow", - "bcs", - "byteorder", - "diem-crypto", - "diem-crypto-derive", - "diem-infallible", - "diem-metrics", - "diem-types", - "diem-workspace-hack", - "itertools 0.10.1", - "mirai-annotations", - "num-derive", - "num-traits 0.2.14", - "once_cell", - "proptest", - "proptest-derive", - "rand 0.8.4", "serde 1.0.130", - "storage-interface", - "thiserror", + "termcolor", + "unicode-width", ] [[package]] -name = "diem-keygen" -version = "0.1.0" +name = "colored" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd" dependencies = [ - "diem-crypto", - "diem-types", - "diem-workspace-hack", - "hex", - "rand 0.8.4", - "sha3", + "atty", + "lazy_static 1.4.0", + "winapi 0.3.9", ] [[package]] -name = "diem-log-derive" -version = "0.1.0" +name = "colored-diff" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "516f260afc909bb0d056b76891ad91b3275b83682d851b566792077eee946efd" dependencies = [ - "diem-workspace-hack", - "proc-macro2 1.0.28", - "quote 1.0.9", - "syn 1.0.74", + "ansi_term 0.11.0", + "difference", + "itertools 0.7.11", ] [[package]] -name = "diem-logger" -version = "0.1.0" +name = "combine" +version = "4.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2b2f5d0ee456f3928812dfc8c6d9a1d592b98678f6d56db9b0cd2b7bc6c8db5" dependencies = [ - "backtrace", - "chrono", - "diem-infallible", - "diem-log-derive", - "diem-workspace-hack", - "erased-serde", - "hostname", - "once_cell", - "prometheus", - "serde 1.0.130", - "serde_json", - "tracing", - "tracing-subscriber", + "bytes", + "memchr", ] [[package]] -name = "diem-management" -version = "0.1.0" +name = "config" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b1b9d958c2b1368a663f05538fc1b5975adce1e19f435acceae987aceeeb369" dependencies = [ - "anyhow", - "bcs", - "diem-config", - "diem-crypto", - "diem-global-constants", - "diem-secure-storage", - "diem-temppath", - "diem-time-service", - "diem-transaction-builder", - "diem-types", - "diem-workspace-hack", - "hex", + "lazy_static 1.4.0", + "nom 5.1.2", + "rust-ini", "serde 1.0.130", - "serde_yaml", - "structopt", - "thiserror", + "serde-hjson", + "serde_json", "toml", + "yaml-rust", ] [[package]] -name = "diem-mempool" +name = "consensus" version = "0.1.0" dependencies = [ "anyhow", + "aptos-config", + "aptos-crypto", + "aptos-infallible", + "aptos-logger", + "aptos-mempool", + "aptos-metrics", + "aptos-secure-storage", + "aptos-temppath", + "aptos-types", + "aptos-vm", + "aptos-workspace-hack", "async-trait", "bcs", - "bounded-executor", + "byteorder", + "bytes", "channel", - "diem-config", - "diem-crypto", - "diem-id-generator", - "diem-infallible", - "diem-logger", - "diem-metrics", - "diem-proptest-helpers", - "diem-types", - "diem-workspace-hack", - "enum_dispatch", + "claim", + "consensus-notifications", + "consensus-types", "event-notifications", + "execution-correctness", + "executor", + "executor-test-helpers", + "executor-types", "fail", + "fallible", "futures", "itertools 0.10.1", - "mempool-notifications", "mirai-annotations", - "netcore", "network", + "num-derive", + "num-traits 0.2.14", "once_cell", "proptest", "rand 0.8.4", - "rayon", + "safety-rules", + "schemadb", "serde 1.0.130", "serde_json", "short-hex-str", "storage-interface", - "storage-service", + "tempfile", + "termion", "thiserror", "tokio", - "tokio-stream", + "vm-genesis", "vm-validator", ] [[package]] -name = "diem-metrics" +name = "consensus-notifications" version = "0.1.0" dependencies = [ - "anyhow", - "assert_approx_eq", - "diem-logger", - "diem-metrics-core", - "diem-workspace-hack", + "aptos-crypto", + "aptos-types", + "aptos-workspace-hack", + "async-trait", + "claim", "futures", - "hyper", - "once_cell", - "prometheus", - "rusty-fork", - "serde_json", + "move-core-types", + "serde 1.0.130", + "thiserror", "tokio", ] [[package]] -name = "diem-metrics-core" +name = "consensus-types" version = "0.1.0" dependencies = [ - "diem-workspace-hack", - "prometheus", + "anyhow", + "aptos-crypto", + "aptos-crypto-derive", + "aptos-infallible", + "aptos-types", + "aptos-workspace-hack", + "bcs", + "executor-types", + "itertools 0.10.1", + "mirai-annotations", + "proptest", + "serde 1.0.130", + "serde_json", + "short-hex-str", ] [[package]] -name = "diem-node" -version = "0.1.0" +name = "console" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cc80946b3480f421c2f17ed1cb841753a371c7c5104f51d507e13f532c856aa" dependencies = [ - "backup-service", - "bcs", - "consensus", - "consensus-notifications", - "crash-handler", - "data-streaming-service", - "debug-interface", - "diem-api", - "diem-config", - "diem-crypto", - "diem-data-client", - "diem-framework-releases", - "diem-genesis-tool", - "diem-infallible", - "diem-logger", - "diem-mempool", - "diem-metrics", - "diem-secure-storage", - "diem-temppath", - "diem-time-service", - "diem-types", - "diem-vm", - "diem-workspace-hack", - "diemdb", - "event-notifications", - "executor", - "executor-types", - "fail", - "futures", - "hex", - "jemallocator", - "mempool-notifications", - "network", - "network-builder", - "rand 0.8.4", - "state-sync-multiplexer", - "state-sync-v1", - "storage-client", - "storage-interface", - "storage-service", - "storage-service-client", - "storage-service-server", - "structopt", - "tokio", - "tokio-stream", + "encode_unicode", + "lazy_static 1.4.0", + "libc", + "regex", + "terminal_size", + "unicode-width", + "winapi 0.3.9", +] + +[[package]] +name = "const-random" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f590d95d011aa80b063ffe3253422ed5aa462af4e9867d43ce8337562bac77c4" +dependencies = [ + "const-random-macro", + "proc-macro-hack", +] + +[[package]] +name = "const-random-macro" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "615f6e27d000a2bffbc7f2f6a8669179378fa27ee4d0a509e985dfc0a7defb40" +dependencies = [ + "getrandom 0.2.2", + "lazy_static 1.4.0", + "proc-macro-hack", + "tiny-keccak", +] + +[[package]] +name = "const_fn" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28b9d6de7f49e22cf97ad17fc4036ece69300032f45f78f30b4a4482cdc3f4a6" + +[[package]] +name = "core-foundation" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a89e2ae426ea83155dccf10c0fa6b1463ef6d5fcb44cee0b224a408fa640a62" +dependencies = [ + "core-foundation-sys", + "libc", ] [[package]] -name = "diem-operational-tool" +name = "core-foundation-sys" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b" + +[[package]] +name = "cpuid-bool" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634" + +[[package]] +name = "cpuid-bool" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba" + +[[package]] +name = "crash-handler" version = "0.1.0" dependencies = [ - "anyhow", - "base64", - "bcs", - "diem-config", - "diem-crypto", - "diem-global-constants", - "diem-infallible", - "diem-management", - "diem-rest-client", - "diem-secure-storage", - "diem-temppath", - "diem-transaction-builder", - "diem-types", - "diem-workspace-hack", - "fallible", - "futures", - "hex", - "itertools 0.10.1", - "netcore", - "network", - "rand 0.8.4", + "aptos-logger", + "aptos-workspace-hack", + "backtrace", "serde 1.0.130", - "serde_json", - "serde_yaml", - "structopt", - "thiserror", - "tokio", - "tokio-util", "toml", - "url", ] [[package]] -name = "diem-parallel-executor" -version = "0.1.0" +name = "crc32fast" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a" dependencies = [ - "anyhow", - "criterion", - "crossbeam-queue", - "diem-workspace-hack", - "mvhashmap", - "num_cpus", - "once_cell", - "proptest", - "proptest-derive", - "rand 0.8.4", - "rayon", + "cfg-if 1.0.0", ] [[package]] -name = "diem-proptest-helpers" -version = "0.1.0" +name = "criterion" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab327ed7354547cc2ef43cbe20ef68b988e70b4b593cbd66a2a61733123a3d23" dependencies = [ - "crossbeam", - "diem-workspace-hack", - "proptest", - "proptest-derive", + "atty", + "cast", + "clap", + "criterion-plot", + "csv", + "itertools 0.10.1", + "lazy_static 1.4.0", + "num-traits 0.2.14", + "oorandom", + "plotters", + "rayon", + "regex", + "serde 1.0.130", + "serde_cbor", + "serde_derive", + "serde_json", + "tinytemplate", + "walkdir", ] [[package]] -name = "diem-rate-limiter" +name = "criterion-cpu-time" version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63aaaf47e457badbcb376c65a49d0f182c317ebd97dc6d1ced94c8e1d09c0f3a" dependencies = [ - "diem-infallible", - "diem-logger", - "diem-metrics", - "diem-workspace-hack", - "futures", - "pin-project", - "tokio", - "tokio-util", + "criterion", + "libc", ] [[package]] -name = "diem-resource-viewer" -version = "0.1.0" +name = "criterion-plot" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e022feadec601fba1649cfa83586381a4ad31c6bf3a9ab7d408118b05dd9889d" dependencies = [ - "anyhow", - "diem-types", - "diem-workspace-hack", - "move-binary-format", - "move-core-types", - "move-resource-viewer", + "cast", + "itertools 0.9.0", ] [[package]] -name = "diem-rest-client" -version = "0.0.0" +name = "crossbeam" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd01a6eb3daaafa260f6fc94c3a6c36390abc2080e38e3e34ced87393fb77d80" dependencies = [ - "anyhow", - "bcs", - "diem-api-types", - "diem-crypto", - "diem-transaction-builder", - "diem-types", - "diem-workspace-hack", - "hex", - "move-core-types", - "reqwest", - "serde 1.0.130", - "serde_json", - "tokio", - "url", + "cfg-if 1.0.0", + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-epoch", + "crossbeam-queue", + "crossbeam-utils", ] [[package]] -name = "diem-retrier" -version = "0.1.0" +name = "crossbeam-channel" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4" dependencies = [ - "diem-logger", - "diem-workspace-hack", - "tokio", + "cfg-if 1.0.0", + "crossbeam-utils", ] [[package]] -name = "diem-sdk" -version = "0.0.3" +name = "crossbeam-deque" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" dependencies = [ - "bcs", - "diem-crypto", - "diem-transaction-builder", - "diem-types", - "diem-workspace-hack", - "move-core-types", - "rand_core 0.6.2", - "serde 1.0.130", + "cfg-if 1.0.0", + "crossbeam-epoch", + "crossbeam-utils", ] [[package]] -name = "diem-secure-net" -version = "0.1.0" +name = "crossbeam-epoch" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2584f639eb95fea8c798496315b297cf81b9b58b6d30ab066a75455333cf4b12" dependencies = [ - "diem-config", - "diem-logger", - "diem-secure-push-metrics", - "diem-workspace-hack", - "once_cell", - "serde 1.0.130", - "thiserror", + "cfg-if 1.0.0", + "crossbeam-utils", + "lazy_static 1.4.0", + "memoffset", + "scopeguard", ] [[package]] -name = "diem-secure-push-metrics" -version = "0.1.0" +name = "crossbeam-queue" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f6cb3c7f5b8e51bc3ebb73a2327ad4abdbd119dc13223f14f961d2f38486756" dependencies = [ - "diem-logger", - "diem-metrics-core", - "diem-workspace-hack", - "ureq", + "cfg-if 1.0.0", + "crossbeam-utils", ] [[package]] -name = "diem-secure-storage" -version = "0.1.0" +name = "crossbeam-utils" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7e9d99fa91428effe99c5c6d4634cdeba32b8cf784fc428a2a687f61a952c49" dependencies = [ - "base64", - "bcs", - "chrono", - "diem-crypto", - "diem-crypto-derive", - "diem-github-client", - "diem-infallible", - "diem-logger", - "diem-temppath", - "diem-time-service", - "diem-vault-client", - "diem-workspace-hack", - "enum_dispatch", - "rand 0.8.4", - "serde 1.0.130", - "serde_json", - "thiserror", + "autocfg", + "cfg-if 1.0.0", + "lazy_static 1.4.0", ] [[package]] -name = "diem-state-view" -version = "0.1.0" -dependencies = [ - "anyhow", - "diem-crypto", - "diem-types", - "diem-workspace-hack", -] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" [[package]] -name = "diem-storage-inspector" -version = "0.1.0" +name = "crypto-mac" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4857fd85a0c34b3c3297875b747c1e02e06b6a0ea32dd892d8192b9ce0813ea6" dependencies = [ - "anyhow", - "diem-config", - "diem-crypto", - "diem-framework-releases", - "diem-logger", - "diem-types", - "diem-workspace-hack", - "diemdb", - "storage-interface", - "structopt", - "tempfile", + "generic-array 0.14.4", + "subtle", ] [[package]] -name = "diem-temppath" -version = "0.1.0" +name = "csv" +version = "1.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1" dependencies = [ - "diem-workspace-hack", - "hex", - "rand 0.8.4", + "bstr", + "csv-core", + "itoa 0.4.7", + "ryu", + "serde 1.0.130", ] [[package]] -name = "diem-time-service" -version = "0.1.0" +name = "csv-core" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" dependencies = [ - "diem-infallible", - "diem-workspace-hack", - "enum_dispatch", - "futures", - "pin-project", - "thiserror", - "tokio", - "tokio-test", + "memchr", ] [[package]] -name = "diem-transaction-benchmarks" -version = "0.1.0" +name = "ctr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb4a30d54f7443bf3d6191dcd486aca19e67cb3c49fa7a06a319966346707e7f" dependencies = [ - "criterion", - "criterion-cpu-time", - "diem-crypto", - "diem-framework-releases", - "diem-types", - "diem-vm", - "diem-workspace-hack", - "language-e2e-tests", - "proptest", - "read-write-set", - "read-write-set-dynamic", + "cipher", ] [[package]] -name = "diem-transaction-builder" -version = "0.0.3" +name = "ctrlc" +version = "3.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a19c6cedffdc8c03a3346d723eb20bd85a13362bb96dc2ac000842c6381ec7bf" dependencies = [ - "anyhow", - "bcs", - "diem-types", - "diem-workspace-hack", - "move-core-types", - "once_cell", - "proptest", - "proptest-derive", - "serde 1.0.130", + "nix 0.23.1", + "winapi 0.3.9", ] [[package]] -name = "diem-transaction-replay" +name = "curve25519-dalek-fiat" version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44339b9ecede7f72a0d3b012bf9bb5a616dc8bfde23ce544e42da075c87198f0" dependencies = [ - "anyhow", - "bcs", - "diem-framework", - "diem-framework-releases", - "diem-resource-viewer", - "diem-state-view", - "diem-types", - "diem-validator-interface", - "diem-vm", - "diem-workspace-hack", - "diemdb", - "difference", - "hex", - "move-binary-format", - "move-cli", - "move-compiler", - "move-core-types", - "move-vm-runtime", - "move-vm-test-utils", - "move-vm-types", - "structopt", - "vm-genesis", + "byteorder", + "digest 0.9.0", + "fiat-crypto", + "rand_core 0.6.2", + "subtle", + "zeroize", ] [[package]] -name = "diem-transactional-test-harness" -version = "0.1.0" +name = "dashmap" +version = "3.11.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f260e2fc850179ef410018660006951c1b55b79e8087e87111a2c388994b9b5" dependencies = [ - "anyhow", - "bcs", - "datatest-stable", - "diem-crypto", - "diem-framework", - "diem-keygen", - "diem-state-view", - "diem-transaction-builder", - "diem-types", - "diem-vm", - "diem-workspace-hack", - "either", - "hex", - "language-e2e-tests", - "move-binary-format", - "move-command-line-common", - "move-compiler", - "move-core-types", - "move-transactional-test-runner", - "once_cell", - "structopt", - "vm-genesis", + "ahash 0.3.8", + "cfg-if 0.1.10", + "num_cpus", ] [[package]] -name = "diem-types" -version = "0.0.3" +name = "data-streaming-service" +version = "0.1.0" dependencies = [ - "aes-gcm", - "anyhow", - "bcs", - "bytes", - "chrono", - "diem-crypto", - "diem-crypto-derive", - "diem-workspace-hack", - "hex", - "itertools 0.10.1", - "mirai-annotations", - "move-core-types", - "move-read-write-set-types", + "aptos-config", + "aptos-crypto", + "aptos-data-client", + "aptos-id-generator", + "aptos-infallible", + "aptos-logger", + "aptos-metrics", + "aptos-types", + "aptos-workspace-hack", + "async-trait", + "channel", + "claim", + "enum_dispatch", + "futures", + "network", "once_cell", - "proptest", - "proptest-derive", "rand 0.8.4", - "regex", "serde 1.0.130", - "serde_bytes", - "serde_json", + "short-hex-str", + "storage-service-types", "thiserror", - "tiny-keccak", + "tokio", + "tokio-stream", +] + +[[package]] +name = "datatest-stable" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0ff02642cff6f40d39f61c8d51cb394fd313e1aa2057833b91ad788c4e9331f" +dependencies = [ + "regex", + "structopt", + "termcolor", + "walkdir", ] [[package]] -name = "diem-validator-interface" +name = "db-bootstrapper" version = "0.1.0" dependencies = [ "anyhow", + "aptos-config", + "aptos-crypto", + "aptos-temppath", + "aptos-types", + "aptos-vm", + "aptos-workspace-hack", + "aptosdb", "bcs", - "diem-config", - "diem-state-view", - "diem-types", - "diem-workspace-hack", - "diemdb", - "move-binary-format", - "scratchpad", + "executor", "storage-interface", + "structopt", ] [[package]] -name = "diem-vault-client" +name = "debug-ignore" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "223089cd5a4e4491f0a0dddd9933f9575123160cf96ca2bb56a690046ecf1745" + +[[package]] +name = "debug-interface" version = "0.1.0" dependencies = [ - "base64", - "chrono", - "diem-crypto", - "diem-proptest-helpers", - "diem-types", - "diem-workspace-hack", - "native-tls", - "once_cell", - "proptest", + "anyhow", + "aptos-config", + "aptos-logger", + "aptos-metrics", + "aptos-workspace-hack", + "bytes", + "reqwest", "serde 1.0.130", "serde_json", - "thiserror", - "ureq", + "tokio", + "warp", ] [[package]] -name = "diem-vm" -version = "0.1.0" +name = "determinator" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d6cd961d655fa64c18f515cf6c2e4bd38deaeaa1a8c7d0142c18d750ef73d18" dependencies = [ - "anyhow", - "bcs", - "diem-crypto", - "diem-framework", - "diem-framework-releases", - "diem-logger", - "diem-metrics", - "diem-parallel-executor", - "diem-state-view", - "diem-types", - "diem-workspace-hack", - "fail", - "mirai-annotations", - "move-binary-format", - "move-bytecode-utils", - "move-core-types", - "move-stdlib", - "move-vm-runtime", - "move-vm-types", - "mvhashmap", + "camino", + "globset", + "guppy", + "itertools 0.10.1", "once_cell", - "proptest", + "petgraph 0.6.0", "rayon", - "read-write-set-dynamic", "serde 1.0.130", - "serde_json", - "tracing", + "toml", ] [[package]] -name = "diem-wallet" +name = "deunicode" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "850878694b7933ca4c9569d30a34b55031b9b139ee1fc7b94a527c4ef960d690" + +[[package]] +name = "df-cli" version = "0.1.0" dependencies = [ "anyhow", - "byteorder", - "diem-crypto", - "diem-temppath", - "diem-types", - "diem-workspace-hack", - "hex", - "hmac", - "mirai-annotations", - "pbkdf2", - "rand 0.8.4", - "serde 1.0.130", - "sha2", - "thiserror", + "aptos-vm", + "aptos-workspace-hack", + "bcs", + "datatest-stable", + "diem-framework-releases", + "move-cli", + "move-core-types", + "structopt", ] [[package]] -name = "diem-workspace-hack" +name = "diem-experimental-framework-releases" version = "0.1.0" dependencies = [ - "Inflector", "anyhow", - "backtrace", - "bitvec", - "byteorder", - "bytes", - "cc", - "chrono", - "clap", - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-queue", - "crossbeam-utils", - "either", - "futures-channel", - "futures-core", - "futures-io", - "futures-sink", - "futures-util", - "hyper", - "indexmap", - "itertools 0.10.1", - "libc", - "log", - "memchr", - "num-integer", - "num-traits 0.2.14", - "plotters", - "rand 0.8.4", - "regex", - "regex-automata", - "reqwest", - "rusty-fork", - "serde 1.0.130", - "serde_json", - "sha-1 0.9.4", - "standback", - "subtle", - "syn 1.0.74", - "tiny-keccak", - "tokio", - "tokio-util", - "toml", - "tracing", - "warp", - "zeroize", + "aptos-crypto", + "aptos-types", + "aptos-workspace-hack", + "bcs", + "framework-releases", + "include_dir", + "move-binary-format", + "move-command-line-common", + "once_cell", ] [[package]] -name = "diem-writeset-generator" +name = "diem-framework" version = "0.1.0" dependencies = [ "anyhow", + "aptos-crypto", + "aptos-transactional-test-harness", + "aptos-types", + "aptos-vm", + "aptos-workspace-hack", "bcs", - "diem-crypto", - "diem-crypto-derive", - "diem-framework", - "diem-framework-releases", - "diem-state-view", - "diem-transaction-replay", - "diem-types", - "diem-vm", - "diem-workspace-hack", - "diemdb", - "handlebars", - "hex", + "clap", + "datatest-stable", + "dir-diff", + "include_dir", + "log", + "move-abigen", "move-binary-format", + "move-bytecode-utils", "move-bytecode-verifier", + "move-cli", + "move-command-line-common", "move-compiler", "move-core-types", + "move-docgen", + "move-errmapgen", + "move-package", + "move-prover", + "move-stdlib", + "move-symbol-pool", + "move-unit-test", "move-vm-runtime", - "move-vm-test-utils", "move-vm-types", "once_cell", - "read-write-set", - "serde 1.0.130", - "serde_json", + "rayon", + "sha2", + "smallvec", "structopt", "tempfile", + "transaction-builder-generator", ] [[package]] -name = "diemdb" +name = "diem-framework-releases" version = "0.1.0" dependencies = [ - "accumulator", "anyhow", - "arc-swap", + "aptos-crypto", + "aptos-types", + "aptos-workspace-hack", "bcs", - "byteorder", - "diem-config", - "diem-crypto", - "diem-infallible", - "diem-jellyfish-merkle", - "diem-logger", - "diem-metrics", - "diem-proptest-helpers", - "diem-temppath", - "diem-types", - "diem-workspace-hack", - "executor-types", - "itertools 0.10.1", - "move-core-types", - "num-derive", - "num-traits 0.2.14", - "num-variants", + "framework-releases", + "include_dir", + "move-binary-format", + "move-bytecode-verifier", + "move-command-line-common", "once_cell", - "proptest", - "proptest-derive", - "rand 0.8.4", - "schemadb", - "scratchpad", - "serde 1.0.130", - "storage-interface", - "thiserror", -] - -[[package]] -name = "diemsum" -version = "0.1.0" -dependencies = [ - "anyhow", - "diem-crypto", - "diem-types", - "diem-workspace-hack", - "diemdb", - "serde 1.0.130", - "serde_json", - "storage-interface", - "structopt", ] [[package]] @@ -2722,18 +2722,18 @@ dependencies = [ name = "event-notifications" version = "0.1.0" dependencies = [ + "aptos-crypto", + "aptos-id-generator", + "aptos-infallible", + "aptos-temppath", + "aptos-types", + "aptos-vm", + "aptos-workspace-hack", + "aptosdb", "async-trait", "bcs", "channel", "claim", - "diem-crypto", - "diem-id-generator", - "diem-infallible", - "diem-temppath", - "diem-types", - "diem-vm", - "diem-workspace-hack", - "diemdb", "executor-test-helpers", "futures", "itertools 0.10.1", @@ -2750,21 +2750,21 @@ name = "execution-correctness" version = "0.1.0" dependencies = [ "anyhow", + "aptos-config", + "aptos-crypto", + "aptos-genesis-tool", + "aptos-global-constants", + "aptos-infallible", + "aptos-logger", + "aptos-secure-net", + "aptos-secure-storage", + "aptos-temppath", + "aptos-transaction-builder", + "aptos-types", + "aptos-vm", + "aptos-workspace-hack", "bcs", "consensus-types", - "diem-config", - "diem-crypto", - "diem-genesis-tool", - "diem-global-constants", - "diem-infallible", - "diem-logger", - "diem-secure-net", - "diem-secure-storage", - "diem-temppath", - "diem-transaction-builder", - "diem-types", - "diem-vm", - "diem-workspace-hack", "executor", "executor-test-helpers", "executor-types", @@ -2780,23 +2780,23 @@ name = "executor" version = "0.1.0" dependencies = [ "anyhow", + "aptos-config", + "aptos-crypto", + "aptos-genesis-tool", + "aptos-infallible", + "aptos-logger", + "aptos-metrics", + "aptos-secure-net", + "aptos-state-view", + "aptos-temppath", + "aptos-transaction-builder", + "aptos-types", + "aptos-vm", + "aptos-workspace-hack", + "aptosdb", "bcs", "consensus-types", - "diem-config", - "diem-crypto", "diem-framework-releases", - "diem-genesis-tool", - "diem-infallible", - "diem-logger", - "diem-metrics", - "diem-secure-net", - "diem-state-view", - "diem-temppath", - "diem-transaction-builder", - "diem-types", - "diem-vm", - "diem-workspace-hack", - "diemdb", "executor-test-helpers", "executor-types", "fail", @@ -2818,22 +2818,22 @@ dependencies = [ name = "executor-benchmark" version = "0.1.0" dependencies = [ + "aptos-config", + "aptos-crypto", + "aptos-genesis-tool", + "aptos-infallible", + "aptos-jellyfish-merkle", + "aptos-logger", + "aptos-secure-push-metrics", + "aptos-temppath", + "aptos-transaction-builder", + "aptos-types", + "aptos-vm", + "aptos-workspace-hack", + "aptosdb", "bcs", "chrono", "criterion", - "diem-config", - "diem-crypto", - "diem-genesis-tool", - "diem-infallible", - "diem-jellyfish-merkle", - "diem-logger", - "diem-secure-push-metrics", - "diem-temppath", - "diem-transaction-builder", - "diem-types", - "diem-vm", - "diem-workspace-hack", - "diemdb", "executor", "executor-types", "indicatif", @@ -2854,15 +2854,15 @@ name = "executor-test-helpers" version = "0.1.0" dependencies = [ "anyhow", - "diem-config", - "diem-crypto", - "diem-genesis-tool", - "diem-temppath", - "diem-transaction-builder", - "diem-types", - "diem-vm", - "diem-workspace-hack", - "diemdb", + "aptos-config", + "aptos-crypto", + "aptos-genesis-tool", + "aptos-temppath", + "aptos-transaction-builder", + "aptos-types", + "aptos-vm", + "aptos-workspace-hack", + "aptosdb", "executor", "executor-types", "rand 0.8.4", @@ -2877,12 +2877,12 @@ name = "executor-types" version = "0.1.0" dependencies = [ "anyhow", + "aptos-crypto", + "aptos-secure-net", + "aptos-state-view", + "aptos-types", + "aptos-workspace-hack", "bcs", - "diem-crypto", - "diem-secure-net", - "diem-state-view", - "diem-types", - "diem-workspace-hack", "scratchpad", "serde 1.0.130", "storage-interface", @@ -2910,7 +2910,7 @@ checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" name = "fallible" version = "0.1.0" dependencies = [ - "diem-workspace-hack", + "aptos-workspace-hack", "thiserror", ] @@ -2958,19 +2958,19 @@ name = "forge" version = "0.0.0" dependencies = [ "anyhow", + "aptos-config", + "aptos-genesis-tool", + "aptos-logger", + "aptos-rest-client", + "aptos-retrier", + "aptos-sdk", + "aptos-secure-storage", + "aptos-transaction-builder", + "aptos-workspace-hack", "async-trait", "base64", "debug-interface", - "diem-config", "diem-framework-releases", - "diem-genesis-tool", - "diem-logger", - "diem-rest-client", - "diem-retrier", - "diem-sdk", - "diem-secure-storage", - "diem-transaction-builder", - "diem-workspace-hack", "futures", "hyper", "hyper-proxy", @@ -3002,9 +3002,9 @@ name = "forge-cli" version = "0.0.0" dependencies = [ "anyhow", - "diem-rest-client", - "diem-sdk", - "diem-workspace-hack", + "aptos-rest-client", + "aptos-sdk", + "aptos-workspace-hack", "forge", "itertools 0.10.1", "rand_core 0.6.2", @@ -3029,10 +3029,10 @@ name = "framework-releases" version = "0.1.0" dependencies = [ "anyhow", + "aptos-types", + "aptos-workspace-hack", "bcs", "clap", - "diem-types", - "diem-workspace-hack", "include_dir", "log", "move-binary-format", @@ -3168,14 +3168,14 @@ checksum = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" name = "generate-format" version = "0.1.0" dependencies = [ + "aptos-config", + "aptos-crypto", + "aptos-crypto-derive", + "aptos-types", + "aptos-workspace-hack", "bcs", "consensus", "consensus-types", - "diem-config", - "diem-crypto", - "diem-crypto-derive", - "diem-types", - "diem-workspace-hack", "move-core-types", "network", "rand 0.8.4", @@ -3189,10 +3189,10 @@ dependencies = [ name = "generate-key" version = "0.1.0" dependencies = [ + "aptos-crypto", + "aptos-temppath", + "aptos-workspace-hack", "bcs", - "diem-crypto", - "diem-temppath", - "diem-workspace-hack", "rand 0.8.4", ] @@ -3219,11 +3219,11 @@ dependencies = [ name = "genesis-viewer" version = "0.1.0" dependencies = [ + "aptos-resource-viewer", + "aptos-types", + "aptos-workspace-hack", "bcs", "diem-framework-releases", - "diem-resource-viewer", - "diem-types", - "diem-workspace-hack", "move-binary-format", "move-core-types", "move-vm-test-utils", @@ -3975,18 +3975,18 @@ name = "language-e2e-tests" version = "0.1.0" dependencies = [ "anyhow", + "aptos-config", + "aptos-crypto", + "aptos-keygen", + "aptos-proptest-helpers", + "aptos-state-view", + "aptos-transaction-builder", + "aptos-types", + "aptos-vm", + "aptos-workspace-hack", + "aptos-writeset-generator", "bcs", - "diem-config", - "diem-crypto", "diem-framework-releases", - "diem-keygen", - "diem-proptest-helpers", - "diem-state-view", - "diem-transaction-builder", - "diem-types", - "diem-vm", - "diem-workspace-hack", - "diem-writeset-generator", "goldenfile", "hex", "move-binary-format", @@ -4008,18 +4008,18 @@ dependencies = [ name = "language-e2e-testsuite" version = "0.1.0" dependencies = [ + "aptos-crypto", + "aptos-keygen", + "aptos-logger", + "aptos-parallel-executor", + "aptos-state-view", + "aptos-transaction-builder", + "aptos-types", + "aptos-vm", + "aptos-workspace-hack", + "aptos-writeset-generator", "bcs", - "diem-crypto", "diem-framework-releases", - "diem-keygen", - "diem-logger", - "diem-parallel-executor", - "diem-state-view", - "diem-transaction-builder", - "diem-types", - "diem-vm", - "diem-workspace-hack", - "diem-writeset-generator", "hex", "language-e2e-tests", "move-binary-format", @@ -4170,11 +4170,11 @@ dependencies = [ name = "mempool-notifications" version = "0.1.0" dependencies = [ + "aptos-crypto", + "aptos-types", + "aptos-workspace-hack", "async-trait", "claim", - "diem-crypto", - "diem-types", - "diem-workspace-hack", "futures", "serde 1.0.130", "thiserror", @@ -4185,9 +4185,9 @@ dependencies = [ name = "memsocket" version = "0.1.0" dependencies = [ + "aptos-infallible", + "aptos-workspace-hack", "bytes", - "diem-infallible", - "diem-workspace-hack", "futures", "once_cell", ] @@ -4959,7 +4959,7 @@ dependencies = [ name = "mvhashmap" version = "0.1.0" dependencies = [ - "diem-workspace-hack", + "aptos-workspace-hack", "num_cpus", "once_cell", "proptest", @@ -4995,10 +4995,10 @@ checksum = "ca2b420f638f07fe83056b55ea190bb815f609ec5a35e7017884a10f78839c9e" name = "netcore" version = "0.1.0" dependencies = [ + "aptos-logger", + "aptos-types", + "aptos-workspace-hack", "bytes", - "diem-logger", - "diem-types", - "diem-workspace-hack", "futures", "memsocket", "pin-project", @@ -5014,24 +5014,24 @@ name = "network" version = "0.1.0" dependencies = [ "anyhow", + "aptos-bitvec", + "aptos-config", + "aptos-crypto", + "aptos-crypto-derive", + "aptos-id-generator", + "aptos-infallible", + "aptos-logger", + "aptos-metrics", + "aptos-proptest-helpers", + "aptos-rate-limiter", + "aptos-time-service", + "aptos-types", + "aptos-workspace-hack", "async-trait", "bcs", "bytes", "channel", "criterion", - "diem-bitvec", - "diem-config", - "diem-crypto", - "diem-crypto-derive", - "diem-id-generator", - "diem-infallible", - "diem-logger", - "diem-metrics", - "diem-proptest-helpers", - "diem-rate-limiter", - "diem-time-service", - "diem-types", - "diem-workspace-hack", "futures", "futures-util", "hex", @@ -5064,17 +5064,17 @@ dependencies = [ name = "network-builder" version = "0.1.0" dependencies = [ + "aptos-config", + "aptos-crypto", + "aptos-infallible", + "aptos-logger", + "aptos-secure-storage", + "aptos-time-service", + "aptos-types", + "aptos-workspace-hack", "async-trait", "bcs", "channel", - "diem-config", - "diem-crypto", - "diem-infallible", - "diem-logger", - "diem-secure-storage", - "diem-time-service", - "diem-types", - "diem-workspace-hack", "event-notifications", "futures", "netcore", @@ -5090,17 +5090,17 @@ name = "network-discovery" version = "0.1.0" dependencies = [ "anyhow", + "aptos-config", + "aptos-crypto", + "aptos-logger", + "aptos-metrics", + "aptos-secure-storage", + "aptos-temppath", + "aptos-time-service", + "aptos-types", + "aptos-workspace-hack", "bcs", "channel", - "diem-config", - "diem-crypto", - "diem-logger", - "diem-metrics", - "diem-secure-storage", - "diem-temppath", - "diem-time-service", - "diem-types", - "diem-workspace-hack", "event-notifications", "futures", "move-core-types", @@ -5319,7 +5319,7 @@ dependencies = [ name = "num-variants" version = "0.1.0" dependencies = [ - "diem-workspace-hack", + "aptos-workspace-hack", "proc-macro2 1.0.28", "quote 1.0.9", "syn 1.0.74", @@ -5357,10 +5357,10 @@ checksum = "a9a7ab5d64814df0fe4a4b5ead45ed6c5f181ee3ff04ba344313a6c80446c5d4" name = "offchain" version = "0.1.0" dependencies = [ + "aptos-sdk", + "aptos-workspace-hack", "base64", "bech32", - "diem-sdk", - "diem-workspace-hack", "hex", "rand 0.8.4", "rand_core 0.6.2", @@ -5832,7 +5832,7 @@ dependencies = [ name = "proxy" version = "0.1.0" dependencies = [ - "diem-workspace-hack", + "aptos-workspace-hack", "ipnet", ] @@ -6414,22 +6414,22 @@ checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" name = "safety-rules" version = "0.1.0" dependencies = [ + "aptos-config", + "aptos-crypto", + "aptos-global-constants", + "aptos-infallible", + "aptos-logger", + "aptos-proptest-helpers", + "aptos-secure-net", + "aptos-secure-push-metrics", + "aptos-secure-storage", + "aptos-temppath", + "aptos-types", + "aptos-vault-client", + "aptos-workspace-hack", "consensus-types", "crash-handler", "criterion", - "diem-config", - "diem-crypto", - "diem-global-constants", - "diem-infallible", - "diem-logger", - "diem-proptest-helpers", - "diem-secure-net", - "diem-secure-push-metrics", - "diem-secure-storage", - "diem-temppath", - "diem-types", - "diem-vault-client", - "diem-workspace-hack", "once_cell", "proptest", "rand 0.8.4", @@ -6464,12 +6464,12 @@ name = "schemadb" version = "0.1.0" dependencies = [ "anyhow", + "aptos-config", + "aptos-logger", + "aptos-metrics", + "aptos-temppath", + "aptos-workspace-hack", "byteorder", - "diem-config", - "diem-logger", - "diem-metrics", - "diem-temppath", - "diem-workspace-hack", "once_cell", "proptest", "rocksdb", @@ -6491,14 +6491,14 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" name = "scratchpad" version = "0.1.0" dependencies = [ + "aptos-crypto", + "aptos-infallible", + "aptos-metrics", + "aptos-types", + "aptos-workspace-hack", "arc-swap", "bitvec", "criterion", - "diem-crypto", - "diem-infallible", - "diem-metrics", - "diem-types", - "diem-workspace-hack", "itertools 0.10.1", "once_cell", "proptest", @@ -6545,14 +6545,14 @@ name = "seed-peer-generator" version = "0.1.0" dependencies = [ "anyhow", + "aptos-config", + "aptos-crypto", + "aptos-logger", + "aptos-rest-client", + "aptos-temppath", + "aptos-types", + "aptos-workspace-hack", "bcs", - "diem-config", - "diem-crypto", - "diem-logger", - "diem-rest-client", - "diem-temppath", - "diem-types", - "diem-workspace-hack", "hex", "rand 0.8.4", "serde_yaml", @@ -6883,7 +6883,7 @@ checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" name = "short-hex-str" version = "0.1.0" dependencies = [ - "diem-workspace-hack", + "aptos-workspace-hack", "hex", "mirai-annotations", "proptest", @@ -6960,33 +6960,33 @@ name = "smoke-test" version = "0.1.0" dependencies = [ "anyhow", + "aptos-config", + "aptos-crypto", "aptos-framework-releases", + "aptos-genesis-tool", + "aptos-global-constants", + "aptos-infallible", + "aptos-logger", + "aptos-management", + "aptos-operational-tool", + "aptos-rest-client", + "aptos-sdk", + "aptos-secure-storage", + "aptos-temppath", + "aptos-time-service", + "aptos-transaction-builder", + "aptos-types", + "aptos-vault-client", + "aptos-workspace-hack", + "aptos-writeset-generator", "async-trait", "backup-cli", "base64", "bcs", "debug-interface", - "diem-config", - "diem-crypto", "diem-experimental-framework-releases", "diem-framework", "diem-framework-releases", - "diem-genesis-tool", - "diem-global-constants", - "diem-infallible", - "diem-logger", - "diem-management", - "diem-operational-tool", - "diem-rest-client", - "diem-sdk", - "diem-secure-storage", - "diem-temppath", - "diem-time-service", - "diem-transaction-builder", - "diem-types", - "diem-vault-client", - "diem-workspace-hack", - "diem-writeset-generator", "forge", "futures", "generate-key", @@ -7008,11 +7008,11 @@ dependencies = [ name = "socket-bench-server" version = "0.1.0" dependencies = [ - "diem-config", - "diem-crypto", - "diem-logger", - "diem-types", - "diem-workspace-hack", + "aptos-config", + "aptos-crypto", + "aptos-logger", + "aptos-types", + "aptos-workspace-hack", "futures", "memsocket", "netcore", @@ -7058,21 +7058,21 @@ dependencies = [ name = "state-sync-driver" version = "0.1.0" dependencies = [ + "aptos-config", + "aptos-crypto", + "aptos-data-client", + "aptos-infallible", + "aptos-logger", + "aptos-temppath", + "aptos-time-service", + "aptos-types", + "aptos-vm", + "aptos-workspace-hack", + "aptosdb", "channel", "claim", "consensus-notifications", "data-streaming-service", - "diem-config", - "diem-crypto", - "diem-data-client", - "diem-infallible", - "diem-logger", - "diem-temppath", - "diem-time-service", - "diem-types", - "diem-vm", - "diem-workspace-hack", - "diemdb", "event-notifications", "executor", "executor-test-helpers", @@ -7093,19 +7093,19 @@ dependencies = [ name = "state-sync-multiplexer" version = "0.1.0" dependencies = [ + "aptos-config", + "aptos-crypto", + "aptos-data-client", + "aptos-genesis-tool", + "aptos-infallible", + "aptos-temppath", + "aptos-time-service", + "aptos-types", + "aptos-vm", + "aptos-workspace-hack", + "aptosdb", "consensus-notifications", "data-streaming-service", - "diem-config", - "diem-crypto", - "diem-data-client", - "diem-genesis-tool", - "diem-infallible", - "diem-temppath", - "diem-time-service", - "diem-types", - "diem-vm", - "diem-workspace-hack", - "diemdb", "event-notifications", "executor", "executor-test-helpers", @@ -7124,28 +7124,28 @@ dependencies = [ name = "state-sync-v1" version = "0.1.0" dependencies = [ + "aptos-config", + "aptos-crypto", + "aptos-genesis-tool", + "aptos-infallible", + "aptos-logger", + "aptos-mempool", + "aptos-metrics", + "aptos-proptest-helpers", + "aptos-temppath", + "aptos-time-service", + "aptos-transaction-builder", + "aptos-types", + "aptos-vm", + "aptos-workspace-hack", + "aptosdb", "async-trait", "bcs", "bytes", "channel", "claim", "consensus-notifications", - "diem-config", - "diem-crypto", "diem-framework-releases", - "diem-genesis-tool", - "diem-infallible", - "diem-logger", - "diem-mempool", - "diem-metrics", - "diem-proptest-helpers", - "diem-temppath", - "diem-time-service", - "diem-transaction-builder", - "diem-types", - "diem-vm", - "diem-workspace-hack", - "diemdb", "event-notifications", "executor", "executor-test-helpers", @@ -7238,13 +7238,13 @@ name = "storage-client" version = "0.1.0" dependencies = [ "anyhow", + "aptos-crypto", + "aptos-infallible", + "aptos-logger", + "aptos-secure-net", + "aptos-types", + "aptos-workspace-hack", "bcs", - "diem-crypto", - "diem-infallible", - "diem-logger", - "diem-secure-net", - "diem-types", - "diem-workspace-hack", "serde 1.0.130", "storage-interface", ] @@ -7254,12 +7254,12 @@ name = "storage-interface" version = "0.1.0" dependencies = [ "anyhow", + "aptos-crypto", + "aptos-secure-net", + "aptos-state-view", + "aptos-types", + "aptos-workspace-hack", "bcs", - "diem-crypto", - "diem-secure-net", - "diem-state-view", - "diem-types", - "diem-workspace-hack", "itertools 0.10.1", "move-core-types", "parking_lot", @@ -7273,16 +7273,16 @@ name = "storage-service" version = "0.1.0" dependencies = [ "anyhow", + "aptos-config", + "aptos-crypto", + "aptos-logger", + "aptos-metrics", + "aptos-secure-net", + "aptos-temppath", + "aptos-types", + "aptos-workspace-hack", + "aptosdb", "bcs", - "diem-config", - "diem-crypto", - "diem-logger", - "diem-metrics", - "diem-secure-net", - "diem-temppath", - "diem-types", - "diem-workspace-hack", - "diemdb", "futures", "itertools 0.10.1", "proptest", @@ -7296,11 +7296,11 @@ dependencies = [ name = "storage-service-client" version = "0.1.0" dependencies = [ + "aptos-config", + "aptos-types", + "aptos-workspace-hack", "async-trait", "channel", - "diem-config", - "diem-types", - "diem-workspace-hack", "network", "storage-service-types", "thiserror", @@ -7311,17 +7311,17 @@ name = "storage-service-server" version = "0.1.0" dependencies = [ "anyhow", + "aptos-config", + "aptos-crypto", + "aptos-logger", + "aptos-metrics", + "aptos-types", + "aptos-workspace-hack", "bcs", "bounded-executor", "bytes", "channel", "claim", - "diem-config", - "diem-crypto", - "diem-logger", - "diem-metrics", - "diem-types", - "diem-workspace-hack", "futures", "move-core-types", "network", @@ -7337,11 +7337,11 @@ dependencies = [ name = "storage-service-types" version = "0.1.0" dependencies = [ + "aptos-config", + "aptos-crypto", + "aptos-types", + "aptos-workspace-hack", "claim", - "diem-config", - "diem-crypto", - "diem-types", - "diem-workspace-hack", "num-traits 0.2.14", "proptest", "serde 1.0.130", @@ -7407,11 +7407,11 @@ dependencies = [ name = "swiss-knife" version = "0.1.0" dependencies = [ + "aptos-crypto", + "aptos-transaction-builder", + "aptos-types", + "aptos-workspace-hack", "bcs", - "diem-crypto", - "diem-transaction-builder", - "diem-types", - "diem-workspace-hack", "hex", "move-core-types", "rand 0.8.4", @@ -7549,12 +7549,12 @@ name = "testcases" version = "0.0.0" dependencies = [ "anyhow", + "aptos-logger", + "aptos-operational-tool", + "aptos-rest-client", + "aptos-sdk", + "aptos-workspace-hack", "bcs", - "diem-logger", - "diem-operational-tool", - "diem-rest-client", - "diem-sdk", - "diem-workspace-hack", "forge", "rand 0.8.4", "tokio", @@ -7938,9 +7938,9 @@ name = "transaction-builder-generator" version = "0.1.0" dependencies = [ "anyhow", + "aptos-types", + "aptos-workspace-hack", "bcs", - "diem-types", - "diem-workspace-hack", "heck", "move-core-types", "regex", @@ -7958,12 +7958,12 @@ name = "transaction-emitter" version = "0.0.0" dependencies = [ "anyhow", - "diem-config", - "diem-crypto", - "diem-logger", - "diem-rest-client", - "diem-sdk", - "diem-workspace-hack", + "aptos-config", + "aptos-crypto", + "aptos-logger", + "aptos-rest-client", + "aptos-sdk", + "aptos-workspace-hack", "futures", "generate-key", "itertools 0.10.1", @@ -8272,17 +8272,17 @@ name = "vm-genesis" version = "0.1.0" dependencies = [ "anyhow", + "aptos-config", + "aptos-crypto", + "aptos-proptest-helpers", + "aptos-state-view", + "aptos-transaction-builder", + "aptos-types", + "aptos-vm", + "aptos-workspace-hack", "bcs", - "diem-config", - "diem-crypto", "diem-framework", "diem-framework-releases", - "diem-proptest-helpers", - "diem-state-view", - "diem-transaction-builder", - "diem-types", - "diem-vm", - "diem-workspace-hack", "move-binary-format", "move-bytecode-utils", "move-bytecode-verifier", @@ -8301,14 +8301,14 @@ name = "vm-validator" version = "0.1.0" dependencies = [ "anyhow", - "diem-crypto", - "diem-state-view", - "diem-temppath", - "diem-transaction-builder", - "diem-types", - "diem-vm", - "diem-workspace-hack", - "diemdb", + "aptos-crypto", + "aptos-state-view", + "aptos-temppath", + "aptos-transaction-builder", + "aptos-types", + "aptos-vm", + "aptos-workspace-hack", + "aptosdb", "executor", "executor-test-helpers", "fail", diff --git a/Cargo.toml b/Cargo.toml index 06a2a6e1a2830..3ee65ed2e8b6e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,6 +4,29 @@ resolver = "2" members = [ "api", "api/types", + "aptos-move/aptos-keygen", + "aptos-move/aptos-resource-viewer", + "aptos-move/aptos-transaction-benchmarks", + "aptos-move/aptos-transactional-test-harness", + "aptos-move/aptos-validator-interface", + "aptos-move/aptos-vm", + "aptos-move/df-cli", + "aptos-move/diem-framework", + "aptos-move/diem-framework/DPN/releases", + "aptos-move/diem-framework/aptos-framework/releases", + "aptos-move/diem-framework/experimental/releases", + "aptos-move/diem-framework/releases", + "aptos-move/e2e-tests", + "aptos-move/e2e-tests-replay", + "aptos-move/e2e-testsuite", + "aptos-move/genesis-viewer", + "aptos-move/mvhashmap", + "aptos-move/parallel-executor", + "aptos-move/transaction-builder-generator", + "aptos-move/transaction-replay", + "aptos-move/vm-genesis", + "aptos-move/writeset-transaction-generator", + "aptos-node", "config", "config/generate-key", "config/global-constants", @@ -14,29 +37,29 @@ members = [ "consensus", "consensus/consensus-types", "consensus/safety-rules", + "crates/aptos-bitvec", + "crates/aptos-crypto", + "crates/aptos-crypto-derive", + "crates/aptos-documentation-tool", + "crates/aptos-faucet", + "crates/aptos-id-generator", + "crates/aptos-infallible", + "crates/aptos-log-derive", + "crates/aptos-logger", + "crates/aptos-metrics", + "crates/aptos-metrics-core", + "crates/aptos-proptest-helpers", + "crates/aptos-rate-limiter", + "crates/aptos-rest-client", + "crates/aptos-retrier", + "crates/aptos-temppath", + "crates/aptos-time-service", + "crates/aptos-wallet", + "crates/aptos-workspace-hack", "crates/bounded-executor", "crates/channel", "crates/crash-handler", "crates/debug-interface", - "crates/diem-bitvec", - "crates/diem-crypto", - "crates/diem-crypto-derive", - "crates/diem-documentation-tool", - "crates/diem-faucet", - "crates/diem-id-generator", - "crates/diem-infallible", - "crates/diem-log-derive", - "crates/diem-logger", - "crates/diem-metrics", - "crates/diem-metrics-core", - "crates/diem-proptest-helpers", - "crates/diem-rate-limiter", - "crates/diem-rest-client", - "crates/diem-retrier", - "crates/diem-temppath", - "crates/diem-time-service", - "crates/diem-wallet", - "crates/diem-workspace-hack", "crates/fallible", "crates/num-variants", "crates/proxy", @@ -46,29 +69,6 @@ members = [ "devtools/x", "devtools/x-core", "devtools/x-lint", - "diem-move/df-cli", - "diem-move/diem-framework", - "diem-move/diem-framework/DPN/releases", - "diem-move/diem-framework/aptos-framework/releases", - "diem-move/diem-framework/experimental/releases", - "diem-move/diem-framework/releases", - "diem-move/diem-keygen", - "diem-move/diem-resource-viewer", - "diem-move/diem-transaction-benchmarks", - "diem-move/diem-transactional-test-harness", - "diem-move/diem-validator-interface", - "diem-move/diem-vm", - "diem-move/e2e-tests", - "diem-move/e2e-tests-replay", - "diem-move/e2e-testsuite", - "diem-move/genesis-viewer", - "diem-move/mvhashmap", - "diem-move/parallel-executor", - "diem-move/transaction-builder-generator", - "diem-move/transaction-replay", - "diem-move/vm-genesis", - "diem-move/writeset-transaction-generator", - "diem-node", "execution/db-bootstrapper", "execution/execution-correctness", "execution/executor", @@ -90,7 +90,7 @@ members = [ "secure/storage", "secure/storage/github", "secure/storage/vault", - "state-sync/diem-data-client", + "state-sync/aptos-data-client", "state-sync/inter-component/consensus-notifications", "state-sync/inter-component/event-notifications", "state-sync/inter-component/mempool-notifications", @@ -102,10 +102,10 @@ members = [ "state-sync/storage-service/server", "state-sync/storage-service/types", "storage/accumulator", + "storage/aptosdb", + "storage/aptossum", "storage/backup/backup-cli", "storage/backup/backup-service", - "storage/diemdb", - "storage/diemsum", "storage/inspector", "storage/jellyfish-merkle", "storage/schemadb", @@ -114,8 +114,8 @@ members = [ "storage/storage-client", "storage/storage-interface", "storage/storage-service", - "testsuite/diem-fuzzer", - "testsuite/diem-fuzzer/fuzz", + "testsuite/aptos-fuzzer", + "testsuite/aptos-fuzzer/fuzz", "testsuite/forge", "testsuite/forge-cli", "testsuite/generate-format", @@ -131,25 +131,25 @@ members = [ # # For more, see the "Conditional compilation for tests" section in documentation/coding_guidelines.md. default-members = [ + "aptos-move/df-cli", + "aptos-move/genesis-viewer", + "aptos-move/transaction-replay", + "aptos-node", "config/generate-key", "config/management/genesis", "config/management/operational", "config/seed-peer-generator", "consensus/safety-rules", - "crates/diem-faucet", - "crates/diem-rate-limiter", + "crates/aptos-faucet", + "crates/aptos-rate-limiter", "crates/swiss-knife", - "diem-move/diem-framework", - "diem-move/transaction-builder-generator", + "aptos-move/diem-framework", + "aptos-move/transaction-builder-generator", "execution/db-bootstrapper", "execution/execution-correctness", - "diem-move/df-cli", - "diem-move/genesis-viewer", - "diem-move/transaction-replay", - "diem-node", "sdk", "storage/backup/backup-cli", - "storage/diemsum", + "storage/aptossum", "storage/inspector", ] diff --git a/api/Cargo.toml b/api/Cargo.toml index e31354b0354b1..73df3cc21cb00 100644 --- a/api/Cargo.toml +++ b/api/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "diem-api" +name = "aptos-api" version = "0.1.0" authors = ["Diem Association "] description = "Diem REST API" @@ -24,14 +24,14 @@ serde_json = "1.0.64" tokio = { version = "1.8.1", features = ["full"] } warp = { version = "0.3.2", features = ["default", "tls"] } -diem-config = { path = "../config" } -diem-crypto = { path = "../crates/diem-crypto" } -diem-logger = { path = "../crates/diem-logger" } -diem-mempool = { path = "../mempool"} -diem-metrics = { path = "../crates/diem-metrics" } -diem-types = { path = "../types" } -diem-workspace-hack = { version = "0.1", path = "../crates/diem-workspace-hack" } -diem-api-types = { path = "./types", package = "diem-api-types" } +aptos-config = { path = "../config" } +aptos-crypto = { path = "../crates/aptos-crypto" } +aptos-logger = { path = "../crates/aptos-logger" } +aptos-mempool = { path = "../mempool"} +aptos-metrics = { path = "../crates/aptos-metrics" } +aptos-types = { path = "../types" } +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/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } move-resource-viewer = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } @@ -41,17 +41,17 @@ rand = "0.8.3" reqwest = { version = "0.11.2", features = ["blocking", "json"], default_features = false } mempool-notifications = { path = "../state-sync/inter-component/mempool-notifications" } -diemdb = { path = "../storage/diemdb", features = ["fuzzing"] } -diem-crypto = { path = "../crates/diem-crypto" } -diem-global-constants = { path = "../config/global-constants" } -diem-mempool = { path = "../mempool", features = ["fuzzing"] } -diem-secure-storage = { path = "../secure/storage" } -diem-temppath = { path = "../crates/diem-temppath" } -diem-genesis-tool = {path = "../config/management/genesis", features = ["testing"] } -diem-framework-releases = { path = "../diem-move/diem-framework/DPN/releases" } -diem-sdk = { path = "../sdk" } +aptosdb = { path = "../storage/aptosdb", features = ["fuzzing"] } +aptos-crypto = { path = "../crates/aptos-crypto" } +aptos-global-constants = { path = "../config/global-constants" } +aptos-mempool = { path = "../mempool", features = ["fuzzing"] } +aptos-secure-storage = { path = "../secure/storage" } +aptos-temppath = { path = "../crates/aptos-temppath" } +aptos-genesis-tool = {path = "../config/management/genesis", features = ["testing"] } +diem-framework-releases = { path = "../aptos-move/diem-framework/DPN/releases" } +aptos-sdk = { path = "../sdk" } vm-validator = { path = "../vm-validator" } -diem-vm = { path = "../diem-move/diem-vm" } +aptos-vm = { path = "../aptos-move/aptos-vm" } executor = { path = "../execution/executor" } executor-types = { path = "../execution/executor-types" } diff --git a/api/Makefile b/api/Makefile index d37f98436fdd0..0a37273f7336f 100644 --- a/api/Makefile +++ b/api/Makefile @@ -8,19 +8,19 @@ lint: test-code-gen: echo '{"generator-cli": {"version": "5.2.1"}}' > openapitools.json # v5.3 has bug, ping the version to 5.2.1 - npx @openapitools/openapi-generator-cli generate -g rust -i doc/openapi.yaml -o /tmp/diem_api_client --package-name diem_api_client - cd /tmp/diem_api_client && cargo build + npx @openapitools/openapi-generator-cli generate -g rust -i doc/openapi.yaml -o /tmp/aptos_api_client --package-name aptos_api_client + cd /tmp/aptos_api_client && cargo build clean: - - pkill diem-node - - rm -rf /tmp/diem_api_client + - pkill aptos-node + - rm -rf /tmp/aptos_api_client - rm -f openapitools.json - rm -rf .hypothesis test-api-spec: - - pkill diem-node - cargo build -p diem-node - ./../target/debug/diem-node --test --lazy & + - pkill aptos-node + cargo build -p aptos-node + ./../target/debug/aptos-node --test --lazy & curl https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh > /tmp/wait-for-it.sh chmod +x /tmp/wait-for-it.sh diff --git a/api/Operation.md b/api/Operation.md index 260c32be87983..723eb861c1f03 100644 --- a/api/Operation.md +++ b/api/Operation.md @@ -47,7 +47,7 @@ If no param is provided, server returns 200 to indicate HTTP server is running h The request log level is set to DEBUG by default, 5xx error responses will be logged to ERROR level. -You can add `diem_api=DEBUG` into RUST_LOG environment to configure the log output. +You can add `aptos_api=DEBUG` into RUST_LOG environment to configure the log output. ## Metrics @@ -55,7 +55,7 @@ You can add `diem_api=DEBUG` into RUST_LOG environment to configure the log outp ### Requests Processed by Handler The latency and counts of requests that are processed by a handler are recorded by a histogram -named `diem_api_requests` and labelled by: +named `aptos_api_requests` and labelled by: * method: HTTP request method * operation_id: request handler/operation id, it should be same `operationId` defined in [OpenAPI specification](doc/openapi.yaml), except couple cases that are not defined in the [OpenAPI specification](doc/openapi.yaml), e.g. `json_rpc`. @@ -69,7 +69,7 @@ Note: this metrics also includes route not found count/latency cases, which ends ### All Requests by Status The latency and counts of requests regardless errors or hit any handlers are recorded by a histogram -named `diem_api_response_status` and labelled by: +named `aptos_api_response_status` and labelled by: * status: HTTP response status code diff --git a/api/README.md b/api/README.md index 4efbc6d5e3056..e61438aa9a1b2 100644 --- a/api/README.md +++ b/api/README.md @@ -3,7 +3,7 @@ This module provides REST API for client applications to query the Diem blockchain. * [API specification](doc/openapi.yaml) -* [Documentation](https://diem.github.io/diem/diem_api/spec.html) +* [Documentation](https://diem.github.io/diem/aptos_api/spec.html) > For a Diem node, you can view the documentation at `/spec.html`. @@ -54,7 +54,7 @@ To create easy to use API, the following principles are valued ### Models -Models or types are defined in the `diem-api-types` package (in the directory `/api/types`). +Models or types are defined in the `aptos-api-types` package (in the directory `/api/types`). These types handle the JSON serialization and deserialization between internal data types and API response JSON types. @@ -64,7 +64,7 @@ Move data are converted by procedures defined in the `convert.rs`, because Move When we convert internal Move struct values into JSON, the data type information will be lost, thus we can't direct convert move struct value JSON data back to any internal data structure while deserializing HTTP request data. For this reason: -1. `diem_api_types::MoveValue` is only used internally for converting move values into JSON before we create external facing API types (e.g. `TransactionPayload`). +1. `aptos_api_types::MoveValue` is only used internally for converting move values into JSON before we create external facing API types (e.g. `TransactionPayload`). 2. When deserializing API request JSON data, we first convert them into external facing API types with Move values as JSON value, then convert Move JSON values into internal move value type `move_core_types::value::MoveValue` when we need. ### Error Handling @@ -72,7 +72,7 @@ For this reason: Errors are handled by the `warp.Rejection` handler defined in the `index.rs` for all routes. An `anyhow::Error` is considered as server internal error (500) by default. All internal errors should be converted into `anyhow::Error` first. -An `diem_api_types.Error` is defined for converting `anyhow::Error` to `warp.Rejection` with HTTP error code. +An `aptos_api_types.Error` is defined for converting `anyhow::Error` to `warp.Rejection` with HTTP error code. ## Testing diff --git a/api/doc/openapi.yaml b/api/doc/openapi.yaml index 698ea944cabee..c8993b79cad52 100644 --- a/api/doc/openapi.yaml +++ b/api/doc/openapi.yaml @@ -225,15 +225,15 @@ paths: **Submit transaction using signed transaction BCS bytes** * Generate Diem core types and transaction script functions for the client application langauge - by [Tranaction Builder](https://github.com/diem/diem/tree/main/diem-move/transaction-builder-generator) - * Create [RawTransaction](https://diem.github.io/diem/diem_types/transaction/struct.RawTransaction.html). + by [Tranaction Builder](https://github.com/diem/diem/tree/main/aptos-move/transaction-builder-generator) + * Create [RawTransaction](https://diem.github.io/diem/aptos_types/transaction/struct.RawTransaction.html). * Create transaction signing message: bytes("DIEM::RawTransaction") + BCS bytes of the RawTransaction. See [Crypto Spec](https://github.com/diem/diem/blob/main/specifications/crypto/README.md) for more details. * Sign the transaction signing message and create transaction signature. - * Create [SignedTransaction](https://diem.github.io/diem/diem_types/transaction/struct.SignedTransaction.html). - * Serialize [SignedTransaction](https://diem.github.io/diem/diem_types/transaction/struct.SignedTransaction.html) + * Create [SignedTransaction](https://diem.github.io/diem/aptos_types/transaction/struct.SignedTransaction.html). + * Serialize [SignedTransaction](https://diem.github.io/diem/aptos_types/transaction/struct.SignedTransaction.html) into BCS bytes. - * Submit the [SignedTransaction](https://diem.github.io/diem/diem_types/transaction/struct.SignedTransaction.html) + * Submit the [SignedTransaction](https://diem.github.io/diem/aptos_types/transaction/struct.SignedTransaction.html) BCS bytes (do not hex-encoded it). The request header "Content-Type" must set to "application/x.diem.signed_transaction+bcs". tags: - transactions @@ -250,7 +250,7 @@ paths: type: string format: binary description: | - BCS bytes of the [SignedTransaction](https://diem.github.io/diem/diem_types/transaction/struct.SignedTransaction.html). + BCS bytes of the [SignedTransaction](https://diem.github.io/diem/aptos_types/transaction/struct.SignedTransaction.html). responses: "202": description: Transaction is accepted and submitted to mempool. @@ -305,7 +305,7 @@ paths: When given transaction version, server looks up the transaction on-chain by version. To create transaction hash: - 1. Create hash message bytes: "DIEM::Transaction" bytes + BCS bytes of [Transaction](https://diem.github.io/diem/diem_types/transaction/enum.Transaction.html). + 1. Create hash message bytes: "DIEM::Transaction" bytes + BCS bytes of [Transaction](https://diem.github.io/diem/aptos_types/transaction/enum.Transaction.html). 2. Apply hash algorithm `SHA3-256` to the hash message bytes. 3. Hex-encode the hash bytes with `0x` prefix. operationId: get_transaction diff --git a/api/src/accounts.rs b/api/src/accounts.rs index fca49cb96de5a..a54937a0036fb 100644 --- a/api/src/accounts.rs +++ b/api/src/accounts.rs @@ -8,10 +8,10 @@ use crate::{ param::{AddressParam, LedgerVersionParam, MoveIdentifierParam, MoveStructTagParam}, }; -use diem_api_types::{ +use aptos_api_types::{ AccountData, Address, Error, LedgerInfo, MoveModuleBytecode, Response, TransactionId, }; -use diem_types::{ +use aptos_types::{ account_config::AccountResource, account_state::AccountState, event::{EventHandle, EventKey}, diff --git a/api/src/context.rs b/api/src/context.rs index f5929f34fd3f7..46ff9f356c278 100644 --- a/api/src/context.rs +++ b/api/src/context.rs @@ -1,11 +1,11 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_api_types::{Error, LedgerInfo, MoveConverter, TransactionOnChainData}; -use diem_config::config::{ApiConfig, RoleType}; -use diem_crypto::HashValue; -use diem_mempool::{MempoolClientRequest, MempoolClientSender, SubmissionStatus}; -use diem_types::{ +use aptos_api_types::{Error, LedgerInfo, MoveConverter, TransactionOnChainData}; +use aptos_config::config::{ApiConfig, RoleType}; +use aptos_crypto::HashValue; +use aptos_mempool::{MempoolClientRequest, MempoolClientSender, SubmissionStatus}; +use aptos_types::{ account_address::AccountAddress, account_state::AccountState, account_state_blob::AccountStateBlob, diff --git a/api/src/events.rs b/api/src/events.rs index 350ec7e12d8c7..6667b3469c9cc 100644 --- a/api/src/events.rs +++ b/api/src/events.rs @@ -10,10 +10,10 @@ use crate::{ param::{AddressParam, EventKeyParam, MoveIdentifierParam, MoveStructTagParam}, }; -use diem_api_types::{Error, LedgerInfo, Response}; +use aptos_api_types::{Error, LedgerInfo, Response}; use anyhow::Result; -use diem_types::event::EventKey; +use aptos_types::event::EventKey; use warp::{filters::BoxedFilter, Filter, Rejection, Reply}; // GET /events/ diff --git a/api/src/failpoint.rs b/api/src/failpoint.rs index 5a21b898d4dd5..e5c64e6ea88cf 100644 --- a/api/src/failpoint.rs +++ b/api/src/failpoint.rs @@ -3,7 +3,7 @@ #[allow(unused_imports)] use anyhow::{format_err, Result}; -use diem_api_types::Error; +use aptos_api_types::Error; #[allow(unused_variables)] #[inline] diff --git a/api/src/health_check.rs b/api/src/health_check.rs index e9d81603a3500..d7aad38139bc1 100644 --- a/api/src/health_check.rs +++ b/api/src/health_check.rs @@ -47,7 +47,7 @@ async fn health_check( check_latest_ledger_info_timestamp(duration, timestamp, now) .map_err(|_| reject::custom(HealthCheckError))?; } - Ok(Box::new("diem-node:ok")) + Ok(Box::new("aptos-node:ok")) } pub fn check_latest_ledger_info_timestamp( diff --git a/api/src/index.rs b/api/src/index.rs index e107f24db6ce3..3763bf9fd42e6 100644 --- a/api/src/index.rs +++ b/api/src/index.rs @@ -10,7 +10,7 @@ use crate::{ metrics::{metrics, status_metrics}, transactions, }; -use diem_api_types::{Error, Response}; +use aptos_api_types::{Error, Response}; use std::convert::Infallible; use warp::{ diff --git a/api/src/log.rs b/api/src/log.rs index 6e0fbd81eef88..b8b7c156f59bb 100644 --- a/api/src/log.rs +++ b/api/src/log.rs @@ -3,7 +3,7 @@ use std::time::Duration; -use diem_logger::{ +use aptos_logger::{ debug, error, prelude::{sample, SampleRate}, sample::Sampling, diff --git a/api/src/metrics.rs b/api/src/metrics.rs index a101adf7fb560..01f7820cb36da 100644 --- a/api/src/metrics.rs +++ b/api/src/metrics.rs @@ -1,14 +1,14 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_metrics::{register_histogram_vec, HistogramVec}; +use aptos_metrics::{register_histogram_vec, HistogramVec}; use once_cell::sync::Lazy; use warp::log::{custom, Info, Log}; static HISTOGRAM: Lazy = Lazy::new(|| { register_histogram_vec!( - "diem_api_requests", + "aptos_api_requests", "API requests latency grouped by method, operation_id and status", &["method", "operation_id", "status"] ) @@ -17,7 +17,7 @@ static HISTOGRAM: Lazy = Lazy::new(|| { static RESPONSE_STATUS: Lazy = Lazy::new(|| { register_histogram_vec!( - "diem_api_response_status", + "aptos_api_response_status", "API requests latency grouped by status code only", &["status"] ) diff --git a/api/src/page.rs b/api/src/page.rs index 3113c1b8a4218..98273f1ff62bd 100644 --- a/api/src/page.rs +++ b/api/src/page.rs @@ -3,7 +3,7 @@ use crate::param::{Param, TransactionVersionParam}; -use diem_api_types::{Error, TransactionId}; +use aptos_api_types::{Error, TransactionId}; use anyhow::Result; use serde::Deserialize; diff --git a/api/src/param.rs b/api/src/param.rs index a0835f81e531d..8389b715eaadb 100644 --- a/api/src/param.rs +++ b/api/src/param.rs @@ -1,7 +1,7 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_api_types::{Address, Error, EventKey, MoveStructTag, TransactionId}; +use aptos_api_types::{Address, Error, EventKey, MoveStructTag, TransactionId}; use move_core_types::identifier::Identifier; use percent_encoding::percent_decode_str; use serde::{Deserialize, Deserializer}; diff --git a/api/src/runtime.rs b/api/src/runtime.rs index 037da5c3ec5fd..2a9416541abe3 100644 --- a/api/src/runtime.rs +++ b/api/src/runtime.rs @@ -3,9 +3,9 @@ use crate::{context::Context, index}; -use diem_config::config::{ApiConfig, JsonRpcConfig, NodeConfig}; -use diem_mempool::MempoolClientSender; -use diem_types::chain_id::ChainId; +use aptos_config::config::{ApiConfig, JsonRpcConfig, NodeConfig}; +use aptos_mempool::MempoolClientSender; +use aptos_types::chain_id::ChainId; use storage_interface::MoveDbReader; use warp::{Filter, Reply}; @@ -96,8 +96,8 @@ impl WebServer { mod tests { use std::time::Duration; - use diem_config::config::NodeConfig; - use diem_types::chain_id::ChainId; + use aptos_config::config::NodeConfig; + use aptos_types::chain_id::ChainId; use crate::{ runtime::bootstrap, diff --git a/api/src/tests/accounts_test.rs b/api/src/tests/accounts_test.rs index f0877e33d39d5..78473db9e0360 100644 --- a/api/src/tests/accounts_test.rs +++ b/api/src/tests/accounts_test.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 use crate::tests::{assert_json, find_value, new_test_context}; -use diem_api_types::HexEncodedBytes; +use aptos_api_types::HexEncodedBytes; use serde_json::json; #[tokio::test] @@ -178,7 +178,7 @@ async fn test_get_module_with_script_functions() { } #[tokio::test] -async fn test_get_module_diem_config() { +async fn test_get_module_aptos_config() { let context = new_test_context(); let address = "0x1"; diff --git a/api/src/tests/string_resource_test.rs b/api/src/tests/string_resource_test.rs index c5387a2619613..7b2b3a5312c31 100644 --- a/api/src/tests/string_resource_test.rs +++ b/api/src/tests/string_resource_test.rs @@ -3,9 +3,9 @@ use crate::tests::new_test_context; -use diem_api_types::Address; -use diem_crypto::ed25519::Ed25519PrivateKey; -use diem_sdk::types::LocalAccount; +use aptos_api_types::Address; +use aptos_crypto::ed25519::Ed25519PrivateKey; +use aptos_sdk::types::LocalAccount; use serde_json::json; use std::convert::TryInto; diff --git a/api/src/tests/test_context.rs b/api/src/tests/test_context.rs index d45f521946f23..d6cbc22c391e3 100644 --- a/api/src/tests/test_context.rs +++ b/api/src/tests/test_context.rs @@ -2,27 +2,26 @@ // SPDX-License-Identifier: Apache-2.0 use crate::{context::Context, index, tests::pretty}; -use bytes::Bytes; -use diem_api_types::{ - mime_types, HexEncodedBytes, TransactionOnChainData, X_DIEM_CHAIN_ID, X_DIEM_LEDGER_TIMESTAMP, - X_DIEM_LEDGER_VERSION, +use aptos_api_types::{ + mime_types, HexEncodedBytes, TransactionOnChainData, X_APTOS_CHAIN_ID, + X_APTOS_LEDGER_TIMESTAMP, X_APTOS_LEDGER_VERSION, }; -use diem_config::config::{ApiConfig, RoleType}; -use diem_crypto::{hash::HashValue, SigningKey}; -use diem_genesis_tool::validator_builder::{RootKeys, ValidatorBuilder}; -use diem_global_constants::OWNER_ACCOUNT; -use diem_mempool::mocks::MockSharedMempool; -use diem_sdk::{ +use aptos_config::config::{ApiConfig, RoleType}; +use aptos_crypto::{hash::HashValue, SigningKey}; +use aptos_genesis_tool::validator_builder::{RootKeys, ValidatorBuilder}; +use aptos_global_constants::OWNER_ACCOUNT; +use aptos_mempool::mocks::MockSharedMempool; +use aptos_sdk::{ transaction_builder::{Currency, TransactionFactory}, types::{ - account_config::{diem_root_address, treasury_compliance_account_address}, + account_config::{aptos_root_address, treasury_compliance_account_address}, transaction::SignedTransaction, AccountKey, LocalAccount, }, }; -use diem_secure_storage::KVStorage; -use diem_temppath::TempPath; -use diem_types::{ +use aptos_secure_storage::KVStorage; +use aptos_temppath::TempPath; +use aptos_types::{ account_address::AccountAddress, account_config::testnet_dd_account_address, block_info::BlockInfo, @@ -32,8 +31,9 @@ use diem_types::{ on_chain_config::VMPublishingOption, transaction::{Transaction, TransactionStatus}, }; -use diem_vm::DiemVM; -use diemdb::DiemDB; +use aptos_vm::DiemVM; +use aptosdb::DiemDB; +use bytes::Bytes; use executor::db_bootstrapper; use executor_types::BlockExecutorTrait; use hyper::Response; @@ -144,7 +144,7 @@ impl TestContext { } pub fn root_account(&self) -> LocalAccount { - LocalAccount::new(diem_root_address(), self.root_keys.root_key.clone(), 0) + LocalAccount::new(aptos_root_address(), self.root_keys.root_key.clone(), 0) } pub fn gen_account(&mut self) -> LocalAccount { @@ -185,7 +185,7 @@ impl TestContext { .into_inner() } - pub fn get_latest_ledger_info(&self) -> diem_api_types::LedgerInfo { + pub fn get_latest_ledger_info(&self) -> aptos_api_types::LedgerInfo { self.context.get_latest_ledger_info().unwrap() } @@ -370,13 +370,13 @@ impl TestContext { if self.expect_status_code < 300 { let ledger_info = self.get_latest_ledger_info(); - assert_eq!(headers[X_DIEM_CHAIN_ID], "4"); + assert_eq!(headers[X_APTOS_CHAIN_ID], "4"); assert_eq!( - headers[X_DIEM_LEDGER_VERSION], + headers[X_APTOS_LEDGER_VERSION], ledger_info.version().to_string() ); assert_eq!( - headers[X_DIEM_LEDGER_TIMESTAMP], + headers[X_APTOS_LEDGER_TIMESTAMP], ledger_info.timestamp().to_string() ); } diff --git a/api/src/tests/transactions_test.rs b/api/src/tests/transactions_test.rs index 756e624e48a58..ceb907d7ff99f 100644 --- a/api/src/tests/transactions_test.rs +++ b/api/src/tests/transactions_test.rs @@ -3,14 +3,14 @@ use crate::tests::{assert_json, find_value, new_test_context, pretty, TestContext}; -use diem_api_types::{HashValue, HexEncodedBytes}; -use diem_crypto::{ +use aptos_api_types::{HashValue, HexEncodedBytes}; +use aptos_crypto::{ hash::CryptoHash, multi_ed25519::{MultiEd25519PrivateKey, MultiEd25519PublicKey}, SigningKey, Uniform, }; -use diem_sdk::{transaction_builder::Currency, types::LocalAccount}; -use diem_types::{ +use aptos_sdk::{transaction_builder::Currency, types::LocalAccount}; +use aptos_types::{ access_path::{AccessPath, Path}, account_address::AccountAddress, account_config::{from_currency_code_string, xus_tag, XUS_NAME}, @@ -32,7 +32,7 @@ use serde_json::json; async fn test_deserialize_genesis_transaction() { let context = new_test_context(); let resp = context.get("/transactions/0").await; - serde_json::from_value::(resp).unwrap(); + serde_json::from_value::(resp).unwrap(); } #[tokio::test] diff --git a/api/src/transactions.rs b/api/src/transactions.rs index 06b2949bbc274..9d90df62603bc 100644 --- a/api/src/transactions.rs +++ b/api/src/transactions.rs @@ -9,11 +9,11 @@ use crate::{ param::{AddressParam, TransactionIdParam}, }; -use diem_api_types::{ +use aptos_api_types::{ mime_types::BCS_SIGNED_TRANSACTION, Error, LedgerInfo, Response, Transaction, TransactionData, TransactionId, TransactionOnChainData, TransactionSigningMessage, UserTransactionRequest, }; -use diem_types::{ +use aptos_types::{ mempool_status::MempoolStatusCode, transaction::{RawTransaction, SignedTransaction}, }; @@ -313,7 +313,7 @@ impl Transactions { // because the period a transaction stay in the mempool is likely short. // Although the mempool get transation is async, but looking up txn in database is a sync call, // thus we keep it simple and call them in sequence. - async fn get_by_hash(&self, hash: diem_crypto::HashValue) -> Result> { + async fn get_by_hash(&self, hash: aptos_crypto::HashValue) -> Result> { let from_db = self .context .get_transaction_by_hash(hash, self.ledger_info.version())?; diff --git a/api/types/Cargo.toml b/api/types/Cargo.toml index 45c66423d806f..eb42eb9c056ad 100644 --- a/api/types/Cargo.toml +++ b/api/types/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "diem-api-types" +name = "aptos-api-types" version = "0.0.1" authors = ["Diem Association "] description = "Diem API Types" @@ -17,10 +17,10 @@ serde = { version = "1.0.124", default-features = false } serde_json = "1.0.64" warp = { version = "0.3.2", features = ["default"] } -diem-crypto = { path = "../../crates/diem-crypto" } -diem-transaction-builder = { path = "../../sdk/transaction-builder" } -diem-types = { path = "../../types" } -diem-workspace-hack = { version = "0.1", path = "../../crates/diem-workspace-hack" } +aptos-crypto = { path = "../../crates/aptos-crypto" } +aptos-transaction-builder = { path = "../../sdk/transaction-builder" } +aptos-types = { path = "../../types" } +aptos-workspace-hack = { version = "0.1", path = "../../crates/aptos-workspace-hack" } move-binary-format = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } move-core-types = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } move-resource-viewer = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } diff --git a/api/types/src/account.rs b/api/types/src/account.rs index b0f35d60ddf66..240e440955ac7 100644 --- a/api/types/src/account.rs +++ b/api/types/src/account.rs @@ -3,7 +3,7 @@ use crate::{HexEncodedBytes, U64}; -use diem_types::account_config::AccountResource; +use aptos_types::account_config::AccountResource; use serde::{Deserialize, Serialize}; #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] diff --git a/api/types/src/address.rs b/api/types/src/address.rs index 5aaa2d879144f..d3c4e6d2c4035 100644 --- a/api/types/src/address.rs +++ b/api/types/src/address.rs @@ -1,7 +1,7 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_types::account_address::AccountAddress; +use aptos_types::account_address::AccountAddress; use serde::{de::Error as _, Deserialize, Deserializer, Serialize, Serializer}; use std::{fmt, str::FromStr}; @@ -78,7 +78,7 @@ impl<'de> Deserialize<'de> for Address { mod tests { use crate::address::Address; - use diem_types::account_address::AccountAddress; + use aptos_types::account_address::AccountAddress; use serde_json::{json, Value}; diff --git a/api/types/src/convert.rs b/api/types/src/convert.rs index 24d7ea1b13a27..ec50da9e63419 100644 --- a/api/types/src/convert.rs +++ b/api/types/src/convert.rs @@ -7,9 +7,9 @@ use crate::{ ScriptPayload, ScriptWriteSet, Transaction, TransactionInfo, TransactionOnChainData, TransactionPayload, UserTransactionRequest, WriteSet, WriteSetChange, WriteSetPayload, }; -use diem_crypto::HashValue; -use diem_transaction_builder::error_explain; -use diem_types::{ +use aptos_crypto::HashValue; +use aptos_transaction_builder::error_explain; +use aptos_types::{ access_path::{AccessPath, Path}, chain_id::ChainId, contract_event::ContractEvent, @@ -74,7 +74,7 @@ impl<'a, R: MoveResolver + ?Sized> MoveConverter<'a, R> { timestamp: u64, data: TransactionOnChainData, ) -> Result { - use diem_types::transaction::Transaction::*; + use aptos_types::transaction::Transaction::*; let info = self.into_transaction_info(data.version, &data.info, data.accumulator_root_hash); let events = self.try_into_events(&data.events)?; Ok(match data.transaction { @@ -99,7 +99,7 @@ impl<'a, R: MoveResolver + ?Sized> MoveConverter<'a, R> { pub fn into_transaction_info( &self, version: u64, - info: &diem_types::transaction::TransactionInfo, + info: &aptos_types::transaction::TransactionInfo, accumulator_root_hash: HashValue, ) -> TransactionInfo { TransactionInfo { @@ -116,9 +116,9 @@ impl<'a, R: MoveResolver + ?Sized> MoveConverter<'a, R> { pub fn try_into_transaction_payload( &self, - payload: diem_types::transaction::TransactionPayload, + payload: aptos_types::transaction::TransactionPayload, ) -> Result { - use diem_types::transaction::TransactionPayload::*; + use aptos_types::transaction::TransactionPayload::*; let ret = match payload { WriteSet(v) => TransactionPayload::WriteSetPayload(self.try_into_write_set_payload(v)?), Script(s) => TransactionPayload::ScriptPayload(s.try_into()?), @@ -159,9 +159,9 @@ impl<'a, R: MoveResolver + ?Sized> MoveConverter<'a, R> { pub fn try_into_write_set_payload( &self, - payload: diem_types::transaction::WriteSetPayload, + payload: aptos_types::transaction::WriteSetPayload, ) -> Result { - use diem_types::transaction::WriteSetPayload::*; + use aptos_types::transaction::WriteSetPayload::*; let ret = match payload { Script { execute_as, script } => WriteSetPayload { write_set: WriteSet::ScriptWriteSet(ScriptWriteSet { @@ -273,8 +273,8 @@ impl<'a, R: MoveResolver + ?Sized> MoveConverter<'a, R> { pub fn try_into_diem_core_transaction_payload( &self, payload: TransactionPayload, - ) -> Result { - use diem_types::transaction::TransactionPayload as Target; + ) -> Result { + use aptos_types::transaction::TransactionPayload as Target; let ret = match payload { TransactionPayload::ScriptFunctionPayload(script_func_payload) => { diff --git a/api/types/src/event_key.rs b/api/types/src/event_key.rs index d0e8f6814c967..1bd9ba0dd2c7d 100644 --- a/api/types/src/event_key.rs +++ b/api/types/src/event_key.rs @@ -5,15 +5,15 @@ use serde::{de::Error as _, Deserialize, Deserializer, Serialize, Serializer}; use std::{fmt, str::FromStr}; #[derive(Clone, Debug, PartialEq, Copy)] -pub struct EventKey(diem_types::event::EventKey); +pub struct EventKey(aptos_types::event::EventKey); -impl From for EventKey { - fn from(val: diem_types::event::EventKey) -> Self { +impl From for EventKey { + fn from(val: aptos_types::event::EventKey) -> Self { Self(val) } } -impl From for diem_types::event::EventKey { +impl From for aptos_types::event::EventKey { fn from(val: EventKey) -> Self { val.0 } @@ -24,9 +24,9 @@ impl FromStr for EventKey { fn from_str(s: &str) -> anyhow::Result { if let Some(hex) = s.strip_prefix("0x") { - Ok(hex.parse::()?.into()) + Ok(hex.parse::()?.into()) } else { - Ok(s.parse::()?.into()) + Ok(s.parse::()?.into()) } } } diff --git a/api/types/src/hash.rs b/api/types/src/hash.rs index 26bc715578b44..0fbda65295627 100644 --- a/api/types/src/hash.rs +++ b/api/types/src/hash.rs @@ -5,15 +5,15 @@ use serde::{de::Error as _, Deserialize, Deserializer, Serialize, Serializer}; use std::{fmt, str::FromStr}; #[derive(Clone, Debug, PartialEq, Copy)] -pub struct HashValue(diem_crypto::hash::HashValue); +pub struct HashValue(aptos_crypto::hash::HashValue); -impl From for HashValue { - fn from(val: diem_crypto::hash::HashValue) -> Self { +impl From for HashValue { + fn from(val: aptos_crypto::hash::HashValue) -> Self { Self(val) } } -impl From for diem_crypto::hash::HashValue { +impl From for aptos_crypto::hash::HashValue { fn from(val: HashValue) -> Self { val.0 } @@ -24,9 +24,9 @@ impl FromStr for HashValue { fn from_str(s: &str) -> anyhow::Result { if let Some(hex) = s.strip_prefix("0x") { - Ok(hex.parse::()?.into()) + Ok(hex.parse::()?.into()) } else { - Ok(s.parse::()?.into()) + Ok(s.parse::()?.into()) } } } diff --git a/api/types/src/ledger_info.rs b/api/types/src/ledger_info.rs index 6ddde634fd620..89c1f52acade4 100644 --- a/api/types/src/ledger_info.rs +++ b/api/types/src/ledger_info.rs @@ -3,7 +3,7 @@ use crate::U64; -use diem_types::{chain_id::ChainId, ledger_info::LedgerInfoWithSignatures}; +use aptos_types::{chain_id::ChainId, ledger_info::LedgerInfoWithSignatures}; use serde::{Deserialize, Serialize}; diff --git a/api/types/src/lib.rs b/api/types/src/lib.rs index 5a92bf8d061ff..33cb39700b560 100644 --- a/api/types/src/lib.rs +++ b/api/types/src/lib.rs @@ -27,7 +27,7 @@ pub use move_types::{ MoveScriptBytecode, MoveStructTag, MoveStructValue, MoveType, MoveValue, ScriptFunctionId, U128, U64, }; -pub use response::{Response, X_DIEM_CHAIN_ID, X_DIEM_LEDGER_TIMESTAMP, X_DIEM_LEDGER_VERSION}; +pub use response::{Response, X_APTOS_CHAIN_ID, X_APTOS_LEDGER_TIMESTAMP, X_APTOS_LEDGER_VERSION}; pub use transaction::{ BlockMetadataTransaction, DirectWriteSet, Event, GenesisTransaction, PendingTransaction, ScriptFunctionPayload, ScriptPayload, ScriptWriteSet, Transaction, TransactionData, diff --git a/api/types/src/move_types.rs b/api/types/src/move_types.rs index 63c78c0b781cd..0f7aa968cb2c1 100644 --- a/api/types/src/move_types.rs +++ b/api/types/src/move_types.rs @@ -4,7 +4,7 @@ use crate::{Address, Bytecode}; use anyhow::{bail, format_err}; -use diem_types::{account_config::CORE_CODE_ADDRESS, event::EventKey, transaction::Module}; +use aptos_types::{account_config::CORE_CODE_ADDRESS, event::EventKey, transaction::Module}; use move_binary_format::{ access::ModuleAccess, file_format::{ @@ -968,7 +968,7 @@ mod tests { U64, }; - use diem_types::account_address::AccountAddress; + use aptos_types::account_address::AccountAddress; use move_binary_format::file_format::AbilitySet; use move_core_types::{ identifier::Identifier, diff --git a/api/types/src/response.rs b/api/types/src/response.rs index 5429cf3dc011e..6abb77bc1e6db 100644 --- a/api/types/src/response.rs +++ b/api/types/src/response.rs @@ -7,9 +7,9 @@ use anyhow::Result; use serde::Serialize; use warp::http::header::{HeaderValue, CONTENT_TYPE}; -pub const X_DIEM_CHAIN_ID: &str = "X-Diem-Chain-Id"; -pub const X_DIEM_LEDGER_VERSION: &str = "X-Diem-Ledger-Version"; -pub const X_DIEM_LEDGER_TIMESTAMP: &str = "X-Diem-Ledger-TimestampUsec"; +pub const X_APTOS_CHAIN_ID: &str = "X-Aptos-Chain-Id"; +pub const X_APTOS_LEDGER_VERSION: &str = "X-Aptos-Ledger-Version"; +pub const X_APTOS_LEDGER_TIMESTAMP: &str = "X-Aptos-Ledger-TimestampUsec"; pub struct Response { pub ledger_info: LedgerInfo, @@ -31,13 +31,13 @@ impl warp::Reply for Response { let headers = res.headers_mut(); headers.insert(CONTENT_TYPE, HeaderValue::from_static("application/json")); - headers.insert(X_DIEM_CHAIN_ID, (self.ledger_info.chain_id as u16).into()); + headers.insert(X_APTOS_CHAIN_ID, (self.ledger_info.chain_id as u16).into()); headers.insert( - X_DIEM_LEDGER_VERSION, + X_APTOS_LEDGER_VERSION, self.ledger_info.ledger_version.into(), ); headers.insert( - X_DIEM_LEDGER_TIMESTAMP, + X_APTOS_LEDGER_TIMESTAMP, self.ledger_info.ledger_timestamp.into(), ); diff --git a/api/types/src/transaction.rs b/api/types/src/transaction.rs index ad25c1655e77b..a8c0fd8b4facf 100755 --- a/api/types/src/transaction.rs +++ b/api/types/src/transaction.rs @@ -7,12 +7,12 @@ use crate::{ }; use anyhow::bail; -use diem_crypto::{ +use aptos_crypto::{ ed25519::{self, Ed25519PublicKey}, multi_ed25519::{self, MultiEd25519PublicKey}, validatable::Validatable, }; -use diem_types::{ +use aptos_types::{ account_address::AccountAddress, block_metadata::BlockMetadata, contract_event::ContractEvent, @@ -51,14 +51,14 @@ impl From for TransactionData { #[derive(Clone, Debug, Eq, PartialEq)] pub struct TransactionOnChainData { pub version: u64, - pub transaction: diem_types::transaction::Transaction, - pub info: diem_types::transaction::TransactionInfo, + pub transaction: aptos_types::transaction::Transaction, + pub info: aptos_types::transaction::TransactionInfo, pub events: Vec, - pub accumulator_root_hash: diem_crypto::HashValue, + pub accumulator_root_hash: aptos_crypto::HashValue, } -impl From<(TransactionWithProof, diem_crypto::HashValue)> for TransactionOnChainData { - fn from((txn, accumulator_root_hash): (TransactionWithProof, diem_crypto::HashValue)) -> Self { +impl From<(TransactionWithProof, aptos_crypto::HashValue)> for TransactionOnChainData { + fn from((txn, accumulator_root_hash): (TransactionWithProof, aptos_crypto::HashValue)) -> Self { Self { version: txn.version, transaction: txn.transaction, @@ -72,19 +72,19 @@ impl From<(TransactionWithProof, diem_crypto::HashValue)> for TransactionOnChain impl From<( u64, - diem_types::transaction::Transaction, - diem_types::transaction::TransactionInfo, + aptos_types::transaction::Transaction, + aptos_types::transaction::TransactionInfo, Vec, - diem_crypto::HashValue, + aptos_crypto::HashValue, )> for TransactionOnChainData { fn from( (version, transaction, info, events, accumulator_root_hash): ( u64, - diem_types::transaction::Transaction, - diem_types::transaction::TransactionInfo, + aptos_types::transaction::Transaction, + aptos_types::transaction::TransactionInfo, Vec, - diem_crypto::HashValue, + aptos_crypto::HashValue, ), ) -> Self { Self { @@ -504,7 +504,7 @@ impl TryFrom for TransactionAuthenticator { Ok(TransactionAuthenticator::multi_ed25519( MultiEd25519PublicKey::new(ed25519_public_keys, threshold)?, - diem_crypto::multi_ed25519::MultiEd25519Signature::new_with_signatures_and_bitmap( + aptos_crypto::multi_ed25519::MultiEd25519Signature::new_with_signatures_and_bitmap( ed25519_signatures, bitmap.inner().try_into()?, ), @@ -534,7 +534,7 @@ impl TryFrom for AccountAuthenticator { Ok(AccountAuthenticator::multi_ed25519( MultiEd25519PublicKey::new(ed25519_public_keys, threshold)?, - diem_crypto::multi_ed25519::MultiEd25519Signature::new_with_signatures_and_bitmap( + aptos_crypto::multi_ed25519::MultiEd25519Signature::new_with_signatures_and_bitmap( ed25519_signatures, bitmap.inner().try_into()?, ), diff --git a/diem-move/diem-keygen/Cargo.toml b/aptos-move/aptos-keygen/Cargo.toml similarity index 65% rename from diem-move/diem-keygen/Cargo.toml rename to aptos-move/aptos-keygen/Cargo.toml index 55ef5fdc9efd8..3efb06329bb22 100644 --- a/diem-move/diem-keygen/Cargo.toml +++ b/aptos-move/aptos-keygen/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "diem-keygen" +name = "aptos-keygen" version = "0.1.0" authors = ["Diem Association "] description = "Command line utility to generate Ed25519 key pairs for testing" @@ -14,6 +14,6 @@ rand = "0.8.3" sha3 = "0.9.1" hex = "0.4.3" -diem-crypto = { path = "../../crates/diem-crypto" } -diem-types = { path = "../../types" } -diem-workspace-hack = { path = "../../crates/diem-workspace-hack" } +aptos-crypto = { path = "../../crates/aptos-crypto" } +aptos-types = { path = "../../types" } +aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" } diff --git a/diem-move/diem-keygen/src/lib.rs b/aptos-move/aptos-keygen/src/lib.rs similarity index 93% rename from diem-move/diem-keygen/src/lib.rs rename to aptos-move/aptos-keygen/src/lib.rs index 5439e8802f9d9..bba4a5628d832 100644 --- a/diem-move/diem-keygen/src/lib.rs +++ b/aptos-move/aptos-keygen/src/lib.rs @@ -1,11 +1,11 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_crypto::{ +use aptos_crypto::{ ed25519::{Ed25519PrivateKey, Ed25519PublicKey}, PrivateKey, Uniform, }; -use diem_types::{account_address::AccountAddress, transaction::authenticator::AuthenticationKey}; +use aptos_types::{account_address::AccountAddress, transaction::authenticator::AuthenticationKey}; use rand::{ rngs::{OsRng, StdRng}, Rng, SeedableRng, diff --git a/diem-move/diem-keygen/src/main.rs b/aptos-move/aptos-keygen/src/main.rs similarity index 80% rename from diem-move/diem-keygen/src/main.rs rename to aptos-move/aptos-keygen/src/main.rs index 02c064381e584..2988395fe7706 100644 --- a/diem-move/diem-keygen/src/main.rs +++ b/aptos-move/aptos-keygen/src/main.rs @@ -1,9 +1,9 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_crypto::ValidCryptoMaterialStringExt; -use diem_keygen::KeyGen; -use diem_types::{account_address::AccountAddress, transaction::authenticator::AuthenticationKey}; +use aptos_crypto::ValidCryptoMaterialStringExt; +use aptos_keygen::KeyGen; +use aptos_types::{account_address::AccountAddress, transaction::authenticator::AuthenticationKey}; fn main() { let mut keygen = KeyGen::from_os_rng(); diff --git a/diem-move/diem-resource-viewer/Cargo.toml b/aptos-move/aptos-resource-viewer/Cargo.toml similarity index 81% rename from diem-move/diem-resource-viewer/Cargo.toml rename to aptos-move/aptos-resource-viewer/Cargo.toml index b3b2cb99dede2..f7914aaf4593f 100644 --- a/diem-move/diem-resource-viewer/Cargo.toml +++ b/aptos-move/aptos-resource-viewer/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "diem-resource-viewer" +name = "aptos-resource-viewer" version = "0.1.0" authors = ["Diem Association "] description = "Diem resource viewer" @@ -10,9 +10,9 @@ publish = false edition = "2018" [dependencies] -diem-workspace-hack = { path = "../../crates/diem-workspace-hack" } +aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" } move-resource-viewer = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } -diem-types = { path = "../../types" } +aptos-types = { path = "../../types" } move-core-types = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } move-binary-format = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } diff --git a/diem-move/diem-resource-viewer/src/lib.rs b/aptos-move/aptos-resource-viewer/src/lib.rs similarity index 95% rename from diem-move/diem-resource-viewer/src/lib.rs rename to aptos-move/aptos-resource-viewer/src/lib.rs index ab850a79979b6..1f06a5c2e2421 100644 --- a/diem-move/diem-resource-viewer/src/lib.rs +++ b/aptos-move/aptos-resource-viewer/src/lib.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 use anyhow::{bail, Result}; -use diem_types::{ +use aptos_types::{ access_path::AccessPath, account_address::AccountAddress, account_state::AccountState, contract_event::ContractEvent, }; @@ -18,7 +18,7 @@ pub use move_resource_viewer::{AnnotatedMoveStruct, AnnotatedMoveValue}; pub struct DiemValueAnnotator<'a, T>(MoveValueAnnotator<'a, T>); -/// A wrapper around `MoveValueAnnotator` that adds a few diem-specific funtionalities. +/// A wrapper around `MoveValueAnnotator` that adds a few aptos-specific funtionalities. #[derive(Debug)] pub struct AnnotatedAccountStateBlob(BTreeMap); diff --git a/diem-move/diem-transaction-benchmarks/Cargo.toml b/aptos-move/aptos-transaction-benchmarks/Cargo.toml similarity index 73% rename from diem-move/diem-transaction-benchmarks/Cargo.toml rename to aptos-move/aptos-transaction-benchmarks/Cargo.toml index ae9b93500d703..13eb4e19fe5f5 100644 --- a/diem-move/diem-transaction-benchmarks/Cargo.toml +++ b/aptos-move/aptos-transaction-benchmarks/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "diem-transaction-benchmarks" +name = "aptos-transaction-benchmarks" version = "0.1.0" authors = ["Diem Association "] description = "Diem transaction benchmarks" @@ -14,14 +14,14 @@ criterion = "0.3.4" proptest = "1.0.0" criterion-cpu-time = "0.1.0" -diem-types = { path = "../../types", features = ["fuzzing"] } +aptos-types = { path = "../../types", features = ["fuzzing"] } language-e2e-tests = { path = "../e2e-tests" } -diem-workspace-hack = { path = "../../crates/diem-workspace-hack" } -diem-crypto = { path = "../../crates/diem-crypto" } +aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" } +aptos-crypto = { path = "../../crates/aptos-crypto" } read-write-set = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } read-write-set-dynamic = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } -diem-vm = { path = "../diem-vm" } +aptos-vm = { path = "../aptos-vm" } diem-framework-releases = { path = "../diem-framework/DPN/releases" } [[bench]] diff --git a/diem-move/diem-transaction-benchmarks/benches/transaction_benches.rs b/aptos-move/aptos-transaction-benchmarks/benches/transaction_benches.rs similarity index 96% rename from diem-move/diem-transaction-benchmarks/benches/transaction_benches.rs rename to aptos-move/aptos-transaction-benchmarks/benches/transaction_benches.rs index 7717783ab2176..36d5b1842bada 100644 --- a/diem-move/diem-transaction-benchmarks/benches/transaction_benches.rs +++ b/aptos-move/aptos-transaction-benchmarks/benches/transaction_benches.rs @@ -1,10 +1,10 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use criterion::{criterion_group, criterion_main, measurement::Measurement, Criterion}; -use diem_transaction_benchmarks::{ +use aptos_transaction_benchmarks::{ measurement::wall_time_measurement, transactions::TransactionBencher, }; +use criterion::{criterion_group, criterion_main, measurement::Measurement, Criterion}; use language_e2e_tests::account_universe::P2PTransferGen; use proptest::prelude::*; diff --git a/diem-move/diem-transaction-benchmarks/src/lib.rs b/aptos-move/aptos-transaction-benchmarks/src/lib.rs similarity index 100% rename from diem-move/diem-transaction-benchmarks/src/lib.rs rename to aptos-move/aptos-transaction-benchmarks/src/lib.rs diff --git a/diem-move/diem-transaction-benchmarks/src/measurement.rs b/aptos-move/aptos-transaction-benchmarks/src/measurement.rs similarity index 100% rename from diem-move/diem-transaction-benchmarks/src/measurement.rs rename to aptos-move/aptos-transaction-benchmarks/src/measurement.rs diff --git a/diem-move/diem-transaction-benchmarks/src/transactions.rs b/aptos-move/aptos-transaction-benchmarks/src/transactions.rs similarity index 98% rename from diem-move/diem-transaction-benchmarks/src/transactions.rs rename to aptos-move/aptos-transaction-benchmarks/src/transactions.rs index e1867406e1e9e..7cdb23532e53c 100644 --- a/diem-move/diem-transaction-benchmarks/src/transactions.rs +++ b/aptos-move/aptos-transaction-benchmarks/src/transactions.rs @@ -1,14 +1,14 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use criterion::{measurement::Measurement, BatchSize, Bencher}; -use diem_crypto::HashValue; -use diem_types::{ +use aptos_crypto::HashValue; +use aptos_types::{ block_metadata::BlockMetadata, on_chain_config::{OnChainConfig, ValidatorSet}, transaction::Transaction, }; -use diem_vm::{DiemVM, VMExecutor}; +use aptos_vm::{DiemVM, VMExecutor}; +use criterion::{measurement::Measurement, BatchSize, Bencher}; use language_e2e_tests::{ account_universe::{log_balance_strategy, AUTransactionGen, AccountUniverseGen}, executor::FakeExecutor, diff --git a/diem-move/diem-transactional-test-harness/Cargo.toml b/aptos-move/aptos-transactional-test-harness/Cargo.toml similarity index 74% rename from diem-move/diem-transactional-test-harness/Cargo.toml rename to aptos-move/aptos-transactional-test-harness/Cargo.toml index f2234f473250a..f96896aeca46d 100644 --- a/diem-move/diem-transactional-test-harness/Cargo.toml +++ b/aptos-move/aptos-transactional-test-harness/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "diem-transactional-test-harness" +name = "aptos-transactional-test-harness" version = "0.1.0" authors = ["Diem Association "] description = "Transactional testing framework for Move" @@ -28,17 +28,17 @@ move-command-line-common = { git = "https://github.com/diem/move", rev = "98ed29 # Diem-Move dependencies language-e2e-tests = { path = "../e2e-tests" } -diem-vm = { path = "../diem-vm" } +aptos-vm = { path = "../aptos-vm" } vm-genesis= { path = "../vm-genesis" } diem-framework = { path = "../diem-framework" } -diem-keygen = { path = "../diem-keygen" } +aptos-keygen = { path = "../aptos-keygen" } # Other Diem dependencies -diem-types = { path = "../../types", features = ["fuzzing"] } -diem-transaction-builder = { path = "../../sdk/transaction-builder" } -diem-crypto = { path = "../../crates/diem-crypto" } -diem-state-view = { path = "../../storage/state-view" } -diem-workspace-hack = { version = "0.1", path = "../../crates/diem-workspace-hack" } +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" diff --git a/diem-move/diem-transactional-test-harness/src/diem_test_harness.rs b/aptos-move/aptos-transactional-test-harness/src/diem_test_harness.rs similarity index 97% rename from diem-move/diem-transactional-test-harness/src/diem_test_harness.rs rename to aptos-move/aptos-transactional-test-harness/src/diem_test_harness.rs index c9d6e0501e95e..cb44f436110ed 100644 --- a/diem-move/diem-transactional-test-harness/src/diem_test_harness.rs +++ b/aptos-move/aptos-transactional-test-harness/src/diem_test_harness.rs @@ -2,17 +2,17 @@ // SPDX-License-Identifier: Apache-2.0 use anyhow::{bail, format_err, Result}; -use diem_crypto::{ +use aptos_crypto::{ ed25519::{Ed25519PrivateKey, Ed25519PublicKey}, hash::HashValue, PrivateKey, ValidCryptoMaterialStringExt, }; -use diem_keygen::KeyGen; -use diem_state_view::StateView; -use diem_types::{ +use aptos_keygen::KeyGen; +use aptos_state_view::StateView; +use aptos_types::{ access_path::AccessPath, account_config::{ - self, diem_root_address, testnet_dd_account_address, treasury_compliance_account_address, + self, aptos_root_address, testnet_dd_account_address, treasury_compliance_account_address, type_tag_for_currency_code, BalanceResource, DiemAccountResource, XUS_IDENTIFIER, XUS_NAME, }, block_metadata::BlockMetadata, @@ -25,7 +25,7 @@ use diem_types::{ }, vm_status::KeptVMStatus, }; -use diem_vm::DiemVM; +use aptos_vm::DiemVM; use language_e2e_tests::data_store::{FakeDataStore, GENESIS_CHANGE_SET_FRESH}; use move_binary_format::file_format::{CompiledModule, CompiledScript}; use move_compiler::{ @@ -590,12 +590,12 @@ impl<'a> DiemTestAdapter<'a> { ) { // Step 1. Create validator account. let parameters = self - .fetch_transaction_parameters(&diem_root_address(), None, None, None, None, None) + .fetch_transaction_parameters(&aptos_root_address(), None, None, None, None, None) .unwrap(); let txn = RawTransaction::new( - diem_root_address(), + aptos_root_address(), parameters.sequence_number, - diem_transaction_builder::stdlib::encode_create_validator_account_script_function( + aptos_transaction_builder::stdlib::encode_create_validator_account_script_function( 0, validator_account_addr, validator_auth_key_prefix, @@ -615,12 +615,12 @@ impl<'a> DiemTestAdapter<'a> { // Step 2. Create validator operator account. let parameters = self - .fetch_transaction_parameters(&diem_root_address(), None, None, None, None, None) + .fetch_transaction_parameters(&aptos_root_address(), None, None, None, None, None) .unwrap(); let txn = RawTransaction::new( - diem_root_address(), + aptos_root_address(), parameters.sequence_number, - diem_transaction_builder::stdlib::encode_create_validator_operator_account_script_function( + aptos_transaction_builder::stdlib::encode_create_validator_operator_account_script_function( 0, operator_account_addr, operator_auth_key_prefix, @@ -645,7 +645,7 @@ impl<'a> DiemTestAdapter<'a> { let txn = RawTransaction::new( validator_account_addr, parameters.sequence_number, - diem_transaction_builder::stdlib::encode_set_validator_operator_script_function( + aptos_transaction_builder::stdlib::encode_set_validator_operator_script_function( validator_name.as_bytes().into(), operator_account_addr, ), @@ -668,7 +668,7 @@ impl<'a> DiemTestAdapter<'a> { let txn = RawTransaction::new( operator_account_addr, parameters.sequence_number, - diem_transaction_builder::stdlib::encode_register_validator_config_script_function( + aptos_transaction_builder::stdlib::encode_register_validator_config_script_function( validator_account_addr, validator_private_key.public_key().to_bytes().to_vec(), vec![], @@ -688,12 +688,12 @@ impl<'a> DiemTestAdapter<'a> { // Step 5. Add validator to validator set. let parameters = self - .fetch_transaction_parameters(&diem_root_address(), None, None, None, None, None) + .fetch_transaction_parameters(&aptos_root_address(), None, None, None, None, None) .unwrap(); let txn = RawTransaction::new( - diem_root_address(), + aptos_root_address(), parameters.sequence_number, - diem_transaction_builder::stdlib::encode_add_validator_and_reconfigure_script_function( + aptos_transaction_builder::stdlib::encode_add_validator_and_reconfigure_script_function( 0, validator_name.as_bytes().into(), validator_account_addr, @@ -748,7 +748,7 @@ impl<'a> DiemTestAdapter<'a> { let txn = RawTransaction::new( treasury_compliance_account_address(), parameters.sequence_number, - diem_transaction_builder::stdlib::encode_create_parent_vasp_account_script_function( + aptos_transaction_builder::stdlib::encode_create_parent_vasp_account_script_function( currency_type_tag, 0, account_addr, diff --git a/diem-move/diem-transactional-test-harness/src/lib.rs b/aptos-move/aptos-transactional-test-harness/src/lib.rs similarity index 100% rename from diem-move/diem-transactional-test-harness/src/lib.rs rename to aptos-move/aptos-transactional-test-harness/src/lib.rs diff --git a/diem-move/diem-transactional-test-harness/tests/diem_test_harness/account_creation.exp b/aptos-move/aptos-transactional-test-harness/tests/diem_test_harness/account_creation.exp similarity index 100% rename from diem-move/diem-transactional-test-harness/tests/diem_test_harness/account_creation.exp rename to aptos-move/aptos-transactional-test-harness/tests/diem_test_harness/account_creation.exp diff --git a/diem-move/diem-transactional-test-harness/tests/diem_test_harness/account_creation.move b/aptos-move/aptos-transactional-test-harness/tests/diem_test_harness/account_creation.move similarity index 100% rename from diem-move/diem-transactional-test-harness/tests/diem_test_harness/account_creation.move rename to aptos-move/aptos-transactional-test-harness/tests/diem_test_harness/account_creation.move diff --git a/diem-move/diem-transactional-test-harness/tests/diem_test_harness/account_does_not_exist.exp b/aptos-move/aptos-transactional-test-harness/tests/diem_test_harness/account_does_not_exist.exp similarity index 100% rename from diem-move/diem-transactional-test-harness/tests/diem_test_harness/account_does_not_exist.exp rename to aptos-move/aptos-transactional-test-harness/tests/diem_test_harness/account_does_not_exist.exp diff --git a/diem-move/diem-transactional-test-harness/tests/diem_test_harness/account_does_not_exist.move b/aptos-move/aptos-transactional-test-harness/tests/diem_test_harness/account_does_not_exist.move similarity index 100% rename from diem-move/diem-transactional-test-harness/tests/diem_test_harness/account_does_not_exist.move rename to aptos-move/aptos-transactional-test-harness/tests/diem_test_harness/account_does_not_exist.move diff --git a/diem-move/diem-transactional-test-harness/tests/diem_test_harness/admin_script_non_diem_root.exp b/aptos-move/aptos-transactional-test-harness/tests/diem_test_harness/admin_script_non_aptos_root.exp similarity index 100% rename from diem-move/diem-transactional-test-harness/tests/diem_test_harness/admin_script_non_diem_root.exp rename to aptos-move/aptos-transactional-test-harness/tests/diem_test_harness/admin_script_non_aptos_root.exp diff --git a/diem-move/diem-transactional-test-harness/tests/diem_test_harness/admin_script_non_diem_root.move b/aptos-move/aptos-transactional-test-harness/tests/diem_test_harness/admin_script_non_aptos_root.move similarity index 100% rename from diem-move/diem-transactional-test-harness/tests/diem_test_harness/admin_script_non_diem_root.move rename to aptos-move/aptos-transactional-test-harness/tests/diem_test_harness/admin_script_non_aptos_root.move diff --git a/diem-move/diem-transactional-test-harness/tests/diem_test_harness/admin_script_with_wrong_key.exp b/aptos-move/aptos-transactional-test-harness/tests/diem_test_harness/admin_script_with_wrong_key.exp similarity index 100% rename from diem-move/diem-transactional-test-harness/tests/diem_test_harness/admin_script_with_wrong_key.exp rename to aptos-move/aptos-transactional-test-harness/tests/diem_test_harness/admin_script_with_wrong_key.exp diff --git a/diem-move/diem-transactional-test-harness/tests/diem_test_harness/admin_script_with_wrong_key.move b/aptos-move/aptos-transactional-test-harness/tests/diem_test_harness/admin_script_with_wrong_key.move similarity index 100% rename from diem-move/diem-transactional-test-harness/tests/diem_test_harness/admin_script_with_wrong_key.move rename to aptos-move/aptos-transactional-test-harness/tests/diem_test_harness/admin_script_with_wrong_key.move diff --git a/diem-move/diem-transactional-test-harness/tests/diem_test_harness/bad_private_key.exp b/aptos-move/aptos-transactional-test-harness/tests/diem_test_harness/bad_private_key.exp similarity index 100% rename from diem-move/diem-transactional-test-harness/tests/diem_test_harness/bad_private_key.exp rename to aptos-move/aptos-transactional-test-harness/tests/diem_test_harness/bad_private_key.exp diff --git a/diem-move/diem-transactional-test-harness/tests/diem_test_harness/bad_private_key.move b/aptos-move/aptos-transactional-test-harness/tests/diem_test_harness/bad_private_key.move similarity index 100% rename from diem-move/diem-transactional-test-harness/tests/diem_test_harness/bad_private_key.move rename to aptos-move/aptos-transactional-test-harness/tests/diem_test_harness/bad_private_key.move diff --git a/diem-move/diem-transactional-test-harness/tests/diem_test_harness/block_metadata.exp b/aptos-move/aptos-transactional-test-harness/tests/diem_test_harness/block_metadata.exp similarity index 100% rename from diem-move/diem-transactional-test-harness/tests/diem_test_harness/block_metadata.exp rename to aptos-move/aptos-transactional-test-harness/tests/diem_test_harness/block_metadata.exp diff --git a/diem-move/diem-transactional-test-harness/tests/diem_test_harness/block_metadata.move b/aptos-move/aptos-transactional-test-harness/tests/diem_test_harness/block_metadata.move similarity index 100% rename from diem-move/diem-transactional-test-harness/tests/diem_test_harness/block_metadata.move rename to aptos-move/aptos-transactional-test-harness/tests/diem_test_harness/block_metadata.move diff --git a/diem-move/diem-transactional-test-harness/tests/diem_test_harness/example.exp b/aptos-move/aptos-transactional-test-harness/tests/diem_test_harness/example.exp similarity index 100% rename from diem-move/diem-transactional-test-harness/tests/diem_test_harness/example.exp rename to aptos-move/aptos-transactional-test-harness/tests/diem_test_harness/example.exp diff --git a/diem-move/diem-transactional-test-harness/tests/diem_test_harness/example.move b/aptos-move/aptos-transactional-test-harness/tests/diem_test_harness/example.move similarity index 100% rename from diem-move/diem-transactional-test-harness/tests/diem_test_harness/example.move rename to aptos-move/aptos-transactional-test-harness/tests/diem_test_harness/example.move diff --git a/diem-move/diem-transactional-test-harness/tests/diem_test_harness/script_function_does_not_exist.exp b/aptos-move/aptos-transactional-test-harness/tests/diem_test_harness/script_function_does_not_exist.exp similarity index 100% rename from diem-move/diem-transactional-test-harness/tests/diem_test_harness/script_function_does_not_exist.exp rename to aptos-move/aptos-transactional-test-harness/tests/diem_test_harness/script_function_does_not_exist.exp diff --git a/diem-move/diem-transactional-test-harness/tests/diem_test_harness/script_function_does_not_exist.move b/aptos-move/aptos-transactional-test-harness/tests/diem_test_harness/script_function_does_not_exist.move similarity index 100% rename from diem-move/diem-transactional-test-harness/tests/diem_test_harness/script_function_does_not_exist.move rename to aptos-move/aptos-transactional-test-harness/tests/diem_test_harness/script_function_does_not_exist.move diff --git a/diem-move/diem-transactional-test-harness/tests/tests.rs b/aptos-move/aptos-transactional-test-harness/tests/tests.rs similarity index 74% rename from diem-move/diem-transactional-test-harness/tests/tests.rs rename to aptos-move/aptos-transactional-test-harness/tests/tests.rs index c7e5a9405fd31..f6de00dadccb6 100644 --- a/diem-move/diem-transactional-test-harness/tests/tests.rs +++ b/aptos-move/aptos-transactional-test-harness/tests/tests.rs @@ -1,6 +1,6 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_transactional_test_harness::run_dpn_test; +use aptos_transactional_test_harness::run_dpn_test; datatest_stable::harness!(run_dpn_test, "tests", r".*\.(mvir|move)$"); diff --git a/diem-move/diem-validator-interface/Cargo.toml b/aptos-move/aptos-validator-interface/Cargo.toml similarity index 66% rename from diem-move/diem-validator-interface/Cargo.toml rename to aptos-move/aptos-validator-interface/Cargo.toml index ba42ecff104b0..ea650d8840ceb 100644 --- a/diem-move/diem-validator-interface/Cargo.toml +++ b/aptos-move/aptos-validator-interface/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "diem-validator-interface" +name = "aptos-validator-interface" version = "0.1.0" authors = ["Diem Association "] description = "Defines interfaces between the diem nodes and local move infrastructure" @@ -11,12 +11,12 @@ edition = "2018" [dependencies] anyhow = "1.0.52" -diem-config = { path = "../../config" } -diem-types = { path = "../../types" } -diemdb = { path = "../../storage/diemdb" } -diem-workspace-hack = { path = "../../crates/diem-workspace-hack" } +aptos-config = { path = "../../config" } +aptos-types = { path = "../../types" } +aptosdb = { path = "../../storage/aptosdb" } +aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" } storage-interface = { path = "../../storage/storage-interface" } scratchpad = { path = "../../storage/scratchpad" } -diem-state-view = { path = "../../storage/state-view" } +aptos-state-view = { path = "../../storage/state-view" } move-binary-format = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } bcs = "0.1.2" diff --git a/diem-move/diem-validator-interface/src/lib.rs b/aptos-move/aptos-validator-interface/src/lib.rs similarity index 90% rename from diem-move/diem-validator-interface/src/lib.rs rename to aptos-move/aptos-validator-interface/src/lib.rs index bf96735c82c54..84bee5e89d9e9 100644 --- a/diem-move/diem-validator-interface/src/lib.rs +++ b/aptos-move/aptos-validator-interface/src/lib.rs @@ -6,8 +6,8 @@ mod storage_interface; pub use crate::storage_interface::DBDebuggerInterface; use anyhow::{anyhow, Result}; -use diem_state_view::StateView; -use diem_types::{ +use aptos_state_view::StateView; +use aptos_types::{ access_path::AccessPath, account_address::AccountAddress, account_config, @@ -60,22 +60,22 @@ pub trait DiemValidatorInterface: Sync { /// 4. All validator addresses fn get_admin_accounts(&self, version: Version) -> Result> { let mut result = vec![]; - let diem_root = self - .get_account_state_by_version(account_config::diem_root_address(), version)? - .ok_or_else(|| anyhow!("diem_root_address doesn't exist"))?; + let aptos_root = self + .get_account_state_by_version(account_config::aptos_root_address(), version)? + .ok_or_else(|| anyhow!("aptos_root_address doesn't exist"))?; // Get all validator accounts - let validators = diem_root + let validators = aptos_root .get_config::()? .ok_or_else(|| anyhow!("validator_config doesn't exist"))?; - // Get code account, diem_root and treasury compliance accounts. + // Get code account, aptos_root and treasury compliance accounts. result.push(( account_config::CORE_CODE_ADDRESS, self.get_account_state_by_version(account_config::CORE_CODE_ADDRESS, version)? .ok_or_else(|| anyhow!("core_code_address doesn't exist"))?, )); - result.push((account_config::diem_root_address(), diem_root)); + result.push((account_config::aptos_root_address(), aptos_root)); result.push(( account_config::treasury_compliance_account_address(), self.get_account_state_by_version( diff --git a/diem-move/diem-validator-interface/src/storage_interface.rs b/aptos-move/aptos-validator-interface/src/storage_interface.rs similarity index 96% rename from diem-move/diem-validator-interface/src/storage_interface.rs rename to aptos-move/aptos-validator-interface/src/storage_interface.rs index 16514bbbf0942..a61cd6654a1f5 100644 --- a/diem-move/diem-validator-interface/src/storage_interface.rs +++ b/aptos-move/aptos-validator-interface/src/storage_interface.rs @@ -3,15 +3,15 @@ use crate::DiemValidatorInterface; use anyhow::{anyhow, Result}; -use diem_config::config::RocksdbConfig; -use diem_types::{ +use aptos_config::config::RocksdbConfig; +use aptos_types::{ account_address::AccountAddress, account_state::AccountState, contract_event::EventWithProof, event::EventKey, transaction::{Transaction, Version}, }; -use diemdb::DiemDB; +use aptosdb::DiemDB; use std::{convert::TryFrom, path::Path, sync::Arc}; use storage_interface::{DbReader, Order}; diff --git a/diem-move/diem-vm/Cargo.toml b/aptos-move/aptos-vm/Cargo.toml similarity index 70% rename from diem-move/diem-vm/Cargo.toml rename to aptos-move/aptos-vm/Cargo.toml index 59e37a9e4ae85..218eaf3d470b2 100644 --- a/diem-move/diem-vm/Cargo.toml +++ b/aptos-move/aptos-vm/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "diem-vm" +name = "aptos-vm" version = "0.1.0" authors = ["Diem Association "] description = "Diem VM runtime" @@ -18,31 +18,31 @@ mirai-annotations = "1.10.1" tracing = "0.1.16" bcs = "0.1.2" -diem-crypto = { path = "../../crates/diem-crypto" } -diem-logger = { path = "../../crates/diem-logger" } -diem-metrics = { path = "../../crates/diem-metrics" } -diem-state-view = { path = "../../storage/state-view" } -diem-types = { path = "../../types" } -diem-workspace-hack = { path = "../../crates/diem-workspace-hack" } +aptos-crypto = { path = "../../crates/aptos-crypto" } +aptos-logger = { path = "../../crates/aptos-logger" } +aptos-metrics = { path = "../../crates/aptos-metrics" } +aptos-state-view = { path = "../../storage/state-view" } +aptos-types = { path = "../../types" } +aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" } move-core-types = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } move-vm-runtime = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } move-vm-types = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } move-binary-format = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } move-bytecode-utils = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } move-stdlib = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } -diem-framework = { path = "../../diem-move/diem-framework" } +diem-framework = { path = "../../aptos-move/diem-framework" } serde_json = "1.0.64" serde = { version = "1.0.124", default-features = false } read-write-set-dynamic = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860"} mvhashmap = { path = "../mvhashmap" } -diem-parallel-executor = {path = "../parallel-executor" } +aptos-parallel-executor = {path = "../parallel-executor" } [dev-dependencies] proptest = "1.0.0" -diem-types = { path = "../../types", features = ["fuzzing"] } -diem-framework-releases = { path = "../../diem-move/diem-framework/DPN/releases" } +aptos-types = { path = "../../types", features = ["fuzzing"] } +diem-framework-releases = { path = "../../aptos-move/diem-framework/DPN/releases" } [features] default = [] diff --git a/diem-move/diem-vm/README.md b/aptos-move/aptos-vm/README.md similarity index 100% rename from diem-move/diem-vm/README.md rename to aptos-move/aptos-vm/README.md diff --git a/diem-move/diem-vm/src/access_path_cache.rs b/aptos-move/aptos-vm/src/access_path_cache.rs similarity index 97% rename from diem-move/diem-vm/src/access_path_cache.rs rename to aptos-move/aptos-vm/src/access_path_cache.rs index bdb82b15c2e84..08c7656e26d29 100644 --- a/diem-move/diem-vm/src/access_path_cache.rs +++ b/aptos-move/aptos-vm/src/access_path_cache.rs @@ -1,7 +1,7 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_types::access_path::AccessPath; +use aptos_types::access_path::AccessPath; use move_core_types::{ account_address::AccountAddress, language_storage::{ModuleId, StructTag}, diff --git a/diem-move/diem-vm/src/adapter_common.rs b/aptos-move/aptos-vm/src/adapter_common.rs similarity index 98% rename from diem-move/diem-vm/src/adapter_common.rs rename to aptos-move/aptos-vm/src/adapter_common.rs index a75c5f83b7492..cc468f03ee8e7 100644 --- a/diem-move/diem-vm/src/adapter_common.rs +++ b/aptos-move/aptos-vm/src/adapter_common.rs @@ -3,8 +3,8 @@ use crate::{counters::*, data_cache::StateViewCache}; use anyhow::Result; -use diem_state_view::StateView; -use diem_types::{ +use aptos_state_view::StateView; +use aptos_types::{ transaction::{SignatureCheckedTransaction, SignedTransaction, VMValidatorResult}, vm_status::{StatusCode, VMStatus}, }; @@ -12,8 +12,8 @@ use move_core_types::resolver::MoveResolver; use move_vm_runtime::session::Session; use crate::logging::AdapterLogSchema; -use diem_logger::prelude::*; -use diem_types::{ +use aptos_logger::prelude::*; +use aptos_types::{ access_path::AccessPath, block_metadata::BlockMetadata, transaction::{ @@ -26,7 +26,7 @@ use rayon::prelude::*; use std::collections::HashSet; /// This trait describes the VM adapter's interface. -/// TODO: bring more of the execution logic in diem_vm into this file. +/// TODO: bring more of the execution logic in aptos_vm into this file. pub trait VMAdapter { /// Creates a new Session backed by the given storage. /// TODO: this doesn't belong in this trait. We should be able to remove diff --git a/diem-move/diem-vm/src/diem_vm.rs b/aptos-move/aptos-vm/src/aptos_vm.rs similarity index 98% rename from diem-move/diem-vm/src/diem_vm.rs rename to aptos-move/aptos-vm/src/aptos_vm.rs index 33feadf2d415a..71af135e67653 100644 --- a/diem-move/diem-vm/src/diem_vm.rs +++ b/aptos-move/aptos-vm/src/aptos_vm.rs @@ -7,12 +7,12 @@ use crate::{ discard_error_output, discard_error_vm_status, validate_signature_checked_transaction, validate_signed_transaction, PreprocessedTransaction, VMAdapter, }, - counters::*, - data_cache::{RemoteStorage, StateViewCache}, - diem_vm_impl::{ + aptos_vm_impl::{ charge_global_write_gas_usage, convert_changeset_and_events, get_currency_info, get_gas_currency_code, get_transaction_output, DiemVMImpl, DiemVMInternals, }, + counters::*, + data_cache::{RemoteStorage, StateViewCache}, errors::expect_only_successful_execution, logging::AdapterLogSchema, script_to_script_function, @@ -21,9 +21,9 @@ use crate::{ VMExecutor, VMValidator, }; use anyhow::Result; -use diem_logger::prelude::*; -use diem_state_view::StateView; -use diem_types::{ +use aptos_logger::prelude::*; +use aptos_state_view::StateView; +use aptos_types::{ account_config, block_metadata::BlockMetadata, on_chain_config::{ @@ -215,7 +215,7 @@ impl DiemVM { TransactionPayload::Script(script) => { let diem_version = self.0.get_diem_version()?; let remapped_script = - if diem_version < diem_types::on_chain_config::DIEM_VERSION_2 { + if diem_version < aptos_types::on_chain_config::DIEM_VERSION_2 { None } else { script_to_script_function::remapping(script.code()) @@ -429,7 +429,7 @@ impl DiemVM { None => vec![*execute_as], Some(sender) => vec![sender, *execute_as], }; - let remapped_script = if diem_version < diem_types::on_chain_config::DIEM_VERSION_2 + let remapped_script = if diem_version < aptos_types::on_chain_config::DIEM_VERSION_2 { None } else { @@ -598,7 +598,7 @@ impl DiemVM { | TransactionPayload::Script(_) | TransactionPayload::ScriptFunction(_) => { log_context.alert(); - error!(*log_context, "[diem_vm] UNREACHABLE"); + error!(*log_context, "[aptos_vm] UNREACHABLE"); return Ok(discard_error_vm_status(VMStatus::Error( StatusCode::UNREACHABLE, ))); @@ -861,7 +861,7 @@ impl VMAdapter for DiemVM { } fn should_restart_execution(vm_output: &TransactionOutput) -> bool { - let new_epoch_event_key = diem_types::on_chain_config::new_epoch_event_key(); + let new_epoch_event_key = aptos_types::on_chain_config::new_epoch_event_key(); vm_output .events() .iter() diff --git a/diem-move/diem-vm/src/diem_vm_impl.rs b/aptos-move/aptos-vm/src/aptos_vm_impl.rs similarity index 98% rename from diem-move/diem-vm/src/diem_vm_impl.rs rename to aptos-move/aptos-vm/src/aptos_vm_impl.rs index 84a9222bbfadc..6bafa81e22dd2 100644 --- a/diem-move/diem-vm/src/diem_vm_impl.rs +++ b/aptos-move/aptos-vm/src/aptos_vm_impl.rs @@ -7,13 +7,13 @@ use crate::{ data_cache::RemoteStorage, errors::{convert_epilogue_error, convert_prologue_error, expect_only_successful_execution}, logging::AdapterLogSchema, - natives::diem_natives, + natives::aptos_natives, transaction_metadata::TransactionMetadata, }; -use diem_crypto::HashValue; -use diem_logger::prelude::*; -use diem_state_view::StateView; -use diem_types::{ +use aptos_crypto::HashValue; +use aptos_logger::prelude::*; +use aptos_state_view::StateView; +use aptos_types::{ account_config, account_config::{ChainSpecificAccountInfo, CurrencyInfoResource}, contract_event::ContractEvent, @@ -54,7 +54,7 @@ pub struct DiemVMImpl { impl DiemVMImpl { #[allow(clippy::new_without_default)] pub fn new(state: &S) -> Self { - let inner = MoveVM::new(diem_natives()) + let inner = MoveVM::new(aptos_natives()) .expect("should be able to create Move VM; check if there are duplicated natives"); let mut vm = Self { move_vm: Arc::new(inner), @@ -73,7 +73,7 @@ impl DiemVMImpl { on_chain_config: VMConfig, publishing_option: VMPublishingOption, ) -> Self { - let inner = MoveVM::new(diem_natives()) + let inner = MoveVM::new(aptos_natives()) .expect("should be able to create Move VM; check if there are duplicated natives"); Self { move_vm: Arc::new(inner), @@ -121,7 +121,7 @@ impl DiemVMImpl { ) -> Option { match remote_cache .get_resource( - &account_config::diem_root_address(), + &account_config::aptos_root_address(), &account_config::ChainSpecificAccountInfo::struct_tag(), ) .ok()? @@ -656,7 +656,7 @@ pub(crate) fn get_currency_info( remote_cache: &S, ) -> Result { if let Ok(Some(blob)) = remote_cache.get_resource( - &account_config::diem_root_address(), + &account_config::aptos_root_address(), &CurrencyInfoResource::struct_tag_for(currency_code.to_owned()), ) { let x = bcs::from_bytes::(&blob) diff --git a/diem-move/diem-vm/src/counters.rs b/aptos-move/aptos-vm/src/counters.rs similarity index 77% rename from diem-move/diem-vm/src/counters.rs rename to aptos-move/aptos-vm/src/counters.rs index 688256ae372c9..9ed1b919ae9f9 100644 --- a/diem-move/diem-vm/src/counters.rs +++ b/aptos-move/aptos-vm/src/counters.rs @@ -1,7 +1,7 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_metrics::{ +use aptos_metrics::{ register_histogram, register_int_counter, register_int_counter_vec, Histogram, IntCounter, IntCounterVec, }; @@ -11,7 +11,7 @@ use once_cell::sync::Lazy; /// distinguish success or failure results. pub static TRANSACTIONS_VALIDATED: Lazy = Lazy::new(|| { register_int_counter_vec!( - "diem_vm_transactions_validated", + "aptos_vm_transactions_validated", "Number of transactions validated", &["status"] ) @@ -22,7 +22,7 @@ pub static TRANSACTIONS_VALIDATED: Lazy = Lazy::new(|| { /// distinguish completed vs. discarded transactions. pub static USER_TRANSACTIONS_EXECUTED: Lazy = Lazy::new(|| { register_int_counter_vec!( - "diem_vm_user_transactions_executed", + "aptos_vm_user_transactions_executed", "Number of user transactions executed", &["status"] ) @@ -32,7 +32,7 @@ pub static USER_TRANSACTIONS_EXECUTED: Lazy = Lazy::new(|| { /// Count the number of system transactions executed. pub static SYSTEM_TRANSACTIONS_EXECUTED: Lazy = Lazy::new(|| { register_int_counter!( - "diem_vm_system_transactions_executed", + "aptos_vm_system_transactions_executed", "Number of system transactions executed" ) .unwrap() @@ -40,7 +40,7 @@ pub static SYSTEM_TRANSACTIONS_EXECUTED: Lazy = Lazy::new(|| { pub static BLOCK_TRANSACTION_COUNT: Lazy = Lazy::new(|| { register_histogram!( - "diem_vm_num_txns_per_block", + "aptos_vm_num_txns_per_block", "Number of transactions per block" ) .unwrap() @@ -48,7 +48,7 @@ pub static BLOCK_TRANSACTION_COUNT: Lazy = Lazy::new(|| { pub static TXN_TOTAL_SECONDS: Lazy = Lazy::new(|| { register_histogram!( - "diem_vm_txn_total_seconds", + "aptos_vm_txn_total_seconds", "Execution time per user transaction" ) .unwrap() @@ -56,17 +56,18 @@ pub static TXN_TOTAL_SECONDS: Lazy = Lazy::new(|| { pub static TXN_VALIDATION_SECONDS: Lazy = Lazy::new(|| { register_histogram!( - "diem_vm_txn_validation_seconds", + "aptos_vm_txn_validation_seconds", "Validation time per user transaction" ) .unwrap() }); -pub static TXN_GAS_USAGE: Lazy = - Lazy::new(|| register_histogram!("diem_vm_txn_gas_usage", "Gas used per transaction").unwrap()); +pub static TXN_GAS_USAGE: Lazy = Lazy::new(|| { + register_histogram!("aptos_vm_txn_gas_usage", "Gas used per transaction").unwrap() +}); /// Count the number of critical errors. This is not intended for display /// on a dashboard but rather for triggering alerts. pub static CRITICAL_ERRORS: Lazy = Lazy::new(|| { - register_int_counter!("diem_vm_critical_errors", "Number of critical errors").unwrap() + register_int_counter!("aptos_vm_critical_errors", "Number of critical errors").unwrap() }); diff --git a/diem-move/diem-vm/src/data_cache.rs b/aptos-move/aptos-vm/src/data_cache.rs similarity index 98% rename from diem-move/diem-vm/src/data_cache.rs rename to aptos-move/aptos-vm/src/data_cache.rs index d95a782f3b410..2957391164a7d 100644 --- a/diem-move/diem-vm/src/data_cache.rs +++ b/aptos-move/aptos-vm/src/data_cache.rs @@ -5,9 +5,9 @@ use crate::{counters::CRITICAL_ERRORS, create_access_path, logging::AdapterLogSchema}; #[allow(unused_imports)] use anyhow::format_err; -use diem_logger::prelude::*; -use diem_state_view::{StateView, StateViewId}; -use diem_types::{ +use aptos_logger::prelude::*; +use aptos_state_view::{StateView, StateViewId}; +use aptos_types::{ access_path::AccessPath, on_chain_config::ConfigStorage, vm_status::StatusCode, diff --git a/diem-move/diem-vm/src/errors.rs b/aptos-move/aptos-vm/src/errors.rs similarity index 91% rename from diem-move/diem-vm/src/errors.rs rename to aptos-move/aptos-vm/src/errors.rs index b865a742dfb1f..6eb7b202a62d8 100644 --- a/diem-move/diem-vm/src/errors.rs +++ b/aptos-move/aptos-vm/src/errors.rs @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 use crate::logging::AdapterLogSchema; -use diem_logger::prelude::*; -use diem_types::account_config::ChainSpecificAccountInfo; +use aptos_logger::prelude::*; +use aptos_types::account_config::ChainSpecificAccountInfo; use move_binary_format::errors::VMError; use move_core_types::vm_status::{StatusCode, VMStatus}; @@ -56,7 +56,7 @@ pub fn convert_prologue_error( log_context.alert(); error!( *log_context, - "[diem_vm] Unexpected prologue Move abort: {:?}::{:?} (Category: {:?} Reason: {:?})", + "[aptos_vm] Unexpected prologue Move abort: {:?}::{:?} (Category: {:?} Reason: {:?})", location, code, category, reason, ); VMStatus::Error(StatusCode::UNEXPECTED_ERROR_FROM_KNOWN_MOVE_FUNCTION) @@ -97,7 +97,7 @@ pub fn convert_prologue_error( log_context.alert(); error!( *log_context, - "[diem_vm] Unexpected prologue Move abort: {:?}::{:?} (Category: {:?} Reason: {:?})", + "[aptos_vm] Unexpected prologue Move abort: {:?}::{:?} (Category: {:?} Reason: {:?})", location, code, category, reason, ); return Err(VMStatus::Error( @@ -111,7 +111,7 @@ pub fn convert_prologue_error( log_context.alert(); error!( *log_context, - "[diem_vm] Unexpected prologue error: {:?}", status + "[aptos_vm] Unexpected prologue error: {:?}", status ); VMStatus::Error(StatusCode::UNEXPECTED_ERROR_FROM_KNOWN_MOVE_FUNCTION) } @@ -136,7 +136,7 @@ pub fn convert_epilogue_error( log_context.alert(); error!( *log_context, - "[diem_vm] Unexpected success epilogue Move abort: {:?}::{:?} (Category: {:?} Reason: {:?})", + "[aptos_vm] Unexpected success epilogue Move abort: {:?}::{:?} (Category: {:?} Reason: {:?})", location, code, category, reason, ); VMStatus::Error(StatusCode::UNEXPECTED_ERROR_FROM_KNOWN_MOVE_FUNCTION) @@ -148,7 +148,7 @@ pub fn convert_epilogue_error( log_context.alert(); error!( *log_context, - "[diem_vm] Unexpected success epilogue Move abort: {:?}::{:?} (Category: {:?} Reason: {:?})", + "[aptos_vm] Unexpected success epilogue Move abort: {:?}::{:?} (Category: {:?} Reason: {:?})", location, code, category, reason, ); VMStatus::Error(StatusCode::UNEXPECTED_ERROR_FROM_KNOWN_MOVE_FUNCTION) @@ -159,7 +159,7 @@ pub fn convert_epilogue_error( log_context.alert(); error!( *log_context, - "[diem_vm] Unexpected success epilogue error: {:?}", status, + "[aptos_vm] Unexpected success epilogue error: {:?}", status, ); VMStatus::Error(StatusCode::UNEXPECTED_ERROR_FROM_KNOWN_MOVE_FUNCTION) } @@ -182,7 +182,7 @@ pub fn expect_only_successful_execution( log_context.alert(); error!( *log_context, - "[diem_vm] Unexpected error from known Move function, '{}'. Error: {:?}", + "[aptos_vm] Unexpected error from known Move function, '{}'. Error: {:?}", function_name, status, ); diff --git a/diem-move/diem-vm/src/foreign_contracts.rs b/aptos-move/aptos-vm/src/foreign_contracts.rs similarity index 100% rename from diem-move/diem-vm/src/foreign_contracts.rs rename to aptos-move/aptos-vm/src/foreign_contracts.rs diff --git a/diem-move/diem-vm/src/lib.rs b/aptos-move/aptos-vm/src/lib.rs similarity index 98% rename from diem-move/diem-vm/src/lib.rs rename to aptos-move/aptos-vm/src/lib.rs index 56bca590ad1d6..e0ee41a38334a 100644 --- a/diem-move/diem-vm/src/lib.rs +++ b/aptos-move/aptos-vm/src/lib.rs @@ -111,8 +111,8 @@ pub mod data_cache; pub mod foreign_contracts; mod adapter_common; -pub mod diem_vm; -mod diem_vm_impl; +pub mod aptos_vm; +mod aptos_vm_impl; mod errors; pub mod logging; pub mod natives; @@ -125,10 +125,10 @@ pub mod transaction_metadata; #[cfg(test)] mod unit_tests; -pub use crate::{diem_vm::DiemVM, diem_vm_impl::convert_changeset_and_events}; +pub use crate::{aptos_vm::DiemVM, aptos_vm_impl::convert_changeset_and_events}; -use diem_state_view::StateView; -use diem_types::{ +use aptos_state_view::StateView; +use aptos_types::{ access_path::AccessPath, transaction::{SignedTransaction, Transaction, TransactionOutput, VMValidatorResult}, vm_status::VMStatus, diff --git a/diem-move/diem-vm/src/logging.rs b/aptos-move/aptos-vm/src/logging.rs similarity index 94% rename from diem-move/diem-vm/src/logging.rs rename to aptos-move/aptos-vm/src/logging.rs index 6bdafadb2a875..9694f443703e6 100644 --- a/diem-move/diem-vm/src/logging.rs +++ b/aptos-move/aptos-vm/src/logging.rs @@ -2,10 +2,10 @@ // SPDX-License-Identifier: Apache-2.0 use crate::counters::CRITICAL_ERRORS; -use diem_crypto::HashValue; -use diem_logger::Schema; -use diem_state_view::StateViewId; -use diem_types::transaction::Version; +use aptos_crypto::HashValue; +use aptos_logger::Schema; +use aptos_state_view::StateViewId; +use aptos_types::transaction::Version; use serde::Serialize; #[derive(Schema, Clone)] diff --git a/diem-move/diem-vm/src/natives.rs b/aptos-move/aptos-vm/src/natives.rs similarity index 75% rename from diem-move/diem-vm/src/natives.rs rename to aptos-move/aptos-vm/src/natives.rs index 36c5a1801c72c..0189a0e5771fb 100644 --- a/diem-move/diem-vm/src/natives.rs +++ b/aptos-move/aptos-vm/src/natives.rs @@ -1,10 +1,10 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_types::account_config::CORE_CODE_ADDRESS; +use aptos_types::account_config::CORE_CODE_ADDRESS; use move_vm_runtime::native_functions::NativeFunctionTable; -pub fn diem_natives() -> NativeFunctionTable { +pub fn aptos_natives() -> NativeFunctionTable { move_stdlib::natives::all_natives(CORE_CODE_ADDRESS) .into_iter() .chain(diem_framework::natives::all_natives(CORE_CODE_ADDRESS)) diff --git a/diem-move/diem-vm/src/parallel_executor/mod.rs b/aptos-move/aptos-vm/src/parallel_executor/mod.rs similarity index 97% rename from diem-move/diem-vm/src/parallel_executor/mod.rs rename to aptos-move/aptos-vm/src/parallel_executor/mod.rs index 9317fd1cb04bf..9191c979b241b 100644 --- a/diem-move/diem-vm/src/parallel_executor/mod.rs +++ b/aptos-move/aptos-vm/src/parallel_executor/mod.rs @@ -7,19 +7,19 @@ mod vm_wrapper; use crate::{ adapter_common::{preprocess_transaction, PreprocessedTransaction}, + aptos_vm::DiemVM, data_cache::RemoteStorage, - diem_vm::DiemVM, parallel_executor::{ read_write_set_analyzer::ReadWriteSetAnalysisWrapper, vm_wrapper::DiemVMWrapper, }, }; -use diem_parallel_executor::{ +use aptos_parallel_executor::{ errors::Error, executor::ParallelTransactionExecutor, task::{Transaction as PTransaction, TransactionOutput as PTransactionOutput}, }; -use diem_state_view::StateView; -use diem_types::{ +use aptos_state_view::StateView; +use aptos_types::{ access_path::AccessPath, transaction::{Transaction, TransactionOutput, TransactionStatus}, write_set::{WriteOp, WriteSet}, diff --git a/diem-move/diem-vm/src/parallel_executor/read_write_set_analyzer.rs b/aptos-move/aptos-vm/src/parallel_executor/read_write_set_analyzer.rs similarity index 92% rename from diem-move/diem-vm/src/parallel_executor/read_write_set_analyzer.rs rename to aptos-move/aptos-vm/src/parallel_executor/read_write_set_analyzer.rs index 5544a278827cf..dff1e35992a18 100644 --- a/diem-move/diem-vm/src/parallel_executor/read_write_set_analyzer.rs +++ b/aptos-move/aptos-vm/src/parallel_executor/read_write_set_analyzer.rs @@ -5,8 +5,8 @@ use crate::{ adapter_common::PreprocessedTransaction, read_write_set_analysis::ReadWriteSetAnalysis, }; use anyhow::Result; -use diem_parallel_executor::task::{Accesses, ReadWriteSetInferencer}; -use diem_types::access_path::AccessPath; +use aptos_parallel_executor::task::{Accesses, ReadWriteSetInferencer}; +use aptos_types::access_path::AccessPath; use move_core_types::resolver::MoveResolver; use read_write_set_dynamic::NormalizedReadWriteSetAnalysis; diff --git a/diem-move/diem-vm/src/parallel_executor/storage_wrapper.rs b/aptos-move/aptos-vm/src/parallel_executor/storage_wrapper.rs similarity index 92% rename from diem-move/diem-vm/src/parallel_executor/storage_wrapper.rs rename to aptos-move/aptos-vm/src/parallel_executor/storage_wrapper.rs index 9fb5809f2f8a3..701370b111781 100644 --- a/diem-move/diem-vm/src/parallel_executor/storage_wrapper.rs +++ b/aptos-move/aptos-vm/src/parallel_executor/storage_wrapper.rs @@ -2,9 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 use crate::data_cache::RemoteStorage; -use diem_parallel_executor::executor::MVHashMapView; -use diem_state_view::{StateView, StateViewId}; -use diem_types::{access_path::AccessPath, write_set::WriteOp}; +use aptos_parallel_executor::executor::MVHashMapView; +use aptos_state_view::{StateView, StateViewId}; +use aptos_types::{access_path::AccessPath, write_set::WriteOp}; use move_binary_format::errors::VMError; use move_core_types::{ account_address::AccountAddress, diff --git a/diem-move/diem-vm/src/parallel_executor/vm_wrapper.rs b/aptos-move/aptos-vm/src/parallel_executor/vm_wrapper.rs similarity index 95% rename from diem-move/diem-vm/src/parallel_executor/vm_wrapper.rs rename to aptos-move/aptos-vm/src/parallel_executor/vm_wrapper.rs index ea1c916972401..171884d81d0f5 100644 --- a/diem-move/diem-vm/src/parallel_executor/vm_wrapper.rs +++ b/aptos-move/aptos-vm/src/parallel_executor/vm_wrapper.rs @@ -3,18 +3,18 @@ use crate::{ adapter_common::{PreprocessedTransaction, VMAdapter}, + aptos_vm::DiemVM, data_cache::RemoteStorage, - diem_vm::DiemVM, logging::AdapterLogSchema, parallel_executor::{storage_wrapper::VersionedView, DiemTransactionOutput}, }; -use diem_logger::prelude::*; -use diem_parallel_executor::{ +use aptos_logger::prelude::*; +use aptos_parallel_executor::{ executor::MVHashMapView, task::{ExecutionStatus, ExecutorTask}, }; -use diem_state_view::StateView; -use diem_types::{ +use aptos_state_view::StateView; +use aptos_types::{ access_path::AccessPath, account_config::DIEM_ACCOUNT_MODULE, write_set::WriteOp, }; use move_core_types::vm_status::VMStatus; diff --git a/diem-move/diem-vm/src/read_write_set_analysis.rs b/aptos-move/aptos-vm/src/read_write_set_analysis.rs similarity index 99% rename from diem-move/diem-vm/src/read_write_set_analysis.rs rename to aptos-move/aptos-vm/src/read_write_set_analysis.rs index 61794e005339d..67b74cdeddc17 100644 --- a/diem-move/diem-vm/src/read_write_set_analysis.rs +++ b/aptos-move/aptos-vm/src/read_write_set_analysis.rs @@ -9,7 +9,7 @@ use crate::{ }, }; use anyhow::{anyhow, bail, Result}; -use diem_types::{ +use aptos_types::{ account_config, transaction::{SignedTransaction, TransactionPayload}, }; diff --git a/diem-move/diem-vm/src/script_to_script_function.rs b/aptos-move/aptos-vm/src/script_to_script_function.rs similarity index 99% rename from diem-move/diem-vm/src/script_to_script_function.rs rename to aptos-move/aptos-vm/src/script_to_script_function.rs index 02cbcf89e9827..1674160278f4e 100644 --- a/diem-move/diem-vm/src/script_to_script_function.rs +++ b/aptos-move/aptos-vm/src/script_to_script_function.rs @@ -4,7 +4,7 @@ //! Module containing remapping information between script hashes and their remapped script //! function -use diem_types::account_config::CORE_CODE_ADDRESS; +use aptos_types::account_config::CORE_CODE_ADDRESS; use move_core_types::{ident_str, identifier::IdentStr, language_storage::ModuleId}; use once_cell::sync::Lazy; diff --git a/diem-move/diem-vm/src/system_module_names.rs b/aptos-move/aptos-vm/src/system_module_names.rs similarity index 97% rename from diem-move/diem-vm/src/system_module_names.rs rename to aptos-move/aptos-vm/src/system_module_names.rs index eceb998471265..3a52171e0e235 100644 --- a/diem-move/diem-vm/src/system_module_names.rs +++ b/aptos-move/aptos-vm/src/system_module_names.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 //! Names of modules, functions, and types used by Diem System. -use diem_types::account_config; +use aptos_types::account_config; use move_core_types::{ident_str, identifier::IdentStr, language_storage::ModuleId}; use once_cell::sync::Lazy; diff --git a/diem-move/diem-vm/src/transaction_metadata.rs b/aptos-move/aptos-vm/src/transaction_metadata.rs similarity index 97% rename from diem-move/diem-vm/src/transaction_metadata.rs rename to aptos-move/aptos-vm/src/transaction_metadata.rs index 619fe6b3069c8..2b693726b9f20 100644 --- a/diem-move/diem-vm/src/transaction_metadata.rs +++ b/aptos-move/aptos-vm/src/transaction_metadata.rs @@ -1,8 +1,8 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_crypto::{ed25519::Ed25519PrivateKey, HashValue, PrivateKey}; -use diem_types::{ +use aptos_crypto::{ed25519::Ed25519PrivateKey, HashValue, PrivateKey}; +use aptos_types::{ account_address::AccountAddress, chain_id::ChainId, transaction::{ diff --git a/diem-move/diem-vm/src/unit_tests/mod.rs b/aptos-move/aptos-vm/src/unit_tests/mod.rs similarity index 100% rename from diem-move/diem-vm/src/unit_tests/mod.rs rename to aptos-move/aptos-vm/src/unit_tests/mod.rs diff --git a/diem-move/diem-vm/src/unit_tests/script_to_script_function_tests.rs b/aptos-move/aptos-vm/src/unit_tests/script_to_script_function_tests.rs similarity index 100% rename from diem-move/diem-vm/src/unit_tests/script_to_script_function_tests.rs rename to aptos-move/aptos-vm/src/unit_tests/script_to_script_function_tests.rs diff --git a/diem-move/df-cli/Cargo.toml b/aptos-move/df-cli/Cargo.toml similarity index 79% rename from diem-move/df-cli/Cargo.toml rename to aptos-move/df-cli/Cargo.toml index 74f8948914903..927bb4f3428d6 100644 --- a/diem-move/df-cli/Cargo.toml +++ b/aptos-move/df-cli/Cargo.toml @@ -14,11 +14,11 @@ anyhow = "1.0.52" bcs = "0.1.2" structopt = "0.3.21" -diem-workspace-hack = { path = "../../crates/diem-workspace-hack" } +aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" } move-core-types = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } move-cli = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } -diem-vm = { path = "../diem-vm" } -diem-framework-releases = { path = "../../diem-move/diem-framework/DPN/releases" } +aptos-vm = { path = "../aptos-vm" } +diem-framework-releases = { path = "../../aptos-move/diem-framework/DPN/releases" } [dev-dependencies] datatest-stable = "0.1.1" diff --git a/diem-move/df-cli/src/lib.rs b/aptos-move/df-cli/src/lib.rs similarity index 100% rename from diem-move/df-cli/src/lib.rs rename to aptos-move/df-cli/src/lib.rs diff --git a/diem-move/df-cli/src/main.rs b/aptos-move/df-cli/src/main.rs similarity index 94% rename from diem-move/df-cli/src/main.rs rename to aptos-move/df-cli/src/main.rs index e0711bf1116e8..6747edd9789b8 100644 --- a/diem-move/df-cli/src/main.rs +++ b/aptos-move/df-cli/src/main.rs @@ -28,7 +28,7 @@ fn main() -> Result<()> { let args = DfCli::from_args(); match &args.cmd { DfCommands::Command(cmd) => move_cli::run_cli( - diem_vm::natives::diem_natives(), + aptos_vm::natives::aptos_natives(), &error_descriptions, &args.move_args, cmd, diff --git a/diem-move/df-cli/tests/cli_testsuite.rs b/aptos-move/df-cli/tests/cli_testsuite.rs similarity index 100% rename from diem-move/df-cli/tests/cli_testsuite.rs rename to aptos-move/df-cli/tests/cli_testsuite.rs diff --git a/diem-move/df-cli/tests/testsuite/diem_read_write_set_smoke/Move.toml b/aptos-move/df-cli/tests/testsuite/aptos_read_write_set_smoke/Move.toml similarity index 100% rename from diem-move/df-cli/tests/testsuite/diem_read_write_set_smoke/Move.toml rename to aptos-move/df-cli/tests/testsuite/aptos_read_write_set_smoke/Move.toml diff --git a/diem-move/df-cli/tests/testsuite/diem_read_write_set_smoke/args.exp b/aptos-move/df-cli/tests/testsuite/aptos_read_write_set_smoke/args.exp similarity index 100% rename from diem-move/df-cli/tests/testsuite/diem_read_write_set_smoke/args.exp rename to aptos-move/df-cli/tests/testsuite/aptos_read_write_set_smoke/args.exp diff --git a/diem-move/df-cli/tests/testsuite/diem_read_write_set_smoke/args.txt b/aptos-move/df-cli/tests/testsuite/aptos_read_write_set_smoke/args.txt similarity index 100% rename from diem-move/df-cli/tests/testsuite/diem_read_write_set_smoke/args.txt rename to aptos-move/df-cli/tests/testsuite/aptos_read_write_set_smoke/args.txt diff --git a/diem-move/df-cli/tests/testsuite/diem_read_write_set_smoke/sources/Dummy.move b/aptos-move/df-cli/tests/testsuite/aptos_read_write_set_smoke/sources/Dummy.move similarity index 100% rename from diem-move/df-cli/tests/testsuite/diem_read_write_set_smoke/sources/Dummy.move rename to aptos-move/df-cli/tests/testsuite/aptos_read_write_set_smoke/sources/Dummy.move diff --git a/diem-move/df-cli/tests/testsuite/diem_smoke/Move.toml b/aptos-move/df-cli/tests/testsuite/aptos_smoke/Move.toml similarity index 100% rename from diem-move/df-cli/tests/testsuite/diem_smoke/Move.toml rename to aptos-move/df-cli/tests/testsuite/aptos_smoke/Move.toml diff --git a/diem-move/df-cli/tests/testsuite/diem_smoke/args.exp b/aptos-move/df-cli/tests/testsuite/aptos_smoke/args.exp similarity index 100% rename from diem-move/df-cli/tests/testsuite/diem_smoke/args.exp rename to aptos-move/df-cli/tests/testsuite/aptos_smoke/args.exp diff --git a/diem-move/df-cli/tests/testsuite/diem_smoke/args.txt b/aptos-move/df-cli/tests/testsuite/aptos_smoke/args.txt similarity index 100% rename from diem-move/df-cli/tests/testsuite/diem_smoke/args.txt rename to aptos-move/df-cli/tests/testsuite/aptos_smoke/args.txt diff --git a/diem-move/df-cli/tests/testsuite/diem_smoke/sources/create_child_vasp_account.move b/aptos-move/df-cli/tests/testsuite/aptos_smoke/sources/create_child_vasp_account.move similarity index 100% rename from diem-move/df-cli/tests/testsuite/diem_smoke/sources/create_child_vasp_account.move rename to aptos-move/df-cli/tests/testsuite/aptos_smoke/sources/create_child_vasp_account.move diff --git a/diem-move/df-cli/tests/testsuite/diem_smoke/sources/create_designated_dealer.move b/aptos-move/df-cli/tests/testsuite/aptos_smoke/sources/create_designated_dealer.move similarity index 100% rename from diem-move/df-cli/tests/testsuite/diem_smoke/sources/create_designated_dealer.move rename to aptos-move/df-cli/tests/testsuite/aptos_smoke/sources/create_designated_dealer.move diff --git a/diem-move/df-cli/tests/testsuite/diem_smoke/sources/create_parent_vasp_account.move b/aptos-move/df-cli/tests/testsuite/aptos_smoke/sources/create_parent_vasp_account.move similarity index 100% rename from diem-move/df-cli/tests/testsuite/diem_smoke/sources/create_parent_vasp_account.move rename to aptos-move/df-cli/tests/testsuite/aptos_smoke/sources/create_parent_vasp_account.move diff --git a/diem-move/df-cli/tests/testsuite/diem_smoke/sources/genesis.move b/aptos-move/df-cli/tests/testsuite/aptos_smoke/sources/genesis.move similarity index 100% rename from diem-move/df-cli/tests/testsuite/diem_smoke/sources/genesis.move rename to aptos-move/df-cli/tests/testsuite/aptos_smoke/sources/genesis.move diff --git a/diem-move/df-cli/tests/testsuite/diem_smoke/sources/peer_to_peer_with_metadata.move b/aptos-move/df-cli/tests/testsuite/aptos_smoke/sources/peer_to_peer_with_metadata.move similarity index 98% rename from diem-move/df-cli/tests/testsuite/diem_smoke/sources/peer_to_peer_with_metadata.move rename to aptos-move/df-cli/tests/testsuite/aptos_smoke/sources/peer_to_peer_with_metadata.move index ee1ff07f74763..9cc14c060f050 100644 --- a/diem-move/df-cli/tests/testsuite/diem_smoke/sources/peer_to_peer_with_metadata.move +++ b/aptos-move/df-cli/tests/testsuite/aptos_smoke/sources/peer_to_peer_with_metadata.move @@ -18,7 +18,7 @@ use DiemFramework::DiemAccount; /// `DualAttestation::get_cur_microdiem_limit` XDX and `payer` and `payee` are distinct VASPs. /// However, a transaction sender can opt in to dual attestation even when it is not required /// (e.g., a DesignatedDealer -> VASP payment) by providing a non-empty `metadata_signature`. -/// Standardized `metadata` BCS format can be found in `diem_types::transaction::metadata::Metadata`. +/// Standardized `metadata` BCS format can be found in `aptos_types::transaction::metadata::Metadata`. /// /// ## Events /// Successful execution of this script emits two events: diff --git a/diem-move/df-cli/tests/testsuite/diem_smoke/sources/tiered_mint.move b/aptos-move/df-cli/tests/testsuite/aptos_smoke/sources/tiered_mint.move similarity index 100% rename from diem-move/df-cli/tests/testsuite/diem_smoke/sources/tiered_mint.move rename to aptos-move/df-cli/tests/testsuite/aptos_smoke/sources/tiered_mint.move diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/Move.toml b/aptos-move/df-cli/tests/testsuite/compare_smoke/Move.toml similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/Move.toml rename to aptos-move/df-cli/tests/testsuite/compare_smoke/Move.toml diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/args.exp b/aptos-move/df-cli/tests/testsuite/compare_smoke/args.exp similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/args.exp rename to aptos-move/df-cli/tests/testsuite/compare_smoke/args.exp diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/args.txt b/aptos-move/df-cli/tests/testsuite/compare_smoke/args.txt similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/args.txt rename to aptos-move/df-cli/tests/testsuite/compare_smoke/args.txt diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/scripts/set_script.move b/aptos-move/df-cli/tests/testsuite/compare_smoke/scripts/set_script.move similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/scripts/set_script.move rename to aptos-move/df-cli/tests/testsuite/compare_smoke/scripts/set_script.move diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/sources/NameService.move b/aptos-move/df-cli/tests/testsuite/compare_smoke/sources/NameService.move similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/sources/NameService.move rename to aptos-move/df-cli/tests/testsuite/compare_smoke/sources/NameService.move diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/sources/NonFungibleToken.move b/aptos-move/df-cli/tests/testsuite/compare_smoke/sources/NonFungibleToken.move similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/sources/NonFungibleToken.move rename to aptos-move/df-cli/tests/testsuite/compare_smoke/sources/NonFungibleToken.move diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/sources/Set.move b/aptos-move/df-cli/tests/testsuite/compare_smoke/sources/Set.move similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/sources/Set.move rename to aptos-move/df-cli/tests/testsuite/compare_smoke/sources/Set.move diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/sources/SimpleSortedLinkedList.move b/aptos-move/df-cli/tests/testsuite/compare_smoke/sources/SimpleSortedLinkedList.move similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/sources/SimpleSortedLinkedList.move rename to aptos-move/df-cli/tests/testsuite/compare_smoke/sources/SimpleSortedLinkedList.move diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/sources/SortedLinkedList.move b/aptos-move/df-cli/tests/testsuite/compare_smoke/sources/SortedLinkedList.move similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/sources/SortedLinkedList.move rename to aptos-move/df-cli/tests/testsuite/compare_smoke/sources/SortedLinkedList.move diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/ACL.mv b/aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/ACL.mv similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/ACL.mv rename to aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/ACL.mv diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/ASCII.mv b/aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/ASCII.mv similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/ASCII.mv rename to aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/ASCII.mv diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/AccountAdministrationScripts.mv b/aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/AccountAdministrationScripts.mv similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/AccountAdministrationScripts.mv rename to aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/AccountAdministrationScripts.mv diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/AccountCreationScripts.mv b/aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/AccountCreationScripts.mv similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/AccountCreationScripts.mv rename to aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/AccountCreationScripts.mv diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/AccountFreezing.mv b/aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/AccountFreezing.mv similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/AccountFreezing.mv rename to aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/AccountFreezing.mv diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/AccountLimits.mv b/aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/AccountLimits.mv similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/AccountLimits.mv rename to aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/AccountLimits.mv diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Diem.mv b/aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Aptos.mv similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Diem.mv rename to aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Aptos.mv diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/DiemAccount.mv b/aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/AptosAccount.mv similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/DiemAccount.mv rename to aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/AptosAccount.mv diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/DiemBlock.mv b/aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/AptosBlock.mv similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/DiemBlock.mv rename to aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/AptosBlock.mv diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/DiemConfig.mv b/aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/AptosConfig.mv similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/DiemConfig.mv rename to aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/AptosConfig.mv diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/DiemConsensusConfig.mv b/aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/AptosConsensusConfig.mv similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/DiemConsensusConfig.mv rename to aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/AptosConsensusConfig.mv diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/DiemId.mv b/aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/AptosId.mv similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/DiemId.mv rename to aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/AptosId.mv diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/DiemSystem.mv b/aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/AptosSystem.mv similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/DiemSystem.mv rename to aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/AptosSystem.mv diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/DiemTimestamp.mv b/aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/AptosTimestamp.mv similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/DiemTimestamp.mv rename to aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/AptosTimestamp.mv diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/DiemTransactionPublishingOption.mv b/aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/AptosTransactionPublishingOption.mv similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/DiemTransactionPublishingOption.mv rename to aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/AptosTransactionPublishingOption.mv diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/DiemVMConfig.mv b/aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/AptosVMConfig.mv similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/DiemVMConfig.mv rename to aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/AptosVMConfig.mv diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/DiemVersion.mv b/aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/AptosVersion.mv similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/DiemVersion.mv rename to aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/AptosVersion.mv diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Authenticator.mv b/aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Authenticator.mv similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Authenticator.mv rename to aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Authenticator.mv diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/BCS.mv b/aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/BCS.mv similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/BCS.mv rename to aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/BCS.mv diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/BitVector.mv b/aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/BitVector.mv similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/BitVector.mv rename to aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/BitVector.mv diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/CRSN.mv b/aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/CRSN.mv similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/CRSN.mv rename to aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/CRSN.mv diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Capability.mv b/aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Capability.mv similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Capability.mv rename to aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Capability.mv diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/ChainId.mv b/aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/ChainId.mv similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/ChainId.mv rename to aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/ChainId.mv diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Compare.mv b/aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Compare.mv similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Compare.mv rename to aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Compare.mv diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/CoreAddresses.mv b/aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/CoreAddresses.mv similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/CoreAddresses.mv rename to aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/CoreAddresses.mv diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Debug.mv b/aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Debug.mv similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Debug.mv rename to aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Debug.mv diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/DesignatedDealer.mv b/aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/DesignatedDealer.mv similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/DesignatedDealer.mv rename to aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/DesignatedDealer.mv diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/DualAttestation.mv b/aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/DualAttestation.mv similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/DualAttestation.mv rename to aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/DualAttestation.mv diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Errors.mv b/aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Errors.mv similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Errors.mv rename to aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Errors.mv diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Event.mv b/aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Event.mv similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Event.mv rename to aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Event.mv diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/FixedPoint32.mv b/aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/FixedPoint32.mv similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/FixedPoint32.mv rename to aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/FixedPoint32.mv diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/GUID.mv b/aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/GUID.mv similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/GUID.mv rename to aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/GUID.mv diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Genesis.mv b/aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Genesis.mv similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Genesis.mv rename to aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Genesis.mv diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Hash.mv b/aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Hash.mv similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Hash.mv rename to aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Hash.mv diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/NetworkIdentity.mv b/aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/NetworkIdentity.mv similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/NetworkIdentity.mv rename to aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/NetworkIdentity.mv diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Offer.mv b/aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Offer.mv similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Offer.mv rename to aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Offer.mv diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Option.mv b/aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Option.mv similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Option.mv rename to aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Option.mv diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/ParallelExecutionConfig.mv b/aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/ParallelExecutionConfig.mv similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/ParallelExecutionConfig.mv rename to aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/ParallelExecutionConfig.mv diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/PaymentScripts.mv b/aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/PaymentScripts.mv similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/PaymentScripts.mv rename to aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/PaymentScripts.mv diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/RecoveryAddress.mv b/aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/RecoveryAddress.mv similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/RecoveryAddress.mv rename to aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/RecoveryAddress.mv diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/RegisteredCurrencies.mv b/aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/RegisteredCurrencies.mv similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/RegisteredCurrencies.mv rename to aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/RegisteredCurrencies.mv diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Role.mv b/aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Role.mv similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Role.mv rename to aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Role.mv diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Roles.mv b/aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Roles.mv similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Roles.mv rename to aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Roles.mv diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/SharedEd25519PublicKey.mv b/aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/SharedEd25519PublicKey.mv similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/SharedEd25519PublicKey.mv rename to aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/SharedEd25519PublicKey.mv diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Signature.mv b/aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Signature.mv similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Signature.mv rename to aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Signature.mv diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Signer.mv b/aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Signer.mv similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Signer.mv rename to aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Signer.mv diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/SlidingNonce.mv b/aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/SlidingNonce.mv similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/SlidingNonce.mv rename to aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/SlidingNonce.mv diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/SystemAdministrationScripts.mv b/aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/SystemAdministrationScripts.mv similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/SystemAdministrationScripts.mv rename to aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/SystemAdministrationScripts.mv diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/TransactionFee.mv b/aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/TransactionFee.mv similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/TransactionFee.mv rename to aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/TransactionFee.mv diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/TreasuryComplianceScripts.mv b/aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/TreasuryComplianceScripts.mv similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/TreasuryComplianceScripts.mv rename to aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/TreasuryComplianceScripts.mv diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/VASP.mv b/aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/VASP.mv similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/VASP.mv rename to aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/VASP.mv diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/VASPDomain.mv b/aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/VASPDomain.mv similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/VASPDomain.mv rename to aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/VASPDomain.mv diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/ValidatorAdministrationScripts.mv b/aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/ValidatorAdministrationScripts.mv similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/ValidatorAdministrationScripts.mv rename to aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/ValidatorAdministrationScripts.mv diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/ValidatorConfig.mv b/aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/ValidatorConfig.mv similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/ValidatorConfig.mv rename to aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/ValidatorConfig.mv diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/ValidatorOperatorConfig.mv b/aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/ValidatorOperatorConfig.mv similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/ValidatorOperatorConfig.mv rename to aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/ValidatorOperatorConfig.mv diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Vault.mv b/aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Vault.mv similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Vault.mv rename to aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Vault.mv diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Vector.mv b/aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Vector.mv similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Vector.mv rename to aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Vector.mv diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/XDX.mv b/aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/XDX.mv similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/XDX.mv rename to aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/XDX.mv diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/XUS.mv b/aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/XUS.mv similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/XUS.mv rename to aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/XUS.mv diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000002/modules/NameService.mv b/aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000002/modules/NameService.mv similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000002/modules/NameService.mv rename to aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000002/modules/NameService.mv diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000002/modules/NonFungibleToken.mv b/aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000002/modules/NonFungibleToken.mv similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000002/modules/NonFungibleToken.mv rename to aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000002/modules/NonFungibleToken.mv diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000002/modules/Set.mv b/aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000002/modules/Set.mv similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000002/modules/Set.mv rename to aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000002/modules/Set.mv diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000002/modules/SimpleSortedLinkedList.mv b/aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000002/modules/SimpleSortedLinkedList.mv similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000002/modules/SimpleSortedLinkedList.mv rename to aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000002/modules/SimpleSortedLinkedList.mv diff --git a/diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000002/modules/SortedLinkedList.mv b/aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000002/modules/SortedLinkedList.mv similarity index 100% rename from diem-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000002/modules/SortedLinkedList.mv rename to aptos-move/df-cli/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000002/modules/SortedLinkedList.mv diff --git a/diem-move/df-cli/tests/testsuite/concretize_read_write_set_smoke/Move.toml b/aptos-move/df-cli/tests/testsuite/concretize_read_write_set_smoke/Move.toml similarity index 100% rename from diem-move/df-cli/tests/testsuite/concretize_read_write_set_smoke/Move.toml rename to aptos-move/df-cli/tests/testsuite/concretize_read_write_set_smoke/Move.toml diff --git a/diem-move/df-cli/tests/testsuite/concretize_read_write_set_smoke/args.exp b/aptos-move/df-cli/tests/testsuite/concretize_read_write_set_smoke/args.exp similarity index 100% rename from diem-move/df-cli/tests/testsuite/concretize_read_write_set_smoke/args.exp rename to aptos-move/df-cli/tests/testsuite/concretize_read_write_set_smoke/args.exp diff --git a/diem-move/df-cli/tests/testsuite/concretize_read_write_set_smoke/args.txt b/aptos-move/df-cli/tests/testsuite/concretize_read_write_set_smoke/args.txt similarity index 100% rename from diem-move/df-cli/tests/testsuite/concretize_read_write_set_smoke/args.txt rename to aptos-move/df-cli/tests/testsuite/concretize_read_write_set_smoke/args.txt diff --git a/diem-move/df-cli/tests/testsuite/concretize_read_write_set_smoke/sources/genesis.move b/aptos-move/df-cli/tests/testsuite/concretize_read_write_set_smoke/sources/genesis.move similarity index 100% rename from diem-move/df-cli/tests/testsuite/concretize_read_write_set_smoke/sources/genesis.move rename to aptos-move/df-cli/tests/testsuite/concretize_read_write_set_smoke/sources/genesis.move diff --git a/diem-move/diem-framework/CONTRIBUTING.md b/aptos-move/diem-framework/CONTRIBUTING.md similarity index 100% rename from diem-move/diem-framework/CONTRIBUTING.md rename to aptos-move/diem-framework/CONTRIBUTING.md diff --git a/diem-move/diem-framework/Cargo.toml b/aptos-move/diem-framework/Cargo.toml similarity index 88% rename from diem-move/diem-framework/Cargo.toml rename to aptos-move/diem-framework/Cargo.toml index b99b4d1448184..0028ff02f0715 100644 --- a/diem-move/diem-framework/Cargo.toml +++ b/aptos-move/diem-framework/Cargo.toml @@ -17,9 +17,9 @@ move-command-line-common = { git = "https://github.com/diem/move", rev = "98ed29 move-errmapgen = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } move-compiler = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } move-prover = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } -diem-crypto = { path = "../../crates/diem-crypto" } -diem-types = { path = "../../types" } -diem-workspace-hack = { path = "../../crates/diem-workspace-hack" } +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/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } transaction-builder-generator = { path = "../transaction-builder-generator" } move-stdlib = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } @@ -44,16 +44,16 @@ tempfile = "3.2.0" [dev-dependencies] datatest-stable = "0.1.1" -diem-vm = { path = "../../diem-move/diem-vm" } +aptos-vm = { path = "../../aptos-move/aptos-vm" } move-cli = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } move-unit-test = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } -diem-transactional-test-harness = { path = "../diem-transactional-test-harness" } +aptos-transactional-test-harness = { path = "../aptos-transactional-test-harness" } dir-diff = "0.3.2" [features] default = [] -fuzzing = ["diem-types/fuzzing"] +fuzzing = ["aptos-types/fuzzing"] [[test]] name = "dpn_transactional_tests" diff --git a/diem-move/diem-framework/DPN/Move.toml b/aptos-move/diem-framework/DPN/Move.toml similarity index 100% rename from diem-move/diem-framework/DPN/Move.toml rename to aptos-move/diem-framework/DPN/Move.toml diff --git a/diem-move/diem-framework/DPN/releases/Cargo.toml b/aptos-move/diem-framework/DPN/releases/Cargo.toml similarity index 81% rename from diem-move/diem-framework/DPN/releases/Cargo.toml rename to aptos-move/diem-framework/DPN/releases/Cargo.toml index de654e9873734..f7eeabe45b206 100644 --- a/diem-move/diem-framework/DPN/releases/Cargo.toml +++ b/aptos-move/diem-framework/DPN/releases/Cargo.toml @@ -12,9 +12,9 @@ publish = false [dependencies] move-command-line-common = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } -diem-crypto = { path = "../../../../crates/diem-crypto" } -diem-types = { path = "../../../../types" } -diem-workspace-hack = { path = "../../../../crates/diem-workspace-hack" } +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/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } framework-releases = { path = "../../releases" } diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/BuildInfo.yaml b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/BuildInfo.yaml similarity index 98% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/BuildInfo.yaml rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/BuildInfo.yaml index b6cd6381564ad..3476a30aa2176 100644 --- a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/BuildInfo.yaml +++ b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/BuildInfo.yaml @@ -165,7 +165,7 @@ compiled_package_info: ? address: "00000000000000000000000000000001" name: XUS : DiemFramework - source_digest: DD10031D931E645385E401CEA3428946E2A4E14C1F24EFD52E0473147388FF8D + source_digest: E9B5A7D0E3E0CF8068572E6E8FF61BCF1B7E039F9E2E3C77971CFC7F596E395C build_flags: dev_mode: false test_mode: false diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountAdministrationScripts/add_currency_to_account.abi b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountAdministrationScripts/add_currency_to_account.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountAdministrationScripts/add_currency_to_account.abi rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountAdministrationScripts/add_currency_to_account.abi diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountAdministrationScripts/add_recovery_rotation_capability.abi b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountAdministrationScripts/add_recovery_rotation_capability.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountAdministrationScripts/add_recovery_rotation_capability.abi rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountAdministrationScripts/add_recovery_rotation_capability.abi diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountAdministrationScripts/create_recovery_address.abi b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountAdministrationScripts/create_recovery_address.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountAdministrationScripts/create_recovery_address.abi rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountAdministrationScripts/create_recovery_address.abi diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountAdministrationScripts/create_vasp_domains.abi b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountAdministrationScripts/create_vasp_domains.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountAdministrationScripts/create_vasp_domains.abi rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountAdministrationScripts/create_vasp_domains.abi diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountAdministrationScripts/force_expire.abi b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountAdministrationScripts/force_expire.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountAdministrationScripts/force_expire.abi rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountAdministrationScripts/force_expire.abi diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountAdministrationScripts/opt_in_to_crsn.abi b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountAdministrationScripts/opt_in_to_crsn.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountAdministrationScripts/opt_in_to_crsn.abi rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountAdministrationScripts/opt_in_to_crsn.abi diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountAdministrationScripts/publish_shared_ed25519_public_key.abi b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountAdministrationScripts/publish_shared_ed25519_public_key.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountAdministrationScripts/publish_shared_ed25519_public_key.abi rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountAdministrationScripts/publish_shared_ed25519_public_key.abi diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountAdministrationScripts/rotate_authentication_key.abi b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountAdministrationScripts/rotate_authentication_key.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountAdministrationScripts/rotate_authentication_key.abi rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountAdministrationScripts/rotate_authentication_key.abi diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountAdministrationScripts/rotate_authentication_key_with_nonce.abi b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountAdministrationScripts/rotate_authentication_key_with_nonce.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountAdministrationScripts/rotate_authentication_key_with_nonce.abi rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountAdministrationScripts/rotate_authentication_key_with_nonce.abi diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountAdministrationScripts/rotate_authentication_key_with_nonce_admin.abi b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountAdministrationScripts/rotate_authentication_key_with_nonce_admin.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountAdministrationScripts/rotate_authentication_key_with_nonce_admin.abi rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountAdministrationScripts/rotate_authentication_key_with_nonce_admin.abi diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountAdministrationScripts/rotate_authentication_key_with_recovery_address.abi b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountAdministrationScripts/rotate_authentication_key_with_recovery_address.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountAdministrationScripts/rotate_authentication_key_with_recovery_address.abi rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountAdministrationScripts/rotate_authentication_key_with_recovery_address.abi diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountAdministrationScripts/rotate_dual_attestation_info.abi b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountAdministrationScripts/rotate_dual_attestation_info.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountAdministrationScripts/rotate_dual_attestation_info.abi rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountAdministrationScripts/rotate_dual_attestation_info.abi diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountAdministrationScripts/rotate_shared_ed25519_public_key.abi b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountAdministrationScripts/rotate_shared_ed25519_public_key.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountAdministrationScripts/rotate_shared_ed25519_public_key.abi rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountAdministrationScripts/rotate_shared_ed25519_public_key.abi diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountCreationScripts/create_child_vasp_account.abi b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountCreationScripts/create_child_vasp_account.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountCreationScripts/create_child_vasp_account.abi rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountCreationScripts/create_child_vasp_account.abi diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountCreationScripts/create_designated_dealer.abi b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountCreationScripts/create_designated_dealer.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountCreationScripts/create_designated_dealer.abi rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountCreationScripts/create_designated_dealer.abi diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountCreationScripts/create_parent_vasp_account.abi b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountCreationScripts/create_parent_vasp_account.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountCreationScripts/create_parent_vasp_account.abi rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountCreationScripts/create_parent_vasp_account.abi diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountCreationScripts/create_validator_account.abi b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountCreationScripts/create_validator_account.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountCreationScripts/create_validator_account.abi rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountCreationScripts/create_validator_account.abi diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountCreationScripts/create_validator_operator_account.abi b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountCreationScripts/create_validator_operator_account.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountCreationScripts/create_validator_operator_account.abi rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/AccountCreationScripts/create_validator_operator_account.abi diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/PaymentScripts/peer_to_peer_by_signers.abi b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/PaymentScripts/peer_to_peer_by_signers.abi similarity index 96% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/PaymentScripts/peer_to_peer_by_signers.abi rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/PaymentScripts/peer_to_peer_by_signers.abi index 508d80b307f56..4b5a7c58c364a 100644 Binary files a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/PaymentScripts/peer_to_peer_by_signers.abi and b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/PaymentScripts/peer_to_peer_by_signers.abi differ diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/PaymentScripts/peer_to_peer_with_metadata.abi b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/PaymentScripts/peer_to_peer_with_metadata.abi similarity index 97% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/PaymentScripts/peer_to_peer_with_metadata.abi rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/PaymentScripts/peer_to_peer_with_metadata.abi index 07eadf1d4b0d3..3fbbcdeab3d97 100644 Binary files a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/PaymentScripts/peer_to_peer_with_metadata.abi and b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/PaymentScripts/peer_to_peer_with_metadata.abi differ diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/SystemAdministrationScripts/initialize_diem_consensus_config.abi b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/SystemAdministrationScripts/initialize_diem_consensus_config.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/SystemAdministrationScripts/initialize_diem_consensus_config.abi rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/SystemAdministrationScripts/initialize_diem_consensus_config.abi diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/SystemAdministrationScripts/set_gas_constants.abi b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/SystemAdministrationScripts/set_gas_constants.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/SystemAdministrationScripts/set_gas_constants.abi rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/SystemAdministrationScripts/set_gas_constants.abi diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/SystemAdministrationScripts/update_diem_consensus_config.abi b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/SystemAdministrationScripts/update_diem_consensus_config.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/SystemAdministrationScripts/update_diem_consensus_config.abi rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/SystemAdministrationScripts/update_diem_consensus_config.abi diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/SystemAdministrationScripts/update_diem_version.abi b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/SystemAdministrationScripts/update_diem_version.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/SystemAdministrationScripts/update_diem_version.abi rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/SystemAdministrationScripts/update_diem_version.abi diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/TreasuryComplianceScripts/add_vasp_domain.abi b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/TreasuryComplianceScripts/add_vasp_domain.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/TreasuryComplianceScripts/add_vasp_domain.abi rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/TreasuryComplianceScripts/add_vasp_domain.abi diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/TreasuryComplianceScripts/burn_txn_fees.abi b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/TreasuryComplianceScripts/burn_txn_fees.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/TreasuryComplianceScripts/burn_txn_fees.abi rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/TreasuryComplianceScripts/burn_txn_fees.abi diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/TreasuryComplianceScripts/burn_with_amount.abi b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/TreasuryComplianceScripts/burn_with_amount.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/TreasuryComplianceScripts/burn_with_amount.abi rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/TreasuryComplianceScripts/burn_with_amount.abi diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/TreasuryComplianceScripts/cancel_burn_with_amount.abi b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/TreasuryComplianceScripts/cancel_burn_with_amount.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/TreasuryComplianceScripts/cancel_burn_with_amount.abi rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/TreasuryComplianceScripts/cancel_burn_with_amount.abi diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/TreasuryComplianceScripts/freeze_account.abi b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/TreasuryComplianceScripts/freeze_account.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/TreasuryComplianceScripts/freeze_account.abi rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/TreasuryComplianceScripts/freeze_account.abi diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/TreasuryComplianceScripts/preburn.abi b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/TreasuryComplianceScripts/preburn.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/TreasuryComplianceScripts/preburn.abi rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/TreasuryComplianceScripts/preburn.abi diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/TreasuryComplianceScripts/remove_vasp_domain.abi b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/TreasuryComplianceScripts/remove_vasp_domain.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/TreasuryComplianceScripts/remove_vasp_domain.abi rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/TreasuryComplianceScripts/remove_vasp_domain.abi diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/TreasuryComplianceScripts/tiered_mint.abi b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/TreasuryComplianceScripts/tiered_mint.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/TreasuryComplianceScripts/tiered_mint.abi rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/TreasuryComplianceScripts/tiered_mint.abi diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/TreasuryComplianceScripts/unfreeze_account.abi b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/TreasuryComplianceScripts/unfreeze_account.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/TreasuryComplianceScripts/unfreeze_account.abi rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/TreasuryComplianceScripts/unfreeze_account.abi diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/TreasuryComplianceScripts/update_dual_attestation_limit.abi b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/TreasuryComplianceScripts/update_dual_attestation_limit.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/TreasuryComplianceScripts/update_dual_attestation_limit.abi rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/TreasuryComplianceScripts/update_dual_attestation_limit.abi diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/TreasuryComplianceScripts/update_exchange_rate.abi b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/TreasuryComplianceScripts/update_exchange_rate.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/TreasuryComplianceScripts/update_exchange_rate.abi rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/TreasuryComplianceScripts/update_exchange_rate.abi diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/TreasuryComplianceScripts/update_minting_ability.abi b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/TreasuryComplianceScripts/update_minting_ability.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/TreasuryComplianceScripts/update_minting_ability.abi rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/TreasuryComplianceScripts/update_minting_ability.abi diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/ValidatorAdministrationScripts/add_validator_and_reconfigure.abi b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/ValidatorAdministrationScripts/add_validator_and_reconfigure.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/ValidatorAdministrationScripts/add_validator_and_reconfigure.abi rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/ValidatorAdministrationScripts/add_validator_and_reconfigure.abi diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/ValidatorAdministrationScripts/register_validator_config.abi b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/ValidatorAdministrationScripts/register_validator_config.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/ValidatorAdministrationScripts/register_validator_config.abi rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/ValidatorAdministrationScripts/register_validator_config.abi diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/ValidatorAdministrationScripts/remove_validator_and_reconfigure.abi b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/ValidatorAdministrationScripts/remove_validator_and_reconfigure.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/ValidatorAdministrationScripts/remove_validator_and_reconfigure.abi rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/ValidatorAdministrationScripts/remove_validator_and_reconfigure.abi diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/ValidatorAdministrationScripts/set_validator_config_and_reconfigure.abi b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/ValidatorAdministrationScripts/set_validator_config_and_reconfigure.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/ValidatorAdministrationScripts/set_validator_config_and_reconfigure.abi rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/ValidatorAdministrationScripts/set_validator_config_and_reconfigure.abi diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/ValidatorAdministrationScripts/set_validator_operator.abi b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/ValidatorAdministrationScripts/set_validator_operator.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/ValidatorAdministrationScripts/set_validator_operator.abi rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/ValidatorAdministrationScripts/set_validator_operator.abi diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/ValidatorAdministrationScripts/set_validator_operator_with_nonce_admin.abi b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/ValidatorAdministrationScripts/set_validator_operator_with_nonce_admin.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/ValidatorAdministrationScripts/set_validator_operator_with_nonce_admin.abi rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/abis/ValidatorAdministrationScripts/set_validator_operator_with_nonce_admin.abi diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/AccountAdministrationScripts.mv b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/AccountAdministrationScripts.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/AccountAdministrationScripts.mv rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/AccountAdministrationScripts.mv diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/AccountCreationScripts.mv b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/AccountCreationScripts.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/AccountCreationScripts.mv rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/AccountCreationScripts.mv diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/AccountFreezing.mv b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/AccountFreezing.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/AccountFreezing.mv rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/AccountFreezing.mv diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/AccountLimits.mv b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/AccountLimits.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/AccountLimits.mv rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/AccountLimits.mv diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/Authenticator.mv b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/Authenticator.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/Authenticator.mv rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/Authenticator.mv diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/CRSN.mv b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/CRSN.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/CRSN.mv rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/CRSN.mv diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/ChainId.mv b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/ChainId.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/ChainId.mv rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/ChainId.mv diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/CoreAddresses.mv b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/CoreAddresses.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/CoreAddresses.mv rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/CoreAddresses.mv diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/DesignatedDealer.mv b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/DesignatedDealer.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/DesignatedDealer.mv rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/DesignatedDealer.mv diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/Diem.mv b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/Diem.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/Diem.mv rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/Diem.mv diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/DiemAccount.mv b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/DiemAccount.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/DiemAccount.mv rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/DiemAccount.mv diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/DiemBlock.mv b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/DiemBlock.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/DiemBlock.mv rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/DiemBlock.mv diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/DiemConfig.mv b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/DiemConfig.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/DiemConfig.mv rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/DiemConfig.mv diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/DiemConsensusConfig.mv b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/DiemConsensusConfig.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/DiemConsensusConfig.mv rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/DiemConsensusConfig.mv diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/DiemId.mv b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/DiemId.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/DiemId.mv rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/DiemId.mv diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/DiemSystem.mv b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/DiemSystem.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/DiemSystem.mv rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/DiemSystem.mv diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/DiemTimestamp.mv b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/DiemTimestamp.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/DiemTimestamp.mv rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/DiemTimestamp.mv diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/DiemTransactionPublishingOption.mv b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/DiemTransactionPublishingOption.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/DiemTransactionPublishingOption.mv rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/DiemTransactionPublishingOption.mv diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/DiemVMConfig.mv b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/DiemVMConfig.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/DiemVMConfig.mv rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/DiemVMConfig.mv diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/DiemVersion.mv b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/DiemVersion.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/DiemVersion.mv rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/DiemVersion.mv diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/DualAttestation.mv b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/DualAttestation.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/DualAttestation.mv rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/DualAttestation.mv diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/Genesis.mv b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/Genesis.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/Genesis.mv rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/Genesis.mv diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/NetworkIdentity.mv b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/NetworkIdentity.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/NetworkIdentity.mv rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/NetworkIdentity.mv diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/ParallelExecutionConfig.mv b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/ParallelExecutionConfig.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/ParallelExecutionConfig.mv rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/ParallelExecutionConfig.mv diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/PaymentScripts.mv b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/PaymentScripts.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/PaymentScripts.mv rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/PaymentScripts.mv diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/RecoveryAddress.mv b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/RecoveryAddress.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/RecoveryAddress.mv rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/RecoveryAddress.mv diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/RegisteredCurrencies.mv b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/RegisteredCurrencies.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/RegisteredCurrencies.mv rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/RegisteredCurrencies.mv diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/Roles.mv b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/Roles.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/Roles.mv rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/Roles.mv diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/SharedEd25519PublicKey.mv b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/SharedEd25519PublicKey.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/SharedEd25519PublicKey.mv rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/SharedEd25519PublicKey.mv diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/Signature.mv b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/Signature.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/Signature.mv rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/Signature.mv diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/SlidingNonce.mv b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/SlidingNonce.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/SlidingNonce.mv rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/SlidingNonce.mv diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/SystemAdministrationScripts.mv b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/SystemAdministrationScripts.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/SystemAdministrationScripts.mv rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/SystemAdministrationScripts.mv diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/TransactionFee.mv b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/TransactionFee.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/TransactionFee.mv rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/TransactionFee.mv diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/TreasuryComplianceScripts.mv b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/TreasuryComplianceScripts.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/TreasuryComplianceScripts.mv rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/TreasuryComplianceScripts.mv diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/VASP.mv b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/VASP.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/VASP.mv rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/VASP.mv diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/VASPDomain.mv b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/VASPDomain.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/VASPDomain.mv rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/VASPDomain.mv diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/ValidatorAdministrationScripts.mv b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/ValidatorAdministrationScripts.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/ValidatorAdministrationScripts.mv rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/ValidatorAdministrationScripts.mv diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/ValidatorConfig.mv b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/ValidatorConfig.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/ValidatorConfig.mv rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/ValidatorConfig.mv diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/ValidatorOperatorConfig.mv b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/ValidatorOperatorConfig.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/ValidatorOperatorConfig.mv rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/ValidatorOperatorConfig.mv diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/XDX.mv b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/XDX.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/XDX.mv rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/XDX.mv diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/XUS.mv b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/XUS.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/XUS.mv rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/XUS.mv diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/AccountAdministrationScripts.md b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/AccountAdministrationScripts.md similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/AccountAdministrationScripts.md rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/AccountAdministrationScripts.md diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/AccountCreationScripts.md b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/AccountCreationScripts.md similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/AccountCreationScripts.md rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/AccountCreationScripts.md diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/AccountFreezing.md b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/AccountFreezing.md similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/AccountFreezing.md rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/AccountFreezing.md diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/AccountLimits.md b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/AccountLimits.md similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/AccountLimits.md rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/AccountLimits.md diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/Authenticator.md b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/Authenticator.md similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/Authenticator.md rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/Authenticator.md diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/CRSN.md b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/CRSN.md similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/CRSN.md rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/CRSN.md diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/ChainId.md b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/ChainId.md similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/ChainId.md rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/ChainId.md diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/CoreAddresses.md b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/CoreAddresses.md similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/CoreAddresses.md rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/CoreAddresses.md diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/DesignatedDealer.md b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/DesignatedDealer.md similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/DesignatedDealer.md rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/DesignatedDealer.md diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/Diem.md b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/Diem.md similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/Diem.md rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/Diem.md diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/DiemAccount.md b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/DiemAccount.md similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/DiemAccount.md rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/DiemAccount.md diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/DiemBlock.md b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/DiemBlock.md similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/DiemBlock.md rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/DiemBlock.md diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/DiemConfig.md b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/DiemConfig.md similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/DiemConfig.md rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/DiemConfig.md diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/DiemConsensusConfig.md b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/DiemConsensusConfig.md similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/DiemConsensusConfig.md rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/DiemConsensusConfig.md diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/DiemId.md b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/DiemId.md similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/DiemId.md rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/DiemId.md diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/DiemSystem.md b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/DiemSystem.md similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/DiemSystem.md rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/DiemSystem.md diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/DiemTimestamp.md b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/DiemTimestamp.md similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/DiemTimestamp.md rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/DiemTimestamp.md diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/DiemTransactionPublishingOption.md b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/DiemTransactionPublishingOption.md similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/DiemTransactionPublishingOption.md rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/DiemTransactionPublishingOption.md diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/DiemVMConfig.md b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/DiemVMConfig.md similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/DiemVMConfig.md rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/DiemVMConfig.md diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/DiemVersion.md b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/DiemVersion.md similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/DiemVersion.md rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/DiemVersion.md diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/DualAttestation.md b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/DualAttestation.md similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/DualAttestation.md rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/DualAttestation.md diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/Genesis.md b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/Genesis.md similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/Genesis.md rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/Genesis.md diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/NetworkIdentity.md b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/NetworkIdentity.md similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/NetworkIdentity.md rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/NetworkIdentity.md diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/ParallelExecutionConfig.md b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/ParallelExecutionConfig.md similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/ParallelExecutionConfig.md rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/ParallelExecutionConfig.md diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/PaymentScripts.md b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/PaymentScripts.md similarity index 99% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/PaymentScripts.md rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/PaymentScripts.md index 04dadef2933d6..05e292e056cc8 100644 --- a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/PaymentScripts.md +++ b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/PaymentScripts.md @@ -60,7 +60,7 @@ The metadata and metadata_signature parameters are onl DualAttestation::get_cur_microdiem_limit XDX and payer and payee are distinct VASPs. However, a transaction sender can opt in to dual attestation even when it is not required (e.g., a DesignatedDealer -> VASP payment) by providing a non-empty metadata_signature. -Standardized metadata BCS format can be found in diem_types::transaction::metadata::Metadata. +Standardized metadata BCS format can be found in aptos_types::transaction::metadata::Metadata. @@ -182,7 +182,7 @@ currency being transacted. Transfers amount coins of type Currency from payer to payee with (optional) associated metadata. Dual attestation is not applied to this script as payee is also a signer of the transaction. -Standardized metadata BCS format can be found in diem_types::transaction::metadata::Metadata. +Standardized metadata BCS format can be found in aptos_types::transaction::metadata::Metadata. diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/RecoveryAddress.md b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/RecoveryAddress.md similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/RecoveryAddress.md rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/RecoveryAddress.md diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/RegisteredCurrencies.md b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/RegisteredCurrencies.md similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/RegisteredCurrencies.md rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/RegisteredCurrencies.md diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/Roles.md b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/Roles.md similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/Roles.md rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/Roles.md diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/SharedEd25519PublicKey.md b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/SharedEd25519PublicKey.md similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/SharedEd25519PublicKey.md rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/SharedEd25519PublicKey.md diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/Signature.md b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/Signature.md similarity index 95% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/Signature.md rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/Signature.md index 8d71e49391d6e..5f421c762ef96 100644 --- a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/Signature.md +++ b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/Signature.md @@ -20,7 +20,7 @@ Contains functions for [ed25519](https://en.wikipedia.org/wiki/EdDSA) digital si Return true if the bytes in public_key can be parsed as a valid Ed25519 public key. Returns false if public_key is not 32 bytes OR is 32 bytes, but does not pass -points-on-curve or small subgroup checks. See the Rust diem_crypto::Ed25519PublicKey type +points-on-curve or small subgroup checks. See the Rust aptos_crypto::Ed25519PublicKey type for more details. Does not abort. diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/SlidingNonce.md b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/SlidingNonce.md similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/SlidingNonce.md rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/SlidingNonce.md diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/SystemAdministrationScripts.md b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/SystemAdministrationScripts.md similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/SystemAdministrationScripts.md rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/SystemAdministrationScripts.md diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/TransactionFee.md b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/TransactionFee.md similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/TransactionFee.md rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/TransactionFee.md diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/TreasuryComplianceScripts.md b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/TreasuryComplianceScripts.md similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/TreasuryComplianceScripts.md rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/TreasuryComplianceScripts.md diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/VASP.md b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/VASP.md similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/VASP.md rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/VASP.md diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/VASPDomain.md b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/VASPDomain.md similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/VASPDomain.md rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/VASPDomain.md diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/ValidatorAdministrationScripts.md b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/ValidatorAdministrationScripts.md similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/ValidatorAdministrationScripts.md rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/ValidatorAdministrationScripts.md diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/ValidatorConfig.md b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/ValidatorConfig.md similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/ValidatorConfig.md rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/ValidatorConfig.md diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/ValidatorOperatorConfig.md b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/ValidatorOperatorConfig.md similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/ValidatorOperatorConfig.md rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/ValidatorOperatorConfig.md diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/XDX.md b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/XDX.md similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/XDX.md rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/XDX.md diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/XUS.md b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/XUS.md similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/XUS.md rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/docs/XUS.md diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/AccountAdministrationScripts.mvsm b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/AccountAdministrationScripts.mvsm similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/AccountAdministrationScripts.mvsm rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/AccountAdministrationScripts.mvsm diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/AccountCreationScripts.mvsm b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/AccountCreationScripts.mvsm similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/AccountCreationScripts.mvsm rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/AccountCreationScripts.mvsm diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/AccountFreezing.mvsm b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/AccountFreezing.mvsm similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/AccountFreezing.mvsm rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/AccountFreezing.mvsm diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/AccountLimits.mvsm b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/AccountLimits.mvsm similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/AccountLimits.mvsm rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/AccountLimits.mvsm diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/Authenticator.mvsm b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/Authenticator.mvsm similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/Authenticator.mvsm rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/Authenticator.mvsm diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/CRSN.mvsm b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/CRSN.mvsm similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/CRSN.mvsm rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/CRSN.mvsm diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/ChainId.mvsm b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/ChainId.mvsm similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/ChainId.mvsm rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/ChainId.mvsm diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/CoreAddresses.mvsm b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/CoreAddresses.mvsm similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/CoreAddresses.mvsm rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/CoreAddresses.mvsm diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/DesignatedDealer.mvsm b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/DesignatedDealer.mvsm similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/DesignatedDealer.mvsm rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/DesignatedDealer.mvsm diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/Diem.mvsm b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/Diem.mvsm similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/Diem.mvsm rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/Diem.mvsm diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/DiemAccount.mvsm b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/DiemAccount.mvsm similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/DiemAccount.mvsm rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/DiemAccount.mvsm diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/DiemBlock.mvsm b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/DiemBlock.mvsm similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/DiemBlock.mvsm rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/DiemBlock.mvsm diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/DiemConfig.mvsm b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/DiemConfig.mvsm similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/DiemConfig.mvsm rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/DiemConfig.mvsm diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/DiemConsensusConfig.mvsm b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/DiemConsensusConfig.mvsm similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/DiemConsensusConfig.mvsm rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/DiemConsensusConfig.mvsm diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/DiemId.mvsm b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/DiemId.mvsm similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/DiemId.mvsm rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/DiemId.mvsm diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/DiemSystem.mvsm b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/DiemSystem.mvsm similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/DiemSystem.mvsm rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/DiemSystem.mvsm diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/DiemTimestamp.mvsm b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/DiemTimestamp.mvsm similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/DiemTimestamp.mvsm rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/DiemTimestamp.mvsm diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/DiemTransactionPublishingOption.mvsm b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/DiemTransactionPublishingOption.mvsm similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/DiemTransactionPublishingOption.mvsm rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/DiemTransactionPublishingOption.mvsm diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/DiemVMConfig.mvsm b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/DiemVMConfig.mvsm similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/DiemVMConfig.mvsm rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/DiemVMConfig.mvsm diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/DiemVersion.mvsm b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/DiemVersion.mvsm similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/DiemVersion.mvsm rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/DiemVersion.mvsm diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/DualAttestation.mvsm b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/DualAttestation.mvsm similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/DualAttestation.mvsm rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/DualAttestation.mvsm diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/Genesis.mvsm b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/Genesis.mvsm similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/Genesis.mvsm rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/Genesis.mvsm diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/NetworkIdentity.mvsm b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/NetworkIdentity.mvsm similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/NetworkIdentity.mvsm rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/NetworkIdentity.mvsm diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/ParallelExecutionConfig.mvsm b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/ParallelExecutionConfig.mvsm similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/ParallelExecutionConfig.mvsm rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/ParallelExecutionConfig.mvsm diff --git a/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/PaymentScripts.mvsm b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/PaymentScripts.mvsm new file mode 100644 index 0000000000000..daf56d1f2a36c Binary files /dev/null and b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/PaymentScripts.mvsm differ diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/RecoveryAddress.mvsm b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/RecoveryAddress.mvsm similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/RecoveryAddress.mvsm rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/RecoveryAddress.mvsm diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/RegisteredCurrencies.mvsm b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/RegisteredCurrencies.mvsm similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/RegisteredCurrencies.mvsm rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/RegisteredCurrencies.mvsm diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/Roles.mvsm b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/Roles.mvsm similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/Roles.mvsm rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/Roles.mvsm diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/SharedEd25519PublicKey.mvsm b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/SharedEd25519PublicKey.mvsm similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/SharedEd25519PublicKey.mvsm rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/SharedEd25519PublicKey.mvsm diff --git a/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/Signature.mvsm b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/Signature.mvsm new file mode 100644 index 0000000000000..7d8ee208b7bad Binary files /dev/null and b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/Signature.mvsm differ diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/SlidingNonce.mvsm b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/SlidingNonce.mvsm similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/SlidingNonce.mvsm rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/SlidingNonce.mvsm diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/SystemAdministrationScripts.mvsm b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/SystemAdministrationScripts.mvsm similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/SystemAdministrationScripts.mvsm rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/SystemAdministrationScripts.mvsm diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/TransactionFee.mvsm b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/TransactionFee.mvsm similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/TransactionFee.mvsm rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/TransactionFee.mvsm diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/TreasuryComplianceScripts.mvsm b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/TreasuryComplianceScripts.mvsm similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/TreasuryComplianceScripts.mvsm rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/TreasuryComplianceScripts.mvsm diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/VASP.mvsm b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/VASP.mvsm similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/VASP.mvsm rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/VASP.mvsm diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/VASPDomain.mvsm b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/VASPDomain.mvsm similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/VASPDomain.mvsm rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/VASPDomain.mvsm diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/ValidatorAdministrationScripts.mvsm b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/ValidatorAdministrationScripts.mvsm similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/ValidatorAdministrationScripts.mvsm rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/ValidatorAdministrationScripts.mvsm diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/ValidatorConfig.mvsm b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/ValidatorConfig.mvsm similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/ValidatorConfig.mvsm rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/ValidatorConfig.mvsm diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/ValidatorOperatorConfig.mvsm b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/ValidatorOperatorConfig.mvsm similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/ValidatorOperatorConfig.mvsm rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/ValidatorOperatorConfig.mvsm diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/XDX.mvsm b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/XDX.mvsm similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/XDX.mvsm rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/XDX.mvsm diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/XUS.mvsm b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/XUS.mvsm similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/XUS.mvsm rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/XUS.mvsm diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/AccountAdministrationScripts.move b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/AccountAdministrationScripts.move similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/AccountAdministrationScripts.move rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/AccountAdministrationScripts.move diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/AccountCreationScripts.move b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/AccountCreationScripts.move similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/AccountCreationScripts.move rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/AccountCreationScripts.move diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/AccountFreezing.move b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/AccountFreezing.move similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/AccountFreezing.move rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/AccountFreezing.move diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/AccountLimits.move b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/AccountLimits.move similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/AccountLimits.move rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/AccountLimits.move diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/Authenticator.move b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/Authenticator.move similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/Authenticator.move rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/Authenticator.move diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/CRSN.move b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/CRSN.move similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/CRSN.move rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/CRSN.move diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/ChainId.move b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/ChainId.move similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/ChainId.move rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/ChainId.move diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/CoreAddresses.move b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/CoreAddresses.move similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/CoreAddresses.move rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/CoreAddresses.move diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/DesignatedDealer.move b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/DesignatedDealer.move similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/DesignatedDealer.move rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/DesignatedDealer.move diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/Diem.move b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/Diem.move similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/Diem.move rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/Diem.move diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/DiemAccount.move b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/DiemAccount.move similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/DiemAccount.move rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/DiemAccount.move diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/DiemBlock.move b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/DiemBlock.move similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/DiemBlock.move rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/DiemBlock.move diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/DiemConfig.move b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/DiemConfig.move similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/DiemConfig.move rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/DiemConfig.move diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/DiemConsensusConfig.move b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/DiemConsensusConfig.move similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/DiemConsensusConfig.move rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/DiemConsensusConfig.move diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/DiemId.move b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/DiemId.move similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/DiemId.move rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/DiemId.move diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/DiemSystem.move b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/DiemSystem.move similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/DiemSystem.move rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/DiemSystem.move diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/DiemTimestamp.move b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/DiemTimestamp.move similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/DiemTimestamp.move rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/DiemTimestamp.move diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/DiemTransactionPublishingOption.move b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/DiemTransactionPublishingOption.move similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/DiemTransactionPublishingOption.move rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/DiemTransactionPublishingOption.move diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/DiemVMConfig.move b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/DiemVMConfig.move similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/DiemVMConfig.move rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/DiemVMConfig.move diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/DiemVersion.move b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/DiemVersion.move similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/DiemVersion.move rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/DiemVersion.move diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/DualAttestation.move b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/DualAttestation.move similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/DualAttestation.move rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/DualAttestation.move diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/Genesis.move b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/Genesis.move similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/Genesis.move rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/Genesis.move diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/NetworkIdentity.move b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/NetworkIdentity.move similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/NetworkIdentity.move rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/NetworkIdentity.move diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/ParallelExecutionConfig.move b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/ParallelExecutionConfig.move similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/ParallelExecutionConfig.move rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/ParallelExecutionConfig.move diff --git a/diem-move/diem-framework/DPN/sources/PaymentScripts.move b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/PaymentScripts.move similarity index 98% rename from diem-move/diem-framework/DPN/sources/PaymentScripts.move rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/PaymentScripts.move index 88e5826d51bdf..802d1d9af7685 100644 --- a/diem-move/diem-framework/DPN/sources/PaymentScripts.move +++ b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/PaymentScripts.move @@ -25,7 +25,7 @@ module DiemFramework::PaymentScripts { /// `DualAttestation::get_cur_microdiem_limit` XDX and `payer` and `payee` are distinct VASPs. /// However, a transaction sender can opt in to dual attestation even when it is not required /// (e.g., a DesignatedDealer -> VASP payment) by providing a non-empty `metadata_signature`. - /// Standardized `metadata` BCS format can be found in `diem_types::transaction::metadata::Metadata`. + /// Standardized `metadata` BCS format can be found in `aptos_types::transaction::metadata::Metadata`. /// /// # Events /// Successful execution of this script emits two events: @@ -87,7 +87,7 @@ module DiemFramework::PaymentScripts { /// Transfers `amount` coins of type `Currency` from `payer` to `payee` with (optional) associated /// `metadata`. /// Dual attestation is not applied to this script as payee is also a signer of the transaction. - /// Standardized `metadata` BCS format can be found in `diem_types::transaction::metadata::Metadata`. + /// Standardized `metadata` BCS format can be found in `aptos_types::transaction::metadata::Metadata`. /// /// # Events /// Successful execution of this script emits two events: diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/RecoveryAddress.move b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/RecoveryAddress.move similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/RecoveryAddress.move rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/RecoveryAddress.move diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/RegisteredCurrencies.move b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/RegisteredCurrencies.move similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/RegisteredCurrencies.move rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/RegisteredCurrencies.move diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/Roles.move b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/Roles.move similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/Roles.move rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/Roles.move diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/SharedEd25519PublicKey.move b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/SharedEd25519PublicKey.move similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/SharedEd25519PublicKey.move rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/SharedEd25519PublicKey.move diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/Signature.move b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/Signature.move similarity index 96% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/Signature.move rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/Signature.move index df6996b40871b..2b501cfca6d01 100644 --- a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/Signature.move +++ b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/Signature.move @@ -3,7 +3,7 @@ module DiemFramework::Signature { /// Return `true` if the bytes in `public_key` can be parsed as a valid Ed25519 public key. /// Returns `false` if `public_key` is not 32 bytes OR is 32 bytes, but does not pass - /// points-on-curve or small subgroup checks. See the Rust `diem_crypto::Ed25519PublicKey` type + /// points-on-curve or small subgroup checks. See the Rust `aptos_crypto::Ed25519PublicKey` type /// for more details. /// Does not abort. native public fun ed25519_validate_pubkey(public_key: vector): bool; diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/SlidingNonce.move b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/SlidingNonce.move similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/SlidingNonce.move rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/SlidingNonce.move diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/SystemAdministrationScripts.move b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/SystemAdministrationScripts.move similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/SystemAdministrationScripts.move rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/SystemAdministrationScripts.move diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/TransactionFee.move b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/TransactionFee.move similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/TransactionFee.move rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/TransactionFee.move diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/TreasuryComplianceScripts.move b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/TreasuryComplianceScripts.move similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/TreasuryComplianceScripts.move rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/TreasuryComplianceScripts.move diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/VASP.move b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/VASP.move similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/VASP.move rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/VASP.move diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/VASPDomain.move b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/VASPDomain.move similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/VASPDomain.move rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/VASPDomain.move diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/ValidatorAdministrationScripts.move b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/ValidatorAdministrationScripts.move similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/ValidatorAdministrationScripts.move rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/ValidatorAdministrationScripts.move diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/ValidatorConfig.move b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/ValidatorConfig.move similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/ValidatorConfig.move rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/ValidatorConfig.move diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/ValidatorOperatorConfig.move b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/ValidatorOperatorConfig.move similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/ValidatorOperatorConfig.move rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/ValidatorOperatorConfig.move diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/XDX.move b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/XDX.move similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/XDX.move rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/XDX.move diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/XUS.move b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/XUS.move similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/XUS.move rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/XUS.move diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/BuildInfo.yaml b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/BuildInfo.yaml similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/BuildInfo.yaml rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/BuildInfo.yaml diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/bytecode_modules/ASCII.mv b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/bytecode_modules/ASCII.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/bytecode_modules/ASCII.mv rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/bytecode_modules/ASCII.mv diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/bytecode_modules/BCS.mv b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/bytecode_modules/BCS.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/bytecode_modules/BCS.mv rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/bytecode_modules/BCS.mv diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/bytecode_modules/BitVector.mv b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/bytecode_modules/BitVector.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/bytecode_modules/BitVector.mv rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/bytecode_modules/BitVector.mv diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Capability.mv b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Capability.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Capability.mv rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Capability.mv diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Errors.mv b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Errors.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Errors.mv rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Errors.mv diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Event.mv b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Event.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Event.mv rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Event.mv diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/bytecode_modules/FixedPoint32.mv b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/bytecode_modules/FixedPoint32.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/bytecode_modules/FixedPoint32.mv rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/bytecode_modules/FixedPoint32.mv diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/bytecode_modules/GUID.mv b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/bytecode_modules/GUID.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/bytecode_modules/GUID.mv rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/bytecode_modules/GUID.mv diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Hash.mv b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Hash.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Hash.mv rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Hash.mv diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Option.mv b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Option.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Option.mv rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Option.mv diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Signer.mv b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Signer.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Signer.mv rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Signer.mv diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Vector.mv b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Vector.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Vector.mv rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Vector.mv diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/docs/ASCII.md b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/docs/ASCII.md similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/docs/ASCII.md rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/docs/ASCII.md diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/docs/BCS.md b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/docs/BCS.md similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/docs/BCS.md rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/docs/BCS.md diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/docs/BitVector.md b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/docs/BitVector.md similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/docs/BitVector.md rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/docs/BitVector.md diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/docs/Capability.md b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/docs/Capability.md similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/docs/Capability.md rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/docs/Capability.md diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/docs/Errors.md b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/docs/Errors.md similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/docs/Errors.md rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/docs/Errors.md diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/docs/Event.md b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/docs/Event.md similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/docs/Event.md rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/docs/Event.md diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/docs/FixedPoint32.md b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/docs/FixedPoint32.md similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/docs/FixedPoint32.md rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/docs/FixedPoint32.md diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/docs/GUID.md b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/docs/GUID.md similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/docs/GUID.md rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/docs/GUID.md diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/docs/Hash.md b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/docs/Hash.md similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/docs/Hash.md rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/docs/Hash.md diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/docs/Option.md b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/docs/Option.md similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/docs/Option.md rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/docs/Option.md diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/docs/Signer.md b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/docs/Signer.md similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/docs/Signer.md rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/docs/Signer.md diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/docs/Vector.md b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/docs/Vector.md similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/docs/Vector.md rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/docs/Vector.md diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/docs/overview.md b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/docs/overview.md similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/docs/overview.md rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/docs/overview.md diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/docs/references.md b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/docs/references.md similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/docs/references.md rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/docs/references.md diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/source_maps/ASCII.mvsm b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/source_maps/ASCII.mvsm similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/source_maps/ASCII.mvsm rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/source_maps/ASCII.mvsm diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/source_maps/BCS.mvsm b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/source_maps/BCS.mvsm similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/source_maps/BCS.mvsm rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/source_maps/BCS.mvsm diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/source_maps/BitVector.mvsm b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/source_maps/BitVector.mvsm similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/source_maps/BitVector.mvsm rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/source_maps/BitVector.mvsm diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/source_maps/Capability.mvsm b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/source_maps/Capability.mvsm similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/source_maps/Capability.mvsm rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/source_maps/Capability.mvsm diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/source_maps/Errors.mvsm b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/source_maps/Errors.mvsm similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/source_maps/Errors.mvsm rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/source_maps/Errors.mvsm diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/source_maps/Event.mvsm b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/source_maps/Event.mvsm similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/source_maps/Event.mvsm rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/source_maps/Event.mvsm diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/source_maps/FixedPoint32.mvsm b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/source_maps/FixedPoint32.mvsm similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/source_maps/FixedPoint32.mvsm rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/source_maps/FixedPoint32.mvsm diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/source_maps/GUID.mvsm b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/source_maps/GUID.mvsm similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/source_maps/GUID.mvsm rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/source_maps/GUID.mvsm diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/source_maps/Hash.mvsm b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/source_maps/Hash.mvsm similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/source_maps/Hash.mvsm rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/source_maps/Hash.mvsm diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/source_maps/Option.mvsm b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/source_maps/Option.mvsm similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/source_maps/Option.mvsm rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/source_maps/Option.mvsm diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/source_maps/Signer.mvsm b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/source_maps/Signer.mvsm similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/source_maps/Signer.mvsm rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/source_maps/Signer.mvsm diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/source_maps/Vector.mvsm b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/source_maps/Vector.mvsm similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/source_maps/Vector.mvsm rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/source_maps/Vector.mvsm diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/sources/ASCII.move b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/sources/ASCII.move similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/sources/ASCII.move rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/sources/ASCII.move diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/sources/BCS.move b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/sources/BCS.move similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/sources/BCS.move rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/sources/BCS.move diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/sources/BitVector.move b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/sources/BitVector.move similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/sources/BitVector.move rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/sources/BitVector.move diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/sources/Capability.move b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/sources/Capability.move similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/sources/Capability.move rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/sources/Capability.move diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/sources/Errors.move b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/sources/Errors.move similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/sources/Errors.move rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/sources/Errors.move diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/sources/Event.move b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/sources/Event.move similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/sources/Event.move rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/sources/Event.move diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/sources/FixedPoint32.move b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/sources/FixedPoint32.move similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/sources/FixedPoint32.move rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/sources/FixedPoint32.move diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/sources/GUID.move b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/sources/GUID.move similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/sources/GUID.move rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/sources/GUID.move diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/sources/Hash.move b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/sources/Hash.move similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/sources/Hash.move rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/sources/Hash.move diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/sources/Option.move b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/sources/Option.move similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/sources/Option.move rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/sources/Option.move diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/sources/Signer.move b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/sources/Signer.move similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/sources/Signer.move rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/sources/Signer.move diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/sources/Vector.move b/aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/sources/Vector.move similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/sources/Vector.move rename to aptos-move/diem-framework/DPN/releases/artifacts/current/build/MoveStdlib/sources/Vector.move diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/error_description/error_description.errmap b/aptos-move/diem-framework/DPN/releases/artifacts/current/error_description/error_description.errmap similarity index 100% rename from diem-move/diem-framework/DPN/releases/artifacts/current/error_description/error_description.errmap rename to aptos-move/diem-framework/DPN/releases/artifacts/current/error_description/error_description.errmap diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/transaction_script_builder.rs b/aptos-move/diem-framework/DPN/releases/artifacts/current/transaction_script_builder.rs similarity index 99% rename from diem-move/diem-framework/DPN/releases/artifacts/current/transaction_script_builder.rs rename to aptos-move/diem-framework/DPN/releases/artifacts/current/transaction_script_builder.rs index bcaf53e1a8341..030076a0ad286 100644 --- a/diem-move/diem-framework/DPN/releases/artifacts/current/transaction_script_builder.rs +++ b/aptos-move/diem-framework/DPN/releases/artifacts/current/transaction_script_builder.rs @@ -12,7 +12,7 @@ #![allow(clippy::unnecessary_wraps)] #![allow(unused_imports)] -use diem_types::{ +use aptos_types::{ account_address::AccountAddress, transaction::{Script, ScriptFunction, TransactionArgument, TransactionPayload, VecBytes}, }; @@ -654,7 +654,7 @@ pub enum ScriptCall { /// `DualAttestation::get_cur_microdiem_limit` XDX and `payer` and `payee` are distinct VASPs. /// However, a transaction sender can opt in to dual attestation even when it is not required /// (e.g., a DesignatedDealer -> VASP payment) by providing a non-empty `metadata_signature`. - /// Standardized `metadata` BCS format can be found in `diem_types::transaction::metadata::Metadata`. + /// Standardized `metadata` BCS format can be found in `aptos_types::transaction::metadata::Metadata`. /// /// ## Events /// Successful execution of this script emits two events: @@ -2226,7 +2226,7 @@ pub enum ScriptFunctionCall { /// Transfers `amount` coins of type `Currency` from `payer` to `payee` with (optional) associated /// `metadata`. /// Dual attestation is not applied to this script as payee is also a signer of the transaction. - /// Standardized `metadata` BCS format can be found in `diem_types::transaction::metadata::Metadata`. + /// Standardized `metadata` BCS format can be found in `aptos_types::transaction::metadata::Metadata`. /// /// # Events /// Successful execution of this script emits two events: @@ -2284,7 +2284,7 @@ pub enum ScriptFunctionCall { /// `DualAttestation::get_cur_microdiem_limit` XDX and `payer` and `payee` are distinct VASPs. /// However, a transaction sender can opt in to dual attestation even when it is not required /// (e.g., a DesignatedDealer -> VASP payment) by providing a non-empty `metadata_signature`. - /// Standardized `metadata` BCS format can be found in `diem_types::transaction::metadata::Metadata`. + /// Standardized `metadata` BCS format can be found in `aptos_types::transaction::metadata::Metadata`. /// /// # Events /// Successful execution of this script emits two events: @@ -4769,7 +4769,7 @@ pub fn encode_opt_in_to_crsn_script_function(crsn_size: u64) -> TransactionPaylo /// Transfers `amount` coins of type `Currency` from `payer` to `payee` with (optional) associated /// `metadata`. /// Dual attestation is not applied to this script as payee is also a signer of the transaction. -/// Standardized `metadata` BCS format can be found in `diem_types::transaction::metadata::Metadata`. +/// Standardized `metadata` BCS format can be found in `aptos_types::transaction::metadata::Metadata`. /// /// # Events /// Successful execution of this script emits two events: @@ -4840,7 +4840,7 @@ pub fn encode_peer_to_peer_by_signers_script_function( /// `DualAttestation::get_cur_microdiem_limit` XDX and `payer` and `payee` are distinct VASPs. /// However, a transaction sender can opt in to dual attestation even when it is not required /// (e.g., a DesignatedDealer -> VASP payment) by providing a non-empty `metadata_signature`. -/// Standardized `metadata` BCS format can be found in `diem_types::transaction::metadata::Metadata`. +/// Standardized `metadata` BCS format can be found in `aptos_types::transaction::metadata::Metadata`. /// /// # Events /// Successful execution of this script emits two events: @@ -6770,7 +6770,7 @@ pub fn encode_freeze_account_script( /// `DualAttestation::get_cur_microdiem_limit` XDX and `payer` and `payee` are distinct VASPs. /// However, a transaction sender can opt in to dual attestation even when it is not required /// (e.g., a DesignatedDealer -> VASP payment) by providing a non-empty `metadata_signature`. -/// Standardized `metadata` BCS format can be found in `diem_types::transaction::metadata::Metadata`. +/// Standardized `metadata` BCS format can be found in `aptos_types::transaction::metadata::Metadata`. /// /// ## Events /// Successful execution of this script emits two events: diff --git a/diem-move/diem-framework/DPN/releases/legacy/script_abis/add_currency_to_account.abi b/aptos-move/diem-framework/DPN/releases/legacy/script_abis/add_currency_to_account.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/legacy/script_abis/add_currency_to_account.abi rename to aptos-move/diem-framework/DPN/releases/legacy/script_abis/add_currency_to_account.abi diff --git a/diem-move/diem-framework/DPN/releases/legacy/script_abis/add_recovery_rotation_capability.abi b/aptos-move/diem-framework/DPN/releases/legacy/script_abis/add_recovery_rotation_capability.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/legacy/script_abis/add_recovery_rotation_capability.abi rename to aptos-move/diem-framework/DPN/releases/legacy/script_abis/add_recovery_rotation_capability.abi diff --git a/diem-move/diem-framework/DPN/releases/legacy/script_abis/add_validator_and_reconfigure.abi b/aptos-move/diem-framework/DPN/releases/legacy/script_abis/add_validator_and_reconfigure.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/legacy/script_abis/add_validator_and_reconfigure.abi rename to aptos-move/diem-framework/DPN/releases/legacy/script_abis/add_validator_and_reconfigure.abi diff --git a/diem-move/diem-framework/DPN/releases/legacy/script_abis/burn.abi b/aptos-move/diem-framework/DPN/releases/legacy/script_abis/burn.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/legacy/script_abis/burn.abi rename to aptos-move/diem-framework/DPN/releases/legacy/script_abis/burn.abi diff --git a/diem-move/diem-framework/DPN/releases/legacy/script_abis/burn_txn_fees.abi b/aptos-move/diem-framework/DPN/releases/legacy/script_abis/burn_txn_fees.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/legacy/script_abis/burn_txn_fees.abi rename to aptos-move/diem-framework/DPN/releases/legacy/script_abis/burn_txn_fees.abi diff --git a/diem-move/diem-framework/DPN/releases/legacy/script_abis/cancel_burn.abi b/aptos-move/diem-framework/DPN/releases/legacy/script_abis/cancel_burn.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/legacy/script_abis/cancel_burn.abi rename to aptos-move/diem-framework/DPN/releases/legacy/script_abis/cancel_burn.abi diff --git a/diem-move/diem-framework/DPN/releases/legacy/script_abis/create_child_vasp_account.abi b/aptos-move/diem-framework/DPN/releases/legacy/script_abis/create_child_vasp_account.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/legacy/script_abis/create_child_vasp_account.abi rename to aptos-move/diem-framework/DPN/releases/legacy/script_abis/create_child_vasp_account.abi diff --git a/diem-move/diem-framework/DPN/releases/legacy/script_abis/create_designated_dealer.abi b/aptos-move/diem-framework/DPN/releases/legacy/script_abis/create_designated_dealer.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/legacy/script_abis/create_designated_dealer.abi rename to aptos-move/diem-framework/DPN/releases/legacy/script_abis/create_designated_dealer.abi diff --git a/diem-move/diem-framework/DPN/releases/legacy/script_abis/create_parent_vasp_account.abi b/aptos-move/diem-framework/DPN/releases/legacy/script_abis/create_parent_vasp_account.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/legacy/script_abis/create_parent_vasp_account.abi rename to aptos-move/diem-framework/DPN/releases/legacy/script_abis/create_parent_vasp_account.abi diff --git a/diem-move/diem-framework/DPN/releases/legacy/script_abis/create_recovery_address.abi b/aptos-move/diem-framework/DPN/releases/legacy/script_abis/create_recovery_address.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/legacy/script_abis/create_recovery_address.abi rename to aptos-move/diem-framework/DPN/releases/legacy/script_abis/create_recovery_address.abi diff --git a/diem-move/diem-framework/DPN/releases/legacy/script_abis/create_validator_account.abi b/aptos-move/diem-framework/DPN/releases/legacy/script_abis/create_validator_account.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/legacy/script_abis/create_validator_account.abi rename to aptos-move/diem-framework/DPN/releases/legacy/script_abis/create_validator_account.abi diff --git a/diem-move/diem-framework/DPN/releases/legacy/script_abis/create_validator_operator_account.abi b/aptos-move/diem-framework/DPN/releases/legacy/script_abis/create_validator_operator_account.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/legacy/script_abis/create_validator_operator_account.abi rename to aptos-move/diem-framework/DPN/releases/legacy/script_abis/create_validator_operator_account.abi diff --git a/diem-move/diem-framework/DPN/releases/legacy/script_abis/freeze_account.abi b/aptos-move/diem-framework/DPN/releases/legacy/script_abis/freeze_account.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/legacy/script_abis/freeze_account.abi rename to aptos-move/diem-framework/DPN/releases/legacy/script_abis/freeze_account.abi diff --git a/diem-move/diem-framework/DPN/releases/legacy/script_abis/peer_to_peer_with_metadata.abi b/aptos-move/diem-framework/DPN/releases/legacy/script_abis/peer_to_peer_with_metadata.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/legacy/script_abis/peer_to_peer_with_metadata.abi rename to aptos-move/diem-framework/DPN/releases/legacy/script_abis/peer_to_peer_with_metadata.abi diff --git a/diem-move/diem-framework/DPN/releases/legacy/script_abis/preburn.abi b/aptos-move/diem-framework/DPN/releases/legacy/script_abis/preburn.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/legacy/script_abis/preburn.abi rename to aptos-move/diem-framework/DPN/releases/legacy/script_abis/preburn.abi diff --git a/diem-move/diem-framework/DPN/releases/legacy/script_abis/publish_shared_ed25519_public_key.abi b/aptos-move/diem-framework/DPN/releases/legacy/script_abis/publish_shared_ed25519_public_key.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/legacy/script_abis/publish_shared_ed25519_public_key.abi rename to aptos-move/diem-framework/DPN/releases/legacy/script_abis/publish_shared_ed25519_public_key.abi diff --git a/diem-move/diem-framework/DPN/releases/legacy/script_abis/register_validator_config.abi b/aptos-move/diem-framework/DPN/releases/legacy/script_abis/register_validator_config.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/legacy/script_abis/register_validator_config.abi rename to aptos-move/diem-framework/DPN/releases/legacy/script_abis/register_validator_config.abi diff --git a/diem-move/diem-framework/DPN/releases/legacy/script_abis/remove_validator_and_reconfigure.abi b/aptos-move/diem-framework/DPN/releases/legacy/script_abis/remove_validator_and_reconfigure.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/legacy/script_abis/remove_validator_and_reconfigure.abi rename to aptos-move/diem-framework/DPN/releases/legacy/script_abis/remove_validator_and_reconfigure.abi diff --git a/diem-move/diem-framework/DPN/releases/legacy/script_abis/rotate_authentication_key.abi b/aptos-move/diem-framework/DPN/releases/legacy/script_abis/rotate_authentication_key.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/legacy/script_abis/rotate_authentication_key.abi rename to aptos-move/diem-framework/DPN/releases/legacy/script_abis/rotate_authentication_key.abi diff --git a/diem-move/diem-framework/DPN/releases/legacy/script_abis/rotate_authentication_key_with_nonce.abi b/aptos-move/diem-framework/DPN/releases/legacy/script_abis/rotate_authentication_key_with_nonce.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/legacy/script_abis/rotate_authentication_key_with_nonce.abi rename to aptos-move/diem-framework/DPN/releases/legacy/script_abis/rotate_authentication_key_with_nonce.abi diff --git a/diem-move/diem-framework/DPN/releases/legacy/script_abis/rotate_authentication_key_with_nonce_admin.abi b/aptos-move/diem-framework/DPN/releases/legacy/script_abis/rotate_authentication_key_with_nonce_admin.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/legacy/script_abis/rotate_authentication_key_with_nonce_admin.abi rename to aptos-move/diem-framework/DPN/releases/legacy/script_abis/rotate_authentication_key_with_nonce_admin.abi diff --git a/diem-move/diem-framework/DPN/releases/legacy/script_abis/rotate_authentication_key_with_recovery_address.abi b/aptos-move/diem-framework/DPN/releases/legacy/script_abis/rotate_authentication_key_with_recovery_address.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/legacy/script_abis/rotate_authentication_key_with_recovery_address.abi rename to aptos-move/diem-framework/DPN/releases/legacy/script_abis/rotate_authentication_key_with_recovery_address.abi diff --git a/diem-move/diem-framework/DPN/releases/legacy/script_abis/rotate_dual_attestation_info.abi b/aptos-move/diem-framework/DPN/releases/legacy/script_abis/rotate_dual_attestation_info.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/legacy/script_abis/rotate_dual_attestation_info.abi rename to aptos-move/diem-framework/DPN/releases/legacy/script_abis/rotate_dual_attestation_info.abi diff --git a/diem-move/diem-framework/DPN/releases/legacy/script_abis/rotate_shared_ed25519_public_key.abi b/aptos-move/diem-framework/DPN/releases/legacy/script_abis/rotate_shared_ed25519_public_key.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/legacy/script_abis/rotate_shared_ed25519_public_key.abi rename to aptos-move/diem-framework/DPN/releases/legacy/script_abis/rotate_shared_ed25519_public_key.abi diff --git a/diem-move/diem-framework/DPN/releases/legacy/script_abis/set_validator_config_and_reconfigure.abi b/aptos-move/diem-framework/DPN/releases/legacy/script_abis/set_validator_config_and_reconfigure.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/legacy/script_abis/set_validator_config_and_reconfigure.abi rename to aptos-move/diem-framework/DPN/releases/legacy/script_abis/set_validator_config_and_reconfigure.abi diff --git a/diem-move/diem-framework/DPN/releases/legacy/script_abis/set_validator_operator.abi b/aptos-move/diem-framework/DPN/releases/legacy/script_abis/set_validator_operator.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/legacy/script_abis/set_validator_operator.abi rename to aptos-move/diem-framework/DPN/releases/legacy/script_abis/set_validator_operator.abi diff --git a/diem-move/diem-framework/DPN/releases/legacy/script_abis/set_validator_operator_with_nonce_admin.abi b/aptos-move/diem-framework/DPN/releases/legacy/script_abis/set_validator_operator_with_nonce_admin.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/legacy/script_abis/set_validator_operator_with_nonce_admin.abi rename to aptos-move/diem-framework/DPN/releases/legacy/script_abis/set_validator_operator_with_nonce_admin.abi diff --git a/diem-move/diem-framework/DPN/releases/legacy/script_abis/tiered_mint.abi b/aptos-move/diem-framework/DPN/releases/legacy/script_abis/tiered_mint.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/legacy/script_abis/tiered_mint.abi rename to aptos-move/diem-framework/DPN/releases/legacy/script_abis/tiered_mint.abi diff --git a/diem-move/diem-framework/DPN/releases/legacy/script_abis/unfreeze_account.abi b/aptos-move/diem-framework/DPN/releases/legacy/script_abis/unfreeze_account.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/legacy/script_abis/unfreeze_account.abi rename to aptos-move/diem-framework/DPN/releases/legacy/script_abis/unfreeze_account.abi diff --git a/diem-move/diem-framework/DPN/releases/legacy/script_abis/update_diem_version.abi b/aptos-move/diem-framework/DPN/releases/legacy/script_abis/update_diem_version.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/legacy/script_abis/update_diem_version.abi rename to aptos-move/diem-framework/DPN/releases/legacy/script_abis/update_diem_version.abi diff --git a/diem-move/diem-framework/DPN/releases/legacy/script_abis/update_dual_attestation_limit.abi b/aptos-move/diem-framework/DPN/releases/legacy/script_abis/update_dual_attestation_limit.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/legacy/script_abis/update_dual_attestation_limit.abi rename to aptos-move/diem-framework/DPN/releases/legacy/script_abis/update_dual_attestation_limit.abi diff --git a/diem-move/diem-framework/DPN/releases/legacy/script_abis/update_exchange_rate.abi b/aptos-move/diem-framework/DPN/releases/legacy/script_abis/update_exchange_rate.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/legacy/script_abis/update_exchange_rate.abi rename to aptos-move/diem-framework/DPN/releases/legacy/script_abis/update_exchange_rate.abi diff --git a/diem-move/diem-framework/DPN/releases/legacy/script_abis/update_minting_ability.abi b/aptos-move/diem-framework/DPN/releases/legacy/script_abis/update_minting_ability.abi similarity index 100% rename from diem-move/diem-framework/DPN/releases/legacy/script_abis/update_minting_ability.abi rename to aptos-move/diem-framework/DPN/releases/legacy/script_abis/update_minting_ability.abi diff --git a/diem-move/diem-framework/DPN/releases/legacy/scripts/add_currency_to_account.mv b/aptos-move/diem-framework/DPN/releases/legacy/scripts/add_currency_to_account.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/legacy/scripts/add_currency_to_account.mv rename to aptos-move/diem-framework/DPN/releases/legacy/scripts/add_currency_to_account.mv diff --git a/diem-move/diem-framework/DPN/releases/legacy/scripts/add_recovery_rotation_capability.mv b/aptos-move/diem-framework/DPN/releases/legacy/scripts/add_recovery_rotation_capability.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/legacy/scripts/add_recovery_rotation_capability.mv rename to aptos-move/diem-framework/DPN/releases/legacy/scripts/add_recovery_rotation_capability.mv diff --git a/diem-move/diem-framework/DPN/releases/legacy/scripts/add_validator_and_reconfigure.mv b/aptos-move/diem-framework/DPN/releases/legacy/scripts/add_validator_and_reconfigure.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/legacy/scripts/add_validator_and_reconfigure.mv rename to aptos-move/diem-framework/DPN/releases/legacy/scripts/add_validator_and_reconfigure.mv diff --git a/diem-move/diem-framework/DPN/releases/legacy/scripts/burn.mv b/aptos-move/diem-framework/DPN/releases/legacy/scripts/burn.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/legacy/scripts/burn.mv rename to aptos-move/diem-framework/DPN/releases/legacy/scripts/burn.mv diff --git a/diem-move/diem-framework/DPN/releases/legacy/scripts/burn_txn_fees.mv b/aptos-move/diem-framework/DPN/releases/legacy/scripts/burn_txn_fees.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/legacy/scripts/burn_txn_fees.mv rename to aptos-move/diem-framework/DPN/releases/legacy/scripts/burn_txn_fees.mv diff --git a/diem-move/diem-framework/DPN/releases/legacy/scripts/cancel_burn.mv b/aptos-move/diem-framework/DPN/releases/legacy/scripts/cancel_burn.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/legacy/scripts/cancel_burn.mv rename to aptos-move/diem-framework/DPN/releases/legacy/scripts/cancel_burn.mv diff --git a/diem-move/diem-framework/DPN/releases/legacy/scripts/create_child_vasp_account.mv b/aptos-move/diem-framework/DPN/releases/legacy/scripts/create_child_vasp_account.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/legacy/scripts/create_child_vasp_account.mv rename to aptos-move/diem-framework/DPN/releases/legacy/scripts/create_child_vasp_account.mv diff --git a/diem-move/diem-framework/DPN/releases/legacy/scripts/create_designated_dealer.mv b/aptos-move/diem-framework/DPN/releases/legacy/scripts/create_designated_dealer.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/legacy/scripts/create_designated_dealer.mv rename to aptos-move/diem-framework/DPN/releases/legacy/scripts/create_designated_dealer.mv diff --git a/diem-move/diem-framework/DPN/releases/legacy/scripts/create_parent_vasp_account.mv b/aptos-move/diem-framework/DPN/releases/legacy/scripts/create_parent_vasp_account.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/legacy/scripts/create_parent_vasp_account.mv rename to aptos-move/diem-framework/DPN/releases/legacy/scripts/create_parent_vasp_account.mv diff --git a/diem-move/diem-framework/DPN/releases/legacy/scripts/create_recovery_address.mv b/aptos-move/diem-framework/DPN/releases/legacy/scripts/create_recovery_address.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/legacy/scripts/create_recovery_address.mv rename to aptos-move/diem-framework/DPN/releases/legacy/scripts/create_recovery_address.mv diff --git a/diem-move/diem-framework/DPN/releases/legacy/scripts/create_validator_account.mv b/aptos-move/diem-framework/DPN/releases/legacy/scripts/create_validator_account.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/legacy/scripts/create_validator_account.mv rename to aptos-move/diem-framework/DPN/releases/legacy/scripts/create_validator_account.mv diff --git a/diem-move/diem-framework/DPN/releases/legacy/scripts/create_validator_operator_account.mv b/aptos-move/diem-framework/DPN/releases/legacy/scripts/create_validator_operator_account.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/legacy/scripts/create_validator_operator_account.mv rename to aptos-move/diem-framework/DPN/releases/legacy/scripts/create_validator_operator_account.mv diff --git a/diem-move/diem-framework/DPN/releases/legacy/scripts/freeze_account.mv b/aptos-move/diem-framework/DPN/releases/legacy/scripts/freeze_account.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/legacy/scripts/freeze_account.mv rename to aptos-move/diem-framework/DPN/releases/legacy/scripts/freeze_account.mv diff --git a/diem-move/diem-framework/DPN/releases/legacy/scripts/peer_to_peer_with_metadata.mv b/aptos-move/diem-framework/DPN/releases/legacy/scripts/peer_to_peer_with_metadata.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/legacy/scripts/peer_to_peer_with_metadata.mv rename to aptos-move/diem-framework/DPN/releases/legacy/scripts/peer_to_peer_with_metadata.mv diff --git a/diem-move/diem-framework/DPN/releases/legacy/scripts/preburn.mv b/aptos-move/diem-framework/DPN/releases/legacy/scripts/preburn.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/legacy/scripts/preburn.mv rename to aptos-move/diem-framework/DPN/releases/legacy/scripts/preburn.mv diff --git a/diem-move/diem-framework/DPN/releases/legacy/scripts/publish_shared_ed25519_public_key.mv b/aptos-move/diem-framework/DPN/releases/legacy/scripts/publish_shared_ed25519_public_key.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/legacy/scripts/publish_shared_ed25519_public_key.mv rename to aptos-move/diem-framework/DPN/releases/legacy/scripts/publish_shared_ed25519_public_key.mv diff --git a/diem-move/diem-framework/DPN/releases/legacy/scripts/register_validator_config.mv b/aptos-move/diem-framework/DPN/releases/legacy/scripts/register_validator_config.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/legacy/scripts/register_validator_config.mv rename to aptos-move/diem-framework/DPN/releases/legacy/scripts/register_validator_config.mv diff --git a/diem-move/diem-framework/DPN/releases/legacy/scripts/remove_validator_and_reconfigure.mv b/aptos-move/diem-framework/DPN/releases/legacy/scripts/remove_validator_and_reconfigure.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/legacy/scripts/remove_validator_and_reconfigure.mv rename to aptos-move/diem-framework/DPN/releases/legacy/scripts/remove_validator_and_reconfigure.mv diff --git a/diem-move/diem-framework/DPN/releases/legacy/scripts/rotate_authentication_key.mv b/aptos-move/diem-framework/DPN/releases/legacy/scripts/rotate_authentication_key.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/legacy/scripts/rotate_authentication_key.mv rename to aptos-move/diem-framework/DPN/releases/legacy/scripts/rotate_authentication_key.mv diff --git a/diem-move/diem-framework/DPN/releases/legacy/scripts/rotate_authentication_key_with_nonce.mv b/aptos-move/diem-framework/DPN/releases/legacy/scripts/rotate_authentication_key_with_nonce.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/legacy/scripts/rotate_authentication_key_with_nonce.mv rename to aptos-move/diem-framework/DPN/releases/legacy/scripts/rotate_authentication_key_with_nonce.mv diff --git a/diem-move/diem-framework/DPN/releases/legacy/scripts/rotate_authentication_key_with_nonce_admin.mv b/aptos-move/diem-framework/DPN/releases/legacy/scripts/rotate_authentication_key_with_nonce_admin.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/legacy/scripts/rotate_authentication_key_with_nonce_admin.mv rename to aptos-move/diem-framework/DPN/releases/legacy/scripts/rotate_authentication_key_with_nonce_admin.mv diff --git a/diem-move/diem-framework/DPN/releases/legacy/scripts/rotate_authentication_key_with_recovery_address.mv b/aptos-move/diem-framework/DPN/releases/legacy/scripts/rotate_authentication_key_with_recovery_address.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/legacy/scripts/rotate_authentication_key_with_recovery_address.mv rename to aptos-move/diem-framework/DPN/releases/legacy/scripts/rotate_authentication_key_with_recovery_address.mv diff --git a/diem-move/diem-framework/DPN/releases/legacy/scripts/rotate_dual_attestation_info.mv b/aptos-move/diem-framework/DPN/releases/legacy/scripts/rotate_dual_attestation_info.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/legacy/scripts/rotate_dual_attestation_info.mv rename to aptos-move/diem-framework/DPN/releases/legacy/scripts/rotate_dual_attestation_info.mv diff --git a/diem-move/diem-framework/DPN/releases/legacy/scripts/rotate_shared_ed25519_public_key.mv b/aptos-move/diem-framework/DPN/releases/legacy/scripts/rotate_shared_ed25519_public_key.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/legacy/scripts/rotate_shared_ed25519_public_key.mv rename to aptos-move/diem-framework/DPN/releases/legacy/scripts/rotate_shared_ed25519_public_key.mv diff --git a/diem-move/diem-framework/DPN/releases/legacy/scripts/set_validator_config_and_reconfigure.mv b/aptos-move/diem-framework/DPN/releases/legacy/scripts/set_validator_config_and_reconfigure.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/legacy/scripts/set_validator_config_and_reconfigure.mv rename to aptos-move/diem-framework/DPN/releases/legacy/scripts/set_validator_config_and_reconfigure.mv diff --git a/diem-move/diem-framework/DPN/releases/legacy/scripts/set_validator_operator.mv b/aptos-move/diem-framework/DPN/releases/legacy/scripts/set_validator_operator.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/legacy/scripts/set_validator_operator.mv rename to aptos-move/diem-framework/DPN/releases/legacy/scripts/set_validator_operator.mv diff --git a/diem-move/diem-framework/DPN/releases/legacy/scripts/set_validator_operator_with_nonce_admin.mv b/aptos-move/diem-framework/DPN/releases/legacy/scripts/set_validator_operator_with_nonce_admin.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/legacy/scripts/set_validator_operator_with_nonce_admin.mv rename to aptos-move/diem-framework/DPN/releases/legacy/scripts/set_validator_operator_with_nonce_admin.mv diff --git a/diem-move/diem-framework/DPN/releases/legacy/scripts/tiered_mint.mv b/aptos-move/diem-framework/DPN/releases/legacy/scripts/tiered_mint.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/legacy/scripts/tiered_mint.mv rename to aptos-move/diem-framework/DPN/releases/legacy/scripts/tiered_mint.mv diff --git a/diem-move/diem-framework/DPN/releases/legacy/scripts/unfreeze_account.mv b/aptos-move/diem-framework/DPN/releases/legacy/scripts/unfreeze_account.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/legacy/scripts/unfreeze_account.mv rename to aptos-move/diem-framework/DPN/releases/legacy/scripts/unfreeze_account.mv diff --git a/diem-move/diem-framework/DPN/releases/legacy/scripts/update_diem_version.mv b/aptos-move/diem-framework/DPN/releases/legacy/scripts/update_diem_version.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/legacy/scripts/update_diem_version.mv rename to aptos-move/diem-framework/DPN/releases/legacy/scripts/update_diem_version.mv diff --git a/diem-move/diem-framework/DPN/releases/legacy/scripts/update_dual_attestation_limit.mv b/aptos-move/diem-framework/DPN/releases/legacy/scripts/update_dual_attestation_limit.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/legacy/scripts/update_dual_attestation_limit.mv rename to aptos-move/diem-framework/DPN/releases/legacy/scripts/update_dual_attestation_limit.mv diff --git a/diem-move/diem-framework/DPN/releases/legacy/scripts/update_exchange_rate.mv b/aptos-move/diem-framework/DPN/releases/legacy/scripts/update_exchange_rate.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/legacy/scripts/update_exchange_rate.mv rename to aptos-move/diem-framework/DPN/releases/legacy/scripts/update_exchange_rate.mv diff --git a/diem-move/diem-framework/DPN/releases/legacy/scripts/update_minting_ability.mv b/aptos-move/diem-framework/DPN/releases/legacy/scripts/update_minting_ability.mv similarity index 100% rename from diem-move/diem-framework/DPN/releases/legacy/scripts/update_minting_ability.mv rename to aptos-move/diem-framework/DPN/releases/legacy/scripts/update_minting_ability.mv diff --git a/diem-move/diem-framework/DPN/releases/src/legacy/mod.rs b/aptos-move/diem-framework/DPN/releases/src/legacy/mod.rs similarity index 100% rename from diem-move/diem-framework/DPN/releases/src/legacy/mod.rs rename to aptos-move/diem-framework/DPN/releases/src/legacy/mod.rs diff --git a/diem-move/diem-framework/DPN/releases/src/legacy/transaction_scripts.rs b/aptos-move/diem-framework/DPN/releases/src/legacy/transaction_scripts.rs similarity index 96% rename from diem-move/diem-framework/DPN/releases/src/legacy/transaction_scripts.rs rename to aptos-move/diem-framework/DPN/releases/src/legacy/transaction_scripts.rs index 1a6dc2212e93b..1cc6318a24d6f 100644 --- a/diem-move/diem-framework/DPN/releases/src/legacy/transaction_scripts.rs +++ b/aptos-move/diem-framework/DPN/releases/src/legacy/transaction_scripts.rs @@ -8,8 +8,8 @@ //! on. use anyhow::{anyhow, Error, Result}; -use diem_crypto::HashValue; -use diem_types::transaction::{ScriptABI, TransactionScriptABI}; +use aptos_crypto::HashValue; +use aptos_types::transaction::{ScriptABI, TransactionScriptABI}; use include_dir::{include_dir, Dir}; use std::{convert::TryFrom, fmt, path::PathBuf}; @@ -271,7 +271,7 @@ mod test { assert_eq!( script.name(), script.abi().name(), - "The main function in diem-move/diem-framework/transaction_scripts/{}.move is named `{}` instead of `{}`.", + "The main function in aptos-move/diem-framework/transaction_scripts/{}.move is named `{}` instead of `{}`.", script.name(), script.abi().name(), script.name(), @@ -285,7 +285,7 @@ mod test { for script in LegacyStdlibScript::all() { assert!( !script.abi().doc().is_empty(), - "The main function in diem-move/diem-framework/transaction_scripts/{}.move does not have a `///` inline doc comment.", + "The main function in aptos-move/diem-framework/transaction_scripts/{}.move does not have a `///` inline doc comment.", script.name(), ); } diff --git a/diem-move/diem-framework/DPN/releases/src/lib.rs b/aptos-move/diem-framework/DPN/releases/src/lib.rs similarity index 98% rename from diem-move/diem-framework/DPN/releases/src/lib.rs rename to aptos-move/diem-framework/DPN/releases/src/lib.rs index 301684f921715..69b14c8360436 100644 --- a/diem-move/diem-framework/DPN/releases/src/lib.rs +++ b/aptos-move/diem-framework/DPN/releases/src/lib.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 use anyhow::Result; -use diem_types::transaction::ScriptFunction; +use aptos_types::transaction::ScriptFunction; use framework_releases::{Release, ReleaseFetcher}; use move_binary_format::file_format::CompiledModule; use move_command_line_common::files::{extension_equals, find_filenames, MOVE_COMPILED_EXTENSION}; diff --git a/diem-move/diem-framework/DPN/releases/src/tests.rs b/aptos-move/diem-framework/DPN/releases/src/tests.rs similarity index 100% rename from diem-move/diem-framework/DPN/releases/src/tests.rs rename to aptos-move/diem-framework/DPN/releases/src/tests.rs diff --git a/diem-move/diem-framework/DPN/sources/AccountAdministrationScripts.move b/aptos-move/diem-framework/DPN/sources/AccountAdministrationScripts.move similarity index 100% rename from diem-move/diem-framework/DPN/sources/AccountAdministrationScripts.move rename to aptos-move/diem-framework/DPN/sources/AccountAdministrationScripts.move diff --git a/diem-move/diem-framework/DPN/sources/AccountCreationScripts.move b/aptos-move/diem-framework/DPN/sources/AccountCreationScripts.move similarity index 100% rename from diem-move/diem-framework/DPN/sources/AccountCreationScripts.move rename to aptos-move/diem-framework/DPN/sources/AccountCreationScripts.move diff --git a/diem-move/diem-framework/DPN/sources/AccountFreezing.move b/aptos-move/diem-framework/DPN/sources/AccountFreezing.move similarity index 100% rename from diem-move/diem-framework/DPN/sources/AccountFreezing.move rename to aptos-move/diem-framework/DPN/sources/AccountFreezing.move diff --git a/diem-move/diem-framework/DPN/sources/AccountLimits.move b/aptos-move/diem-framework/DPN/sources/AccountLimits.move similarity index 100% rename from diem-move/diem-framework/DPN/sources/AccountLimits.move rename to aptos-move/diem-framework/DPN/sources/AccountLimits.move diff --git a/diem-move/diem-framework/DPN/sources/Authenticator.move b/aptos-move/diem-framework/DPN/sources/Authenticator.move similarity index 100% rename from diem-move/diem-framework/DPN/sources/Authenticator.move rename to aptos-move/diem-framework/DPN/sources/Authenticator.move diff --git a/diem-move/diem-framework/DPN/sources/CRSN.move b/aptos-move/diem-framework/DPN/sources/CRSN.move similarity index 100% rename from diem-move/diem-framework/DPN/sources/CRSN.move rename to aptos-move/diem-framework/DPN/sources/CRSN.move diff --git a/diem-move/diem-framework/DPN/sources/ChainId.move b/aptos-move/diem-framework/DPN/sources/ChainId.move similarity index 100% rename from diem-move/diem-framework/DPN/sources/ChainId.move rename to aptos-move/diem-framework/DPN/sources/ChainId.move diff --git a/diem-move/diem-framework/DPN/sources/CoreAddresses.move b/aptos-move/diem-framework/DPN/sources/CoreAddresses.move similarity index 100% rename from diem-move/diem-framework/DPN/sources/CoreAddresses.move rename to aptos-move/diem-framework/DPN/sources/CoreAddresses.move diff --git a/diem-move/diem-framework/DPN/sources/DesignatedDealer.move b/aptos-move/diem-framework/DPN/sources/DesignatedDealer.move similarity index 100% rename from diem-move/diem-framework/DPN/sources/DesignatedDealer.move rename to aptos-move/diem-framework/DPN/sources/DesignatedDealer.move diff --git a/diem-move/diem-framework/DPN/sources/Diem.move b/aptos-move/diem-framework/DPN/sources/Diem.move similarity index 100% rename from diem-move/diem-framework/DPN/sources/Diem.move rename to aptos-move/diem-framework/DPN/sources/Diem.move diff --git a/diem-move/diem-framework/DPN/sources/DiemAccount.move b/aptos-move/diem-framework/DPN/sources/DiemAccount.move similarity index 100% rename from diem-move/diem-framework/DPN/sources/DiemAccount.move rename to aptos-move/diem-framework/DPN/sources/DiemAccount.move diff --git a/diem-move/diem-framework/DPN/sources/DiemBlock.move b/aptos-move/diem-framework/DPN/sources/DiemBlock.move similarity index 100% rename from diem-move/diem-framework/DPN/sources/DiemBlock.move rename to aptos-move/diem-framework/DPN/sources/DiemBlock.move diff --git a/diem-move/diem-framework/DPN/sources/DiemConfig.move b/aptos-move/diem-framework/DPN/sources/DiemConfig.move similarity index 100% rename from diem-move/diem-framework/DPN/sources/DiemConfig.move rename to aptos-move/diem-framework/DPN/sources/DiemConfig.move diff --git a/diem-move/diem-framework/DPN/sources/DiemConsensusConfig.move b/aptos-move/diem-framework/DPN/sources/DiemConsensusConfig.move similarity index 100% rename from diem-move/diem-framework/DPN/sources/DiemConsensusConfig.move rename to aptos-move/diem-framework/DPN/sources/DiemConsensusConfig.move diff --git a/diem-move/diem-framework/DPN/sources/DiemId.move b/aptos-move/diem-framework/DPN/sources/DiemId.move similarity index 100% rename from diem-move/diem-framework/DPN/sources/DiemId.move rename to aptos-move/diem-framework/DPN/sources/DiemId.move diff --git a/diem-move/diem-framework/DPN/sources/DiemSystem.move b/aptos-move/diem-framework/DPN/sources/DiemSystem.move similarity index 100% rename from diem-move/diem-framework/DPN/sources/DiemSystem.move rename to aptos-move/diem-framework/DPN/sources/DiemSystem.move diff --git a/diem-move/diem-framework/DPN/sources/DiemTimestamp.move b/aptos-move/diem-framework/DPN/sources/DiemTimestamp.move similarity index 100% rename from diem-move/diem-framework/DPN/sources/DiemTimestamp.move rename to aptos-move/diem-framework/DPN/sources/DiemTimestamp.move diff --git a/diem-move/diem-framework/DPN/sources/DiemTransactionPublishingOption.move b/aptos-move/diem-framework/DPN/sources/DiemTransactionPublishingOption.move similarity index 100% rename from diem-move/diem-framework/DPN/sources/DiemTransactionPublishingOption.move rename to aptos-move/diem-framework/DPN/sources/DiemTransactionPublishingOption.move diff --git a/diem-move/diem-framework/DPN/sources/DiemVMConfig.move b/aptos-move/diem-framework/DPN/sources/DiemVMConfig.move similarity index 100% rename from diem-move/diem-framework/DPN/sources/DiemVMConfig.move rename to aptos-move/diem-framework/DPN/sources/DiemVMConfig.move diff --git a/diem-move/diem-framework/DPN/sources/DiemVersion.move b/aptos-move/diem-framework/DPN/sources/DiemVersion.move similarity index 100% rename from diem-move/diem-framework/DPN/sources/DiemVersion.move rename to aptos-move/diem-framework/DPN/sources/DiemVersion.move diff --git a/diem-move/diem-framework/DPN/sources/DualAttestation.move b/aptos-move/diem-framework/DPN/sources/DualAttestation.move similarity index 100% rename from diem-move/diem-framework/DPN/sources/DualAttestation.move rename to aptos-move/diem-framework/DPN/sources/DualAttestation.move diff --git a/diem-move/diem-framework/DPN/sources/Genesis.move b/aptos-move/diem-framework/DPN/sources/Genesis.move similarity index 100% rename from diem-move/diem-framework/DPN/sources/Genesis.move rename to aptos-move/diem-framework/DPN/sources/Genesis.move diff --git a/diem-move/diem-framework/DPN/sources/NetworkIdentity.move b/aptos-move/diem-framework/DPN/sources/NetworkIdentity.move similarity index 100% rename from diem-move/diem-framework/DPN/sources/NetworkIdentity.move rename to aptos-move/diem-framework/DPN/sources/NetworkIdentity.move diff --git a/diem-move/diem-framework/DPN/sources/ParallelExecutionConfig.move b/aptos-move/diem-framework/DPN/sources/ParallelExecutionConfig.move similarity index 100% rename from diem-move/diem-framework/DPN/sources/ParallelExecutionConfig.move rename to aptos-move/diem-framework/DPN/sources/ParallelExecutionConfig.move diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/PaymentScripts.move b/aptos-move/diem-framework/DPN/sources/PaymentScripts.move similarity index 98% rename from diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/PaymentScripts.move rename to aptos-move/diem-framework/DPN/sources/PaymentScripts.move index 88e5826d51bdf..802d1d9af7685 100644 --- a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/sources/PaymentScripts.move +++ b/aptos-move/diem-framework/DPN/sources/PaymentScripts.move @@ -25,7 +25,7 @@ module DiemFramework::PaymentScripts { /// `DualAttestation::get_cur_microdiem_limit` XDX and `payer` and `payee` are distinct VASPs. /// However, a transaction sender can opt in to dual attestation even when it is not required /// (e.g., a DesignatedDealer -> VASP payment) by providing a non-empty `metadata_signature`. - /// Standardized `metadata` BCS format can be found in `diem_types::transaction::metadata::Metadata`. + /// Standardized `metadata` BCS format can be found in `aptos_types::transaction::metadata::Metadata`. /// /// # Events /// Successful execution of this script emits two events: @@ -87,7 +87,7 @@ module DiemFramework::PaymentScripts { /// Transfers `amount` coins of type `Currency` from `payer` to `payee` with (optional) associated /// `metadata`. /// Dual attestation is not applied to this script as payee is also a signer of the transaction. - /// Standardized `metadata` BCS format can be found in `diem_types::transaction::metadata::Metadata`. + /// Standardized `metadata` BCS format can be found in `aptos_types::transaction::metadata::Metadata`. /// /// # Events /// Successful execution of this script emits two events: diff --git a/diem-move/diem-framework/DPN/sources/README b/aptos-move/diem-framework/DPN/sources/README similarity index 100% rename from diem-move/diem-framework/DPN/sources/README rename to aptos-move/diem-framework/DPN/sources/README diff --git a/diem-move/diem-framework/DPN/sources/RecoveryAddress.move b/aptos-move/diem-framework/DPN/sources/RecoveryAddress.move similarity index 100% rename from diem-move/diem-framework/DPN/sources/RecoveryAddress.move rename to aptos-move/diem-framework/DPN/sources/RecoveryAddress.move diff --git a/diem-move/diem-framework/DPN/sources/RegisteredCurrencies.move b/aptos-move/diem-framework/DPN/sources/RegisteredCurrencies.move similarity index 100% rename from diem-move/diem-framework/DPN/sources/RegisteredCurrencies.move rename to aptos-move/diem-framework/DPN/sources/RegisteredCurrencies.move diff --git a/diem-move/diem-framework/DPN/sources/Roles.move b/aptos-move/diem-framework/DPN/sources/Roles.move similarity index 100% rename from diem-move/diem-framework/DPN/sources/Roles.move rename to aptos-move/diem-framework/DPN/sources/Roles.move diff --git a/diem-move/diem-framework/DPN/sources/SharedEd25519PublicKey.move b/aptos-move/diem-framework/DPN/sources/SharedEd25519PublicKey.move similarity index 100% rename from diem-move/diem-framework/DPN/sources/SharedEd25519PublicKey.move rename to aptos-move/diem-framework/DPN/sources/SharedEd25519PublicKey.move diff --git a/diem-move/diem-framework/DPN/sources/Signature.move b/aptos-move/diem-framework/DPN/sources/Signature.move similarity index 96% rename from diem-move/diem-framework/DPN/sources/Signature.move rename to aptos-move/diem-framework/DPN/sources/Signature.move index df6996b40871b..2b501cfca6d01 100644 --- a/diem-move/diem-framework/DPN/sources/Signature.move +++ b/aptos-move/diem-framework/DPN/sources/Signature.move @@ -3,7 +3,7 @@ module DiemFramework::Signature { /// Return `true` if the bytes in `public_key` can be parsed as a valid Ed25519 public key. /// Returns `false` if `public_key` is not 32 bytes OR is 32 bytes, but does not pass - /// points-on-curve or small subgroup checks. See the Rust `diem_crypto::Ed25519PublicKey` type + /// points-on-curve or small subgroup checks. See the Rust `aptos_crypto::Ed25519PublicKey` type /// for more details. /// Does not abort. native public fun ed25519_validate_pubkey(public_key: vector): bool; diff --git a/diem-move/diem-framework/DPN/sources/SlidingNonce.move b/aptos-move/diem-framework/DPN/sources/SlidingNonce.move similarity index 100% rename from diem-move/diem-framework/DPN/sources/SlidingNonce.move rename to aptos-move/diem-framework/DPN/sources/SlidingNonce.move diff --git a/diem-move/diem-framework/DPN/sources/SystemAdministrationScripts.move b/aptos-move/diem-framework/DPN/sources/SystemAdministrationScripts.move similarity index 100% rename from diem-move/diem-framework/DPN/sources/SystemAdministrationScripts.move rename to aptos-move/diem-framework/DPN/sources/SystemAdministrationScripts.move diff --git a/diem-move/diem-framework/DPN/sources/TransactionFee.move b/aptos-move/diem-framework/DPN/sources/TransactionFee.move similarity index 100% rename from diem-move/diem-framework/DPN/sources/TransactionFee.move rename to aptos-move/diem-framework/DPN/sources/TransactionFee.move diff --git a/diem-move/diem-framework/DPN/sources/TreasuryComplianceScripts.move b/aptos-move/diem-framework/DPN/sources/TreasuryComplianceScripts.move similarity index 100% rename from diem-move/diem-framework/DPN/sources/TreasuryComplianceScripts.move rename to aptos-move/diem-framework/DPN/sources/TreasuryComplianceScripts.move diff --git a/diem-move/diem-framework/DPN/sources/VASP.move b/aptos-move/diem-framework/DPN/sources/VASP.move similarity index 100% rename from diem-move/diem-framework/DPN/sources/VASP.move rename to aptos-move/diem-framework/DPN/sources/VASP.move diff --git a/diem-move/diem-framework/DPN/sources/VASPDomain.move b/aptos-move/diem-framework/DPN/sources/VASPDomain.move similarity index 100% rename from diem-move/diem-framework/DPN/sources/VASPDomain.move rename to aptos-move/diem-framework/DPN/sources/VASPDomain.move diff --git a/diem-move/diem-framework/DPN/sources/ValidatorAdministrationScripts.move b/aptos-move/diem-framework/DPN/sources/ValidatorAdministrationScripts.move similarity index 100% rename from diem-move/diem-framework/DPN/sources/ValidatorAdministrationScripts.move rename to aptos-move/diem-framework/DPN/sources/ValidatorAdministrationScripts.move diff --git a/diem-move/diem-framework/DPN/sources/ValidatorConfig.move b/aptos-move/diem-framework/DPN/sources/ValidatorConfig.move similarity index 100% rename from diem-move/diem-framework/DPN/sources/ValidatorConfig.move rename to aptos-move/diem-framework/DPN/sources/ValidatorConfig.move diff --git a/diem-move/diem-framework/DPN/sources/ValidatorOperatorConfig.move b/aptos-move/diem-framework/DPN/sources/ValidatorOperatorConfig.move similarity index 100% rename from diem-move/diem-framework/DPN/sources/ValidatorOperatorConfig.move rename to aptos-move/diem-framework/DPN/sources/ValidatorOperatorConfig.move diff --git a/diem-move/diem-framework/DPN/sources/XDX.move b/aptos-move/diem-framework/DPN/sources/XDX.move similarity index 100% rename from diem-move/diem-framework/DPN/sources/XDX.move rename to aptos-move/diem-framework/DPN/sources/XDX.move diff --git a/diem-move/diem-framework/DPN/sources/XUS.move b/aptos-move/diem-framework/DPN/sources/XUS.move similarity index 100% rename from diem-move/diem-framework/DPN/sources/XUS.move rename to aptos-move/diem-framework/DPN/sources/XUS.move diff --git a/diem-move/diem-framework/DPN/tests/AccountFreezingTests.move b/aptos-move/diem-framework/DPN/tests/AccountFreezingTests.move similarity index 100% rename from diem-move/diem-framework/DPN/tests/AccountFreezingTests.move rename to aptos-move/diem-framework/DPN/tests/AccountFreezingTests.move diff --git a/diem-move/diem-framework/DPN/tests/AccountLimits.move b/aptos-move/diem-framework/DPN/tests/AccountLimits.move similarity index 100% rename from diem-move/diem-framework/DPN/tests/AccountLimits.move rename to aptos-move/diem-framework/DPN/tests/AccountLimits.move diff --git a/diem-move/diem-framework/DPN/tests/AuthenticatorTests.move b/aptos-move/diem-framework/DPN/tests/AuthenticatorTests.move similarity index 100% rename from diem-move/diem-framework/DPN/tests/AuthenticatorTests.move rename to aptos-move/diem-framework/DPN/tests/AuthenticatorTests.move diff --git a/diem-move/diem-framework/DPN/tests/CRSNTests.move b/aptos-move/diem-framework/DPN/tests/CRSNTests.move similarity index 100% rename from diem-move/diem-framework/DPN/tests/CRSNTests.move rename to aptos-move/diem-framework/DPN/tests/CRSNTests.move diff --git a/diem-move/diem-framework/DPN/tests/CoreAddressesTests.move b/aptos-move/diem-framework/DPN/tests/CoreAddressesTests.move similarity index 100% rename from diem-move/diem-framework/DPN/tests/CoreAddressesTests.move rename to aptos-move/diem-framework/DPN/tests/CoreAddressesTests.move diff --git a/diem-move/diem-framework/DPN/tests/CurrenciesTests.move b/aptos-move/diem-framework/DPN/tests/CurrenciesTests.move similarity index 100% rename from diem-move/diem-framework/DPN/tests/CurrenciesTests.move rename to aptos-move/diem-framework/DPN/tests/CurrenciesTests.move diff --git a/diem-move/diem-framework/DPN/tests/DiemBlockTests.move b/aptos-move/diem-framework/DPN/tests/DiemBlockTests.move similarity index 100% rename from diem-move/diem-framework/DPN/tests/DiemBlockTests.move rename to aptos-move/diem-framework/DPN/tests/DiemBlockTests.move diff --git a/diem-move/diem-framework/DPN/tests/DiemConfigTests.move b/aptos-move/diem-framework/DPN/tests/DiemConfigTests.move similarity index 100% rename from diem-move/diem-framework/DPN/tests/DiemConfigTests.move rename to aptos-move/diem-framework/DPN/tests/DiemConfigTests.move diff --git a/diem-move/diem-framework/DPN/tests/DiemTests.move b/aptos-move/diem-framework/DPN/tests/DiemTests.move similarity index 100% rename from diem-move/diem-framework/DPN/tests/DiemTests.move rename to aptos-move/diem-framework/DPN/tests/DiemTests.move diff --git a/diem-move/diem-framework/DPN/tests/DiemTimestampTests.move b/aptos-move/diem-framework/DPN/tests/DiemTimestampTests.move similarity index 100% rename from diem-move/diem-framework/DPN/tests/DiemTimestampTests.move rename to aptos-move/diem-framework/DPN/tests/DiemTimestampTests.move diff --git a/diem-move/diem-framework/DPN/tests/DiemVersionTests.move b/aptos-move/diem-framework/DPN/tests/DiemVersionTests.move similarity index 100% rename from diem-move/diem-framework/DPN/tests/DiemVersionTests.move rename to aptos-move/diem-framework/DPN/tests/DiemVersionTests.move diff --git a/diem-move/diem-framework/DPN/tests/RegisteredCurrencyTests.move b/aptos-move/diem-framework/DPN/tests/RegisteredCurrencyTests.move similarity index 100% rename from diem-move/diem-framework/DPN/tests/RegisteredCurrencyTests.move rename to aptos-move/diem-framework/DPN/tests/RegisteredCurrencyTests.move diff --git a/diem-move/diem-framework/DPN/tests/RolesTests.move b/aptos-move/diem-framework/DPN/tests/RolesTests.move similarity index 100% rename from diem-move/diem-framework/DPN/tests/RolesTests.move rename to aptos-move/diem-framework/DPN/tests/RolesTests.move diff --git a/diem-move/diem-framework/DPN/tests/SharedEd25519PublicKeyTests.move b/aptos-move/diem-framework/DPN/tests/SharedEd25519PublicKeyTests.move similarity index 100% rename from diem-move/diem-framework/DPN/tests/SharedEd25519PublicKeyTests.move rename to aptos-move/diem-framework/DPN/tests/SharedEd25519PublicKeyTests.move diff --git a/diem-move/diem-framework/DPN/tests/SignatureTests.move b/aptos-move/diem-framework/DPN/tests/SignatureTests.move similarity index 100% rename from diem-move/diem-framework/DPN/tests/SignatureTests.move rename to aptos-move/diem-framework/DPN/tests/SignatureTests.move diff --git a/diem-move/diem-framework/DPN/tests/TransactionFeeTests.move b/aptos-move/diem-framework/DPN/tests/TransactionFeeTests.move similarity index 100% rename from diem-move/diem-framework/DPN/tests/TransactionFeeTests.move rename to aptos-move/diem-framework/DPN/tests/TransactionFeeTests.move diff --git a/diem-move/diem-framework/DPN/tests/ValidatorConfigTests.move b/aptos-move/diem-framework/DPN/tests/ValidatorConfigTests.move similarity index 100% rename from diem-move/diem-framework/DPN/tests/ValidatorConfigTests.move rename to aptos-move/diem-framework/DPN/tests/ValidatorConfigTests.move diff --git a/diem-move/diem-framework/DPN/tests/ValidatorOperatorConfigTests.move b/aptos-move/diem-framework/DPN/tests/ValidatorOperatorConfigTests.move similarity index 100% rename from diem-move/diem-framework/DPN/tests/ValidatorOperatorConfigTests.move rename to aptos-move/diem-framework/DPN/tests/ValidatorOperatorConfigTests.move diff --git a/diem-move/diem-framework/DPN/tests/WalletModuleTests.move b/aptos-move/diem-framework/DPN/tests/WalletModuleTests.move similarity index 100% rename from diem-move/diem-framework/DPN/tests/WalletModuleTests.move rename to aptos-move/diem-framework/DPN/tests/WalletModuleTests.move diff --git a/diem-move/diem-framework/DPN/tests/XUSTests.move b/aptos-move/diem-framework/DPN/tests/XUSTests.move similarity index 100% rename from diem-move/diem-framework/DPN/tests/XUSTests.move rename to aptos-move/diem-framework/DPN/tests/XUSTests.move diff --git a/diem-move/diem-framework/DPN/transactional-tests/block/block_prologue.exp b/aptos-move/diem-framework/DPN/transactional-tests/block/block_prologue.exp similarity index 100% rename from diem-move/diem-framework/DPN/transactional-tests/block/block_prologue.exp rename to aptos-move/diem-framework/DPN/transactional-tests/block/block_prologue.exp diff --git a/diem-move/diem-framework/DPN/transactional-tests/block/block_prologue.move b/aptos-move/diem-framework/DPN/transactional-tests/block/block_prologue.move similarity index 100% rename from diem-move/diem-framework/DPN/transactional-tests/block/block_prologue.move rename to aptos-move/diem-framework/DPN/transactional-tests/block/block_prologue.move diff --git a/diem-move/diem-framework/DPN/transactional-tests/block/expired_transaction.exp b/aptos-move/diem-framework/DPN/transactional-tests/block/expired_transaction.exp similarity index 100% rename from diem-move/diem-framework/DPN/transactional-tests/block/expired_transaction.exp rename to aptos-move/diem-framework/DPN/transactional-tests/block/expired_transaction.exp diff --git a/diem-move/diem-framework/DPN/transactional-tests/block/expired_transaction.move b/aptos-move/diem-framework/DPN/transactional-tests/block/expired_transaction.move similarity index 100% rename from diem-move/diem-framework/DPN/transactional-tests/block/expired_transaction.move rename to aptos-move/diem-framework/DPN/transactional-tests/block/expired_transaction.move diff --git a/diem-move/diem-framework/DPN/transactional-tests/block/get_block_height.exp b/aptos-move/diem-framework/DPN/transactional-tests/block/get_block_height.exp similarity index 100% rename from diem-move/diem-framework/DPN/transactional-tests/block/get_block_height.exp rename to aptos-move/diem-framework/DPN/transactional-tests/block/get_block_height.exp diff --git a/diem-move/diem-framework/DPN/transactional-tests/block/get_block_height.move b/aptos-move/diem-framework/DPN/transactional-tests/block/get_block_height.move similarity index 100% rename from diem-move/diem-framework/DPN/transactional-tests/block/get_block_height.move rename to aptos-move/diem-framework/DPN/transactional-tests/block/get_block_height.move diff --git a/diem-move/diem-framework/DPN/transactional-tests/block/none_validator_propser.exp b/aptos-move/diem-framework/DPN/transactional-tests/block/none_validator_propser.exp similarity index 100% rename from diem-move/diem-framework/DPN/transactional-tests/block/none_validator_propser.exp rename to aptos-move/diem-framework/DPN/transactional-tests/block/none_validator_propser.exp diff --git a/diem-move/diem-framework/DPN/transactional-tests/block/none_validator_propser.move b/aptos-move/diem-framework/DPN/transactional-tests/block/none_validator_propser.move similarity index 100% rename from diem-move/diem-framework/DPN/transactional-tests/block/none_validator_propser.move rename to aptos-move/diem-framework/DPN/transactional-tests/block/none_validator_propser.move diff --git a/diem-move/diem-framework/DPN/transactional-tests/block/older_timestamp.exp b/aptos-move/diem-framework/DPN/transactional-tests/block/older_timestamp.exp similarity index 100% rename from diem-move/diem-framework/DPN/transactional-tests/block/older_timestamp.exp rename to aptos-move/diem-framework/DPN/transactional-tests/block/older_timestamp.exp diff --git a/diem-move/diem-framework/DPN/transactional-tests/block/older_timestamp.move b/aptos-move/diem-framework/DPN/transactional-tests/block/older_timestamp.move similarity index 100% rename from diem-move/diem-framework/DPN/transactional-tests/block/older_timestamp.move rename to aptos-move/diem-framework/DPN/transactional-tests/block/older_timestamp.move diff --git a/diem-move/diem-framework/DPN/transactional-tests/block/vm_proposer.exp b/aptos-move/diem-framework/DPN/transactional-tests/block/vm_proposer.exp similarity index 100% rename from diem-move/diem-framework/DPN/transactional-tests/block/vm_proposer.exp rename to aptos-move/diem-framework/DPN/transactional-tests/block/vm_proposer.exp diff --git a/diem-move/diem-framework/DPN/transactional-tests/block/vm_proposer.move b/aptos-move/diem-framework/DPN/transactional-tests/block/vm_proposer.move similarity index 100% rename from diem-move/diem-framework/DPN/transactional-tests/block/vm_proposer.move rename to aptos-move/diem-framework/DPN/transactional-tests/block/vm_proposer.move diff --git a/diem-move/diem-framework/README.md b/aptos-move/diem-framework/README.md similarity index 100% rename from diem-move/diem-framework/README.md rename to aptos-move/diem-framework/README.md diff --git a/diem-move/diem-framework/aptos-framework/Move.toml b/aptos-move/diem-framework/aptos-framework/Move.toml similarity index 100% rename from diem-move/diem-framework/aptos-framework/Move.toml rename to aptos-move/diem-framework/aptos-framework/Move.toml diff --git a/diem-move/diem-framework/aptos-framework/releases/Cargo.toml b/aptos-move/diem-framework/aptos-framework/releases/Cargo.toml similarity index 78% rename from diem-move/diem-framework/aptos-framework/releases/Cargo.toml rename to aptos-move/diem-framework/aptos-framework/releases/Cargo.toml index 83d370855396c..2482fa72ff636 100644 --- a/diem-move/diem-framework/aptos-framework/releases/Cargo.toml +++ b/aptos-move/diem-framework/aptos-framework/releases/Cargo.toml @@ -12,9 +12,9 @@ publish = false [dependencies] move-command-line-common = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } -diem-crypto = { path = "../../../../crates/diem-crypto" } -diem-types = { path = "../../../../types" } -diem-workspace-hack = { path = "../../../../crates/diem-workspace-hack" } +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/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } framework-releases = { path = "../../releases" } diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/BuildInfo.yaml b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/BuildInfo.yaml similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/BuildInfo.yaml rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/BuildInfo.yaml diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/abis/BasicScripts/create_account.abi b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/abis/BasicScripts/create_account.abi similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/abis/BasicScripts/create_account.abi rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/abis/BasicScripts/create_account.abi diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/abis/BasicScripts/mint.abi b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/abis/BasicScripts/mint.abi similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/abis/BasicScripts/mint.abi rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/abis/BasicScripts/mint.abi diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/abis/BasicScripts/transfer.abi b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/abis/BasicScripts/transfer.abi similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/abis/BasicScripts/transfer.abi rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/abis/BasicScripts/transfer.abi diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/AptosAccount.mv b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/AptosAccount.mv similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/AptosAccount.mv rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/AptosAccount.mv diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/AptosConsensusConfig.mv b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/AptosConsensusConfig.mv similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/AptosConsensusConfig.mv rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/AptosConsensusConfig.mv diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/AptosVMConfig.mv b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/AptosVMConfig.mv similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/AptosVMConfig.mv rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/AptosVMConfig.mv diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/AptosValidatorConfig.mv b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/AptosValidatorConfig.mv similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/AptosValidatorConfig.mv rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/AptosValidatorConfig.mv diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/AptosValidatorOperatorConfig.mv b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/AptosValidatorOperatorConfig.mv similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/AptosValidatorOperatorConfig.mv rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/AptosValidatorOperatorConfig.mv diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/AptosValidatorSet.mv b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/AptosValidatorSet.mv similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/AptosValidatorSet.mv rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/AptosValidatorSet.mv diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/AptosVersion.mv b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/AptosVersion.mv similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/AptosVersion.mv rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/AptosVersion.mv diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/BasicScripts.mv b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/BasicScripts.mv similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/BasicScripts.mv rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/BasicScripts.mv diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/Genesis.mv b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/Genesis.mv similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/Genesis.mv rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/Genesis.mv diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/Marker.mv b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/Marker.mv similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/Marker.mv rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/Marker.mv diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/TestCoin.mv b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/TestCoin.mv similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/TestCoin.mv rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/TestCoin.mv diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/TransactionFee.mv b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/TransactionFee.mv similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/TransactionFee.mv rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/bytecode_modules/TransactionFee.mv diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/docs/AptosAccount.md b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/docs/AptosAccount.md similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/docs/AptosAccount.md rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/docs/AptosAccount.md diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/docs/AptosConsensusConfig.md b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/docs/AptosConsensusConfig.md similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/docs/AptosConsensusConfig.md rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/docs/AptosConsensusConfig.md diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/docs/AptosVMConfig.md b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/docs/AptosVMConfig.md similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/docs/AptosVMConfig.md rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/docs/AptosVMConfig.md diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/docs/AptosValidatorConfig.md b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/docs/AptosValidatorConfig.md similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/docs/AptosValidatorConfig.md rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/docs/AptosValidatorConfig.md diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/docs/AptosValidatorOperatorConfig.md b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/docs/AptosValidatorOperatorConfig.md similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/docs/AptosValidatorOperatorConfig.md rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/docs/AptosValidatorOperatorConfig.md diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/docs/AptosValidatorSet.md b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/docs/AptosValidatorSet.md similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/docs/AptosValidatorSet.md rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/docs/AptosValidatorSet.md diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/docs/AptosVersion.md b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/docs/AptosVersion.md similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/docs/AptosVersion.md rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/docs/AptosVersion.md diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/docs/BasicScripts.md b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/docs/BasicScripts.md similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/docs/BasicScripts.md rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/docs/BasicScripts.md diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/docs/Genesis.md b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/docs/Genesis.md similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/docs/Genesis.md rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/docs/Genesis.md diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/docs/Marker.md b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/docs/Marker.md similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/docs/Marker.md rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/docs/Marker.md diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/docs/TestCoin.md b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/docs/TestCoin.md similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/docs/TestCoin.md rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/docs/TestCoin.md diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/docs/TransactionFee.md b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/docs/TransactionFee.md similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/docs/TransactionFee.md rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/docs/TransactionFee.md diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/source_maps/AptosAccount.mvsm b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/source_maps/AptosAccount.mvsm similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/source_maps/AptosAccount.mvsm rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/source_maps/AptosAccount.mvsm diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/source_maps/AptosConsensusConfig.mvsm b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/source_maps/AptosConsensusConfig.mvsm similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/source_maps/AptosConsensusConfig.mvsm rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/source_maps/AptosConsensusConfig.mvsm diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/source_maps/AptosVMConfig.mvsm b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/source_maps/AptosVMConfig.mvsm similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/source_maps/AptosVMConfig.mvsm rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/source_maps/AptosVMConfig.mvsm diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/source_maps/AptosValidatorConfig.mvsm b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/source_maps/AptosValidatorConfig.mvsm similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/source_maps/AptosValidatorConfig.mvsm rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/source_maps/AptosValidatorConfig.mvsm diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/source_maps/AptosValidatorOperatorConfig.mvsm b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/source_maps/AptosValidatorOperatorConfig.mvsm similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/source_maps/AptosValidatorOperatorConfig.mvsm rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/source_maps/AptosValidatorOperatorConfig.mvsm diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/source_maps/AptosValidatorSet.mvsm b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/source_maps/AptosValidatorSet.mvsm similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/source_maps/AptosValidatorSet.mvsm rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/source_maps/AptosValidatorSet.mvsm diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/source_maps/AptosVersion.mvsm b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/source_maps/AptosVersion.mvsm similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/source_maps/AptosVersion.mvsm rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/source_maps/AptosVersion.mvsm diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/source_maps/BasicScripts.mvsm b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/source_maps/BasicScripts.mvsm similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/source_maps/BasicScripts.mvsm rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/source_maps/BasicScripts.mvsm diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/source_maps/Genesis.mvsm b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/source_maps/Genesis.mvsm similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/source_maps/Genesis.mvsm rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/source_maps/Genesis.mvsm diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/source_maps/Marker.mvsm b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/source_maps/Marker.mvsm similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/source_maps/Marker.mvsm rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/source_maps/Marker.mvsm diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/source_maps/TestCoin.mvsm b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/source_maps/TestCoin.mvsm similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/source_maps/TestCoin.mvsm rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/source_maps/TestCoin.mvsm diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/source_maps/TransactionFee.mvsm b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/source_maps/TransactionFee.mvsm similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/source_maps/TransactionFee.mvsm rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/source_maps/TransactionFee.mvsm diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/sources/AptosAccount.move b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/sources/AptosAccount.move similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/sources/AptosAccount.move rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/sources/AptosAccount.move diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/sources/AptosConsensusConfig.move b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/sources/AptosConsensusConfig.move similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/sources/AptosConsensusConfig.move rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/sources/AptosConsensusConfig.move diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/sources/AptosVMConfig.move b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/sources/AptosVMConfig.move similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/sources/AptosVMConfig.move rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/sources/AptosVMConfig.move diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/sources/AptosValidatorConfig.move b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/sources/AptosValidatorConfig.move similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/sources/AptosValidatorConfig.move rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/sources/AptosValidatorConfig.move diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/sources/AptosValidatorOperatorConfig.move b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/sources/AptosValidatorOperatorConfig.move similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/sources/AptosValidatorOperatorConfig.move rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/sources/AptosValidatorOperatorConfig.move diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/sources/AptosValidatorSet.move b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/sources/AptosValidatorSet.move similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/sources/AptosValidatorSet.move rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/sources/AptosValidatorSet.move diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/sources/AptosVersion.move b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/sources/AptosVersion.move similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/sources/AptosVersion.move rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/sources/AptosVersion.move diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/sources/BasicScripts.move b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/sources/BasicScripts.move similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/sources/BasicScripts.move rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/sources/BasicScripts.move diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/sources/Genesis.move b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/sources/Genesis.move similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/sources/Genesis.move rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/sources/Genesis.move diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/sources/Marker.move b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/sources/Marker.move similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/sources/Marker.move rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/sources/Marker.move diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/sources/TestCoin.move b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/sources/TestCoin.move similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/sources/TestCoin.move rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/sources/TestCoin.move diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/sources/TransactionFee.move b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/sources/TransactionFee.move similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/sources/TransactionFee.move rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/AptosFramework/sources/TransactionFee.move diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/BuildInfo.yaml b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/BuildInfo.yaml similarity index 97% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/BuildInfo.yaml rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/BuildInfo.yaml index 13dde57031261..1804066416c90 100644 --- a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/BuildInfo.yaml +++ b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/BuildInfo.yaml @@ -88,7 +88,7 @@ compiled_package_info: ? address: "00000000000000000000000000000001" name: Vector : Std - source_digest: 645AA96EF1EAD9869049D3FCBF98F16F8BC7FC26699B27A57298BB4C7A1B7569 + source_digest: 11C424995F38872F71C83513C0957BA5825979D0541753259A3D7BFDC8EFE9CE build_flags: dev_mode: false test_mode: false diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/Account.mv b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/Account.mv similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/Account.mv rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/Account.mv diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/ChainId.mv b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/ChainId.mv similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/ChainId.mv rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/ChainId.mv diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/CoreGenesis.mv b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/CoreGenesis.mv similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/CoreGenesis.mv rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/CoreGenesis.mv diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/DiemBlock.mv b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/DiemBlock.mv similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/DiemBlock.mv rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/DiemBlock.mv diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/DiemConfig.mv b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/DiemConfig.mv similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/DiemConfig.mv rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/DiemConfig.mv diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/DiemConsensusConfig.mv b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/DiemConsensusConfig.mv similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/DiemConsensusConfig.mv rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/DiemConsensusConfig.mv diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/DiemSystem.mv b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/DiemSystem.mv similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/DiemSystem.mv rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/DiemSystem.mv diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/DiemTimestamp.mv b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/DiemTimestamp.mv similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/DiemTimestamp.mv rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/DiemTimestamp.mv diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/DiemVMConfig.mv b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/DiemVMConfig.mv similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/DiemVMConfig.mv rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/DiemVMConfig.mv diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/DiemVersion.mv b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/DiemVersion.mv similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/DiemVersion.mv rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/DiemVersion.mv diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/ParallelExecutionConfig.mv b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/ParallelExecutionConfig.mv similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/ParallelExecutionConfig.mv rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/ParallelExecutionConfig.mv diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/Signature.mv b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/Signature.mv similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/Signature.mv rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/Signature.mv diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/SystemAddresses.mv b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/SystemAddresses.mv similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/SystemAddresses.mv rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/SystemAddresses.mv diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/ValidatorConfig.mv b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/ValidatorConfig.mv similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/ValidatorConfig.mv rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/ValidatorConfig.mv diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/ValidatorOperatorConfig.mv b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/ValidatorOperatorConfig.mv similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/ValidatorOperatorConfig.mv rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/ValidatorOperatorConfig.mv diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/Account.md b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/Account.md similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/Account.md rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/Account.md diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/ChainId.md b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/ChainId.md similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/ChainId.md rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/ChainId.md diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/CoreGenesis.md b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/CoreGenesis.md similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/CoreGenesis.md rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/CoreGenesis.md diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/DiemBlock.md b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/DiemBlock.md similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/DiemBlock.md rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/DiemBlock.md diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/DiemConfig.md b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/DiemConfig.md similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/DiemConfig.md rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/DiemConfig.md diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/DiemConsensusConfig.md b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/DiemConsensusConfig.md similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/DiemConsensusConfig.md rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/DiemConsensusConfig.md diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/DiemSystem.md b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/DiemSystem.md similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/DiemSystem.md rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/DiemSystem.md diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/DiemTimestamp.md b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/DiemTimestamp.md similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/DiemTimestamp.md rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/DiemTimestamp.md diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/DiemVMConfig.md b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/DiemVMConfig.md similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/DiemVMConfig.md rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/DiemVMConfig.md diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/DiemVersion.md b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/DiemVersion.md similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/DiemVersion.md rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/DiemVersion.md diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/ParallelExecutionConfig.md b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/ParallelExecutionConfig.md similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/ParallelExecutionConfig.md rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/ParallelExecutionConfig.md diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/Signature.md b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/Signature.md similarity index 95% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/Signature.md rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/Signature.md index 71b3203e8e3c6..4333a0ef74530 100644 --- a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/Signature.md +++ b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/Signature.md @@ -20,7 +20,7 @@ Contains functions for [ed25519](https://en.wikipedia.org/wiki/EdDSA) digital si Return true if the bytes in public_key can be parsed as a valid Ed25519 public key. Returns false if public_key is not 32 bytes OR is 32 bytes, but does not pass -points-on-curve or small subgroup checks. See the Rust diem_crypto::Ed25519PublicKey type +points-on-curve or small subgroup checks. See the Rust aptos_crypto::Ed25519PublicKey type for more details. Does not abort. diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/SystemAddresses.md b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/SystemAddresses.md similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/SystemAddresses.md rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/SystemAddresses.md diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/ValidatorConfig.md b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/ValidatorConfig.md similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/ValidatorConfig.md rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/ValidatorConfig.md diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/ValidatorOperatorConfig.md b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/ValidatorOperatorConfig.md similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/ValidatorOperatorConfig.md rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/ValidatorOperatorConfig.md diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/overview.md b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/overview.md similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/overview.md rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/overview.md diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/references.md b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/references.md similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/references.md rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/references.md diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/script_documentation.md b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/script_documentation.md similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/script_documentation.md rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/script_documentation.md diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/spec_documentation.md b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/spec_documentation.md similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/spec_documentation.md rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/docs/spec_documentation.md diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/source_maps/Account.mvsm b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/source_maps/Account.mvsm similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/source_maps/Account.mvsm rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/source_maps/Account.mvsm diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/source_maps/ChainId.mvsm b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/source_maps/ChainId.mvsm similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/source_maps/ChainId.mvsm rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/source_maps/ChainId.mvsm diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/source_maps/CoreGenesis.mvsm b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/source_maps/CoreGenesis.mvsm similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/source_maps/CoreGenesis.mvsm rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/source_maps/CoreGenesis.mvsm diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/source_maps/DiemBlock.mvsm b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/source_maps/DiemBlock.mvsm similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/source_maps/DiemBlock.mvsm rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/source_maps/DiemBlock.mvsm diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/source_maps/DiemConfig.mvsm b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/source_maps/DiemConfig.mvsm similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/source_maps/DiemConfig.mvsm rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/source_maps/DiemConfig.mvsm diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/source_maps/DiemConsensusConfig.mvsm b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/source_maps/DiemConsensusConfig.mvsm similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/source_maps/DiemConsensusConfig.mvsm rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/source_maps/DiemConsensusConfig.mvsm diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/source_maps/DiemSystem.mvsm b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/source_maps/DiemSystem.mvsm similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/source_maps/DiemSystem.mvsm rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/source_maps/DiemSystem.mvsm diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/source_maps/DiemTimestamp.mvsm b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/source_maps/DiemTimestamp.mvsm similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/source_maps/DiemTimestamp.mvsm rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/source_maps/DiemTimestamp.mvsm diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/source_maps/DiemVMConfig.mvsm b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/source_maps/DiemVMConfig.mvsm similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/source_maps/DiemVMConfig.mvsm rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/source_maps/DiemVMConfig.mvsm diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/source_maps/DiemVersion.mvsm b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/source_maps/DiemVersion.mvsm similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/source_maps/DiemVersion.mvsm rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/source_maps/DiemVersion.mvsm diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/source_maps/ParallelExecutionConfig.mvsm b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/source_maps/ParallelExecutionConfig.mvsm similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/source_maps/ParallelExecutionConfig.mvsm rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/source_maps/ParallelExecutionConfig.mvsm diff --git a/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/source_maps/Signature.mvsm b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/source_maps/Signature.mvsm new file mode 100644 index 0000000000000..7d5bf9ffc9c7a Binary files /dev/null and b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/source_maps/Signature.mvsm differ diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/source_maps/SystemAddresses.mvsm b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/source_maps/SystemAddresses.mvsm similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/source_maps/SystemAddresses.mvsm rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/source_maps/SystemAddresses.mvsm diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/source_maps/ValidatorConfig.mvsm b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/source_maps/ValidatorConfig.mvsm similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/source_maps/ValidatorConfig.mvsm rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/source_maps/ValidatorConfig.mvsm diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/source_maps/ValidatorOperatorConfig.mvsm b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/source_maps/ValidatorOperatorConfig.mvsm similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/source_maps/ValidatorOperatorConfig.mvsm rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/source_maps/ValidatorOperatorConfig.mvsm diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/sources/Account.move b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/sources/Account.move similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/sources/Account.move rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/sources/Account.move diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/sources/ChainId.move b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/sources/ChainId.move similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/sources/ChainId.move rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/sources/ChainId.move diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/sources/CoreGenesis.move b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/sources/CoreGenesis.move similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/sources/CoreGenesis.move rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/sources/CoreGenesis.move diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/sources/DiemBlock.move b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/sources/DiemBlock.move similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/sources/DiemBlock.move rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/sources/DiemBlock.move diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/sources/DiemConfig.move b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/sources/DiemConfig.move similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/sources/DiemConfig.move rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/sources/DiemConfig.move diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/sources/DiemConsensusConfig.move b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/sources/DiemConsensusConfig.move similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/sources/DiemConsensusConfig.move rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/sources/DiemConsensusConfig.move diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/sources/DiemSystem.move b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/sources/DiemSystem.move similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/sources/DiemSystem.move rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/sources/DiemSystem.move diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/sources/DiemTimestamp.move b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/sources/DiemTimestamp.move similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/sources/DiemTimestamp.move rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/sources/DiemTimestamp.move diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/sources/DiemVMConfig.move b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/sources/DiemVMConfig.move similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/sources/DiemVMConfig.move rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/sources/DiemVMConfig.move diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/sources/DiemVersion.move b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/sources/DiemVersion.move similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/sources/DiemVersion.move rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/sources/DiemVersion.move diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/sources/ParallelExecutionConfig.move b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/sources/ParallelExecutionConfig.move similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/sources/ParallelExecutionConfig.move rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/sources/ParallelExecutionConfig.move diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/sources/Signature.move b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/sources/Signature.move similarity index 96% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/sources/Signature.move rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/sources/Signature.move index e265918c3f662..4987ec6246fe6 100644 --- a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/sources/Signature.move +++ b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/sources/Signature.move @@ -3,7 +3,7 @@ module CoreFramework::Signature { /// Return `true` if the bytes in `public_key` can be parsed as a valid Ed25519 public key. /// Returns `false` if `public_key` is not 32 bytes OR is 32 bytes, but does not pass - /// points-on-curve or small subgroup checks. See the Rust `diem_crypto::Ed25519PublicKey` type + /// points-on-curve or small subgroup checks. See the Rust `aptos_crypto::Ed25519PublicKey` type /// for more details. /// Does not abort. native public fun ed25519_validate_pubkey(public_key: vector): bool; diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/sources/SystemAddresses.move b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/sources/SystemAddresses.move similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/sources/SystemAddresses.move rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/sources/SystemAddresses.move diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/sources/ValidatorConfig.move b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/sources/ValidatorConfig.move similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/sources/ValidatorConfig.move rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/sources/ValidatorConfig.move diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/sources/ValidatorOperatorConfig.move b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/sources/ValidatorOperatorConfig.move similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/sources/ValidatorOperatorConfig.move rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/sources/ValidatorOperatorConfig.move diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/BuildInfo.yaml b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/BuildInfo.yaml similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/BuildInfo.yaml rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/BuildInfo.yaml diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/ASCII.mv b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/ASCII.mv similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/ASCII.mv rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/ASCII.mv diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/BCS.mv b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/BCS.mv similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/BCS.mv rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/BCS.mv diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/BitVector.mv b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/BitVector.mv similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/BitVector.mv rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/BitVector.mv diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Capability.mv b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Capability.mv similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Capability.mv rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Capability.mv diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Errors.mv b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Errors.mv similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Errors.mv rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Errors.mv diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Event.mv b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Event.mv similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Event.mv rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Event.mv diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/FixedPoint32.mv b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/FixedPoint32.mv similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/FixedPoint32.mv rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/FixedPoint32.mv diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/GUID.mv b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/GUID.mv similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/GUID.mv rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/GUID.mv diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Hash.mv b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Hash.mv similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Hash.mv rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Hash.mv diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Option.mv b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Option.mv similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Option.mv rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Option.mv diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Signer.mv b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Signer.mv similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Signer.mv rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Signer.mv diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Vector.mv b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Vector.mv similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Vector.mv rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Vector.mv diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/docs/ASCII.md b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/docs/ASCII.md similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/docs/ASCII.md rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/docs/ASCII.md diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/docs/BCS.md b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/docs/BCS.md similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/docs/BCS.md rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/docs/BCS.md diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/docs/BitVector.md b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/docs/BitVector.md similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/docs/BitVector.md rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/docs/BitVector.md diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/docs/Capability.md b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/docs/Capability.md similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/docs/Capability.md rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/docs/Capability.md diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/docs/Errors.md b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/docs/Errors.md similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/docs/Errors.md rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/docs/Errors.md diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/docs/Event.md b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/docs/Event.md similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/docs/Event.md rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/docs/Event.md diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/docs/FixedPoint32.md b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/docs/FixedPoint32.md similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/docs/FixedPoint32.md rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/docs/FixedPoint32.md diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/docs/GUID.md b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/docs/GUID.md similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/docs/GUID.md rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/docs/GUID.md diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/docs/Hash.md b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/docs/Hash.md similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/docs/Hash.md rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/docs/Hash.md diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/docs/Option.md b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/docs/Option.md similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/docs/Option.md rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/docs/Option.md diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/docs/Signer.md b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/docs/Signer.md similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/docs/Signer.md rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/docs/Signer.md diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/docs/Vector.md b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/docs/Vector.md similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/docs/Vector.md rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/docs/Vector.md diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/docs/overview.md b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/docs/overview.md similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/docs/overview.md rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/docs/overview.md diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/docs/references.md b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/docs/references.md similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/docs/references.md rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/docs/references.md diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/source_maps/ASCII.mvsm b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/source_maps/ASCII.mvsm similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/source_maps/ASCII.mvsm rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/source_maps/ASCII.mvsm diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/source_maps/BCS.mvsm b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/source_maps/BCS.mvsm similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/source_maps/BCS.mvsm rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/source_maps/BCS.mvsm diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/source_maps/BitVector.mvsm b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/source_maps/BitVector.mvsm similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/source_maps/BitVector.mvsm rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/source_maps/BitVector.mvsm diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/source_maps/Capability.mvsm b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/source_maps/Capability.mvsm similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/source_maps/Capability.mvsm rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/source_maps/Capability.mvsm diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/source_maps/Errors.mvsm b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/source_maps/Errors.mvsm similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/source_maps/Errors.mvsm rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/source_maps/Errors.mvsm diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/source_maps/Event.mvsm b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/source_maps/Event.mvsm similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/source_maps/Event.mvsm rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/source_maps/Event.mvsm diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/source_maps/FixedPoint32.mvsm b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/source_maps/FixedPoint32.mvsm similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/source_maps/FixedPoint32.mvsm rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/source_maps/FixedPoint32.mvsm diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/source_maps/GUID.mvsm b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/source_maps/GUID.mvsm similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/source_maps/GUID.mvsm rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/source_maps/GUID.mvsm diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/source_maps/Hash.mvsm b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/source_maps/Hash.mvsm similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/source_maps/Hash.mvsm rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/source_maps/Hash.mvsm diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/source_maps/Option.mvsm b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/source_maps/Option.mvsm similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/source_maps/Option.mvsm rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/source_maps/Option.mvsm diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/source_maps/Signer.mvsm b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/source_maps/Signer.mvsm similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/source_maps/Signer.mvsm rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/source_maps/Signer.mvsm diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/source_maps/Vector.mvsm b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/source_maps/Vector.mvsm similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/source_maps/Vector.mvsm rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/source_maps/Vector.mvsm diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/sources/ASCII.move b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/sources/ASCII.move similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/sources/ASCII.move rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/sources/ASCII.move diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/sources/BCS.move b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/sources/BCS.move similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/sources/BCS.move rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/sources/BCS.move diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/sources/BitVector.move b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/sources/BitVector.move similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/sources/BitVector.move rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/sources/BitVector.move diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/sources/Capability.move b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/sources/Capability.move similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/sources/Capability.move rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/sources/Capability.move diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/sources/Errors.move b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/sources/Errors.move similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/sources/Errors.move rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/sources/Errors.move diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/sources/Event.move b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/sources/Event.move similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/sources/Event.move rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/sources/Event.move diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/sources/FixedPoint32.move b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/sources/FixedPoint32.move similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/sources/FixedPoint32.move rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/sources/FixedPoint32.move diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/sources/GUID.move b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/sources/GUID.move similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/sources/GUID.move rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/sources/GUID.move diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/sources/Hash.move b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/sources/Hash.move similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/sources/Hash.move rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/sources/Hash.move diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/sources/Option.move b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/sources/Option.move similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/sources/Option.move rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/sources/Option.move diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/sources/Signer.move b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/sources/Signer.move similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/sources/Signer.move rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/sources/Signer.move diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/sources/Vector.move b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/sources/Vector.move similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/sources/Vector.move rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build/MoveStdlib/sources/Vector.move diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/error_description/error_description.errmap b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/error_description/error_description.errmap similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/error_description/error_description.errmap rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/error_description/error_description.errmap diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/transaction_script_builder.rs b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/transaction_script_builder.rs similarity index 99% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/transaction_script_builder.rs rename to aptos-move/diem-framework/aptos-framework/releases/artifacts/current/transaction_script_builder.rs index ce8f93a0c40c7..61b7df98a76bf 100644 --- a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/transaction_script_builder.rs +++ b/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/transaction_script_builder.rs @@ -12,7 +12,7 @@ #![allow(clippy::unnecessary_wraps)] #![allow(unused_imports)] -use diem_types::{ +use aptos_types::{ account_address::AccountAddress, transaction::{Script, ScriptFunction, TransactionArgument, TransactionPayload, VecBytes}, }; diff --git a/diem-move/diem-framework/aptos-framework/releases/src/lib.rs b/aptos-move/diem-framework/aptos-framework/releases/src/lib.rs similarity index 100% rename from diem-move/diem-framework/aptos-framework/releases/src/lib.rs rename to aptos-move/diem-framework/aptos-framework/releases/src/lib.rs diff --git a/diem-move/diem-framework/aptos-framework/sources/AptosAccount.move b/aptos-move/diem-framework/aptos-framework/sources/AptosAccount.move similarity index 100% rename from diem-move/diem-framework/aptos-framework/sources/AptosAccount.move rename to aptos-move/diem-framework/aptos-framework/sources/AptosAccount.move diff --git a/diem-move/diem-framework/aptos-framework/sources/Genesis.move b/aptos-move/diem-framework/aptos-framework/sources/Genesis.move similarity index 100% rename from diem-move/diem-framework/aptos-framework/sources/Genesis.move rename to aptos-move/diem-framework/aptos-framework/sources/Genesis.move diff --git a/diem-move/diem-framework/aptos-framework/sources/Marker.move b/aptos-move/diem-framework/aptos-framework/sources/Marker.move similarity index 100% rename from diem-move/diem-framework/aptos-framework/sources/Marker.move rename to aptos-move/diem-framework/aptos-framework/sources/Marker.move diff --git a/diem-move/diem-framework/aptos-framework/sources/TestCoin.move b/aptos-move/diem-framework/aptos-framework/sources/TestCoin.move similarity index 100% rename from diem-move/diem-framework/aptos-framework/sources/TestCoin.move rename to aptos-move/diem-framework/aptos-framework/sources/TestCoin.move diff --git a/diem-move/diem-framework/aptos-framework/sources/TransactionFee.move b/aptos-move/diem-framework/aptos-framework/sources/TransactionFee.move similarity index 100% rename from diem-move/diem-framework/aptos-framework/sources/TransactionFee.move rename to aptos-move/diem-framework/aptos-framework/sources/TransactionFee.move diff --git a/diem-move/diem-framework/aptos-framework/sources/configs/AptosConsensusConfig.move b/aptos-move/diem-framework/aptos-framework/sources/configs/AptosConsensusConfig.move similarity index 100% rename from diem-move/diem-framework/aptos-framework/sources/configs/AptosConsensusConfig.move rename to aptos-move/diem-framework/aptos-framework/sources/configs/AptosConsensusConfig.move diff --git a/diem-move/diem-framework/aptos-framework/sources/configs/AptosVMConfig.move b/aptos-move/diem-framework/aptos-framework/sources/configs/AptosVMConfig.move similarity index 100% rename from diem-move/diem-framework/aptos-framework/sources/configs/AptosVMConfig.move rename to aptos-move/diem-framework/aptos-framework/sources/configs/AptosVMConfig.move diff --git a/diem-move/diem-framework/aptos-framework/sources/configs/AptosValidatorConfig.move b/aptos-move/diem-framework/aptos-framework/sources/configs/AptosValidatorConfig.move similarity index 100% rename from diem-move/diem-framework/aptos-framework/sources/configs/AptosValidatorConfig.move rename to aptos-move/diem-framework/aptos-framework/sources/configs/AptosValidatorConfig.move diff --git a/diem-move/diem-framework/aptos-framework/sources/configs/AptosValidatorOperatorConfig.move b/aptos-move/diem-framework/aptos-framework/sources/configs/AptosValidatorOperatorConfig.move similarity index 100% rename from diem-move/diem-framework/aptos-framework/sources/configs/AptosValidatorOperatorConfig.move rename to aptos-move/diem-framework/aptos-framework/sources/configs/AptosValidatorOperatorConfig.move diff --git a/diem-move/diem-framework/aptos-framework/sources/configs/AptosValidatorSet.move b/aptos-move/diem-framework/aptos-framework/sources/configs/AptosValidatorSet.move similarity index 100% rename from diem-move/diem-framework/aptos-framework/sources/configs/AptosValidatorSet.move rename to aptos-move/diem-framework/aptos-framework/sources/configs/AptosValidatorSet.move diff --git a/diem-move/diem-framework/aptos-framework/sources/configs/AptosVersion.move b/aptos-move/diem-framework/aptos-framework/sources/configs/AptosVersion.move similarity index 100% rename from diem-move/diem-framework/aptos-framework/sources/configs/AptosVersion.move rename to aptos-move/diem-framework/aptos-framework/sources/configs/AptosVersion.move diff --git a/diem-move/diem-framework/aptos-framework/sources/scripts/BasicScripts.move b/aptos-move/diem-framework/aptos-framework/sources/scripts/BasicScripts.move similarity index 100% rename from diem-move/diem-framework/aptos-framework/sources/scripts/BasicScripts.move rename to aptos-move/diem-framework/aptos-framework/sources/scripts/BasicScripts.move diff --git a/diem-move/diem-framework/core/Move.toml b/aptos-move/diem-framework/core/Move.toml similarity index 100% rename from diem-move/diem-framework/core/Move.toml rename to aptos-move/diem-framework/core/Move.toml diff --git a/diem-move/diem-framework/core/README.md b/aptos-move/diem-framework/core/README.md similarity index 100% rename from diem-move/diem-framework/core/README.md rename to aptos-move/diem-framework/core/README.md diff --git a/diem-move/diem-framework/core/doc_templates/overview_template.md b/aptos-move/diem-framework/core/doc_templates/overview_template.md similarity index 100% rename from diem-move/diem-framework/core/doc_templates/overview_template.md rename to aptos-move/diem-framework/core/doc_templates/overview_template.md diff --git a/diem-move/diem-framework/core/doc_templates/references.md b/aptos-move/diem-framework/core/doc_templates/references.md similarity index 100% rename from diem-move/diem-framework/core/doc_templates/references.md rename to aptos-move/diem-framework/core/doc_templates/references.md diff --git a/diem-move/diem-framework/core/doc_templates/script_documentation_template.md b/aptos-move/diem-framework/core/doc_templates/script_documentation_template.md similarity index 100% rename from diem-move/diem-framework/core/doc_templates/script_documentation_template.md rename to aptos-move/diem-framework/core/doc_templates/script_documentation_template.md diff --git a/diem-move/diem-framework/core/doc_templates/spec_documentation_template.md b/aptos-move/diem-framework/core/doc_templates/spec_documentation_template.md similarity index 100% rename from diem-move/diem-framework/core/doc_templates/spec_documentation_template.md rename to aptos-move/diem-framework/core/doc_templates/spec_documentation_template.md diff --git a/diem-move/diem-framework/core/sources/Account.move b/aptos-move/diem-framework/core/sources/Account.move similarity index 100% rename from diem-move/diem-framework/core/sources/Account.move rename to aptos-move/diem-framework/core/sources/Account.move diff --git a/diem-move/diem-framework/core/sources/ChainId.move b/aptos-move/diem-framework/core/sources/ChainId.move similarity index 100% rename from diem-move/diem-framework/core/sources/ChainId.move rename to aptos-move/diem-framework/core/sources/ChainId.move diff --git a/diem-move/diem-framework/core/sources/CoreGenesis.move b/aptos-move/diem-framework/core/sources/CoreGenesis.move similarity index 100% rename from diem-move/diem-framework/core/sources/CoreGenesis.move rename to aptos-move/diem-framework/core/sources/CoreGenesis.move diff --git a/diem-move/diem-framework/core/sources/DiemBlock.move b/aptos-move/diem-framework/core/sources/DiemBlock.move similarity index 100% rename from diem-move/diem-framework/core/sources/DiemBlock.move rename to aptos-move/diem-framework/core/sources/DiemBlock.move diff --git a/diem-move/diem-framework/core/sources/DiemConfig.move b/aptos-move/diem-framework/core/sources/DiemConfig.move similarity index 100% rename from diem-move/diem-framework/core/sources/DiemConfig.move rename to aptos-move/diem-framework/core/sources/DiemConfig.move diff --git a/diem-move/diem-framework/core/sources/DiemTimestamp.move b/aptos-move/diem-framework/core/sources/DiemTimestamp.move similarity index 100% rename from diem-move/diem-framework/core/sources/DiemTimestamp.move rename to aptos-move/diem-framework/core/sources/DiemTimestamp.move diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/sources/Signature.move b/aptos-move/diem-framework/core/sources/Signature.move similarity index 96% rename from diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/sources/Signature.move rename to aptos-move/diem-framework/core/sources/Signature.move index e265918c3f662..4987ec6246fe6 100644 --- a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/sources/Signature.move +++ b/aptos-move/diem-framework/core/sources/Signature.move @@ -3,7 +3,7 @@ module CoreFramework::Signature { /// Return `true` if the bytes in `public_key` can be parsed as a valid Ed25519 public key. /// Returns `false` if `public_key` is not 32 bytes OR is 32 bytes, but does not pass - /// points-on-curve or small subgroup checks. See the Rust `diem_crypto::Ed25519PublicKey` type + /// points-on-curve or small subgroup checks. See the Rust `aptos_crypto::Ed25519PublicKey` type /// for more details. /// Does not abort. native public fun ed25519_validate_pubkey(public_key: vector): bool; diff --git a/diem-move/diem-framework/core/sources/SystemAddresses.move b/aptos-move/diem-framework/core/sources/SystemAddresses.move similarity index 100% rename from diem-move/diem-framework/core/sources/SystemAddresses.move rename to aptos-move/diem-framework/core/sources/SystemAddresses.move diff --git a/diem-move/diem-framework/core/sources/configs/DiemConsensusConfig.move b/aptos-move/diem-framework/core/sources/configs/DiemConsensusConfig.move similarity index 100% rename from diem-move/diem-framework/core/sources/configs/DiemConsensusConfig.move rename to aptos-move/diem-framework/core/sources/configs/DiemConsensusConfig.move diff --git a/diem-move/diem-framework/core/sources/configs/DiemSystem.move b/aptos-move/diem-framework/core/sources/configs/DiemSystem.move similarity index 100% rename from diem-move/diem-framework/core/sources/configs/DiemSystem.move rename to aptos-move/diem-framework/core/sources/configs/DiemSystem.move diff --git a/diem-move/diem-framework/core/sources/configs/DiemVMConfig.move b/aptos-move/diem-framework/core/sources/configs/DiemVMConfig.move similarity index 100% rename from diem-move/diem-framework/core/sources/configs/DiemVMConfig.move rename to aptos-move/diem-framework/core/sources/configs/DiemVMConfig.move diff --git a/diem-move/diem-framework/core/sources/configs/DiemVersion.move b/aptos-move/diem-framework/core/sources/configs/DiemVersion.move similarity index 100% rename from diem-move/diem-framework/core/sources/configs/DiemVersion.move rename to aptos-move/diem-framework/core/sources/configs/DiemVersion.move diff --git a/diem-move/diem-framework/core/sources/configs/ParallelExecutionConfig.move b/aptos-move/diem-framework/core/sources/configs/ParallelExecutionConfig.move similarity index 100% rename from diem-move/diem-framework/core/sources/configs/ParallelExecutionConfig.move rename to aptos-move/diem-framework/core/sources/configs/ParallelExecutionConfig.move diff --git a/diem-move/diem-framework/core/sources/configs/ValidatorConfig.move b/aptos-move/diem-framework/core/sources/configs/ValidatorConfig.move similarity index 100% rename from diem-move/diem-framework/core/sources/configs/ValidatorConfig.move rename to aptos-move/diem-framework/core/sources/configs/ValidatorConfig.move diff --git a/diem-move/diem-framework/core/sources/configs/ValidatorOperatorConfig.move b/aptos-move/diem-framework/core/sources/configs/ValidatorOperatorConfig.move similarity index 100% rename from diem-move/diem-framework/core/sources/configs/ValidatorOperatorConfig.move rename to aptos-move/diem-framework/core/sources/configs/ValidatorOperatorConfig.move diff --git a/diem-move/diem-framework/core/transactional-tests/account_limits/test.broken b/aptos-move/diem-framework/core/transactional-tests/account_limits/test.broken similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/account_limits/test.broken rename to aptos-move/diem-framework/core/transactional-tests/account_limits/test.broken diff --git a/diem-move/diem-framework/core/transactional-tests/admin_scripts/basic_admin_script.exp b/aptos-move/diem-framework/core/transactional-tests/admin_scripts/basic_admin_script.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/admin_scripts/basic_admin_script.exp rename to aptos-move/diem-framework/core/transactional-tests/admin_scripts/basic_admin_script.exp diff --git a/diem-move/diem-framework/core/transactional-tests/admin_scripts/basic_admin_script.move b/aptos-move/diem-framework/core/transactional-tests/admin_scripts/basic_admin_script.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/admin_scripts/basic_admin_script.move rename to aptos-move/diem-framework/core/transactional-tests/admin_scripts/basic_admin_script.move diff --git a/diem-move/diem-framework/core/transactional-tests/designated_dealer/basics.exp b/aptos-move/diem-framework/core/transactional-tests/designated_dealer/basics.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/designated_dealer/basics.exp rename to aptos-move/diem-framework/core/transactional-tests/designated_dealer/basics.exp diff --git a/diem-move/diem-framework/core/transactional-tests/designated_dealer/basics.move b/aptos-move/diem-framework/core/transactional-tests/designated_dealer/basics.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/designated_dealer/basics.move rename to aptos-move/diem-framework/core/transactional-tests/designated_dealer/basics.move diff --git a/diem-move/diem-framework/core/transactional-tests/designated_dealer/burns.exp b/aptos-move/diem-framework/core/transactional-tests/designated_dealer/burns.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/designated_dealer/burns.exp rename to aptos-move/diem-framework/core/transactional-tests/designated_dealer/burns.exp diff --git a/diem-move/diem-framework/core/transactional-tests/designated_dealer/burns.move b/aptos-move/diem-framework/core/transactional-tests/designated_dealer/burns.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/designated_dealer/burns.move rename to aptos-move/diem-framework/core/transactional-tests/designated_dealer/burns.move diff --git a/diem-move/diem-framework/core/transactional-tests/designated_dealer/tiered_mint.exp b/aptos-move/diem-framework/core/transactional-tests/designated_dealer/tiered_mint.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/designated_dealer/tiered_mint.exp rename to aptos-move/diem-framework/core/transactional-tests/designated_dealer/tiered_mint.exp diff --git a/diem-move/diem-framework/core/transactional-tests/designated_dealer/tiered_mint.move b/aptos-move/diem-framework/core/transactional-tests/designated_dealer/tiered_mint.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/designated_dealer/tiered_mint.move rename to aptos-move/diem-framework/core/transactional-tests/designated_dealer/tiered_mint.move diff --git a/diem-move/diem-framework/core/transactional-tests/diem/add_currency.exp b/aptos-move/diem-framework/core/transactional-tests/diem/add_currency.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/diem/add_currency.exp rename to aptos-move/diem-framework/core/transactional-tests/diem/add_currency.exp diff --git a/diem-move/diem-framework/core/transactional-tests/diem/add_currency.move b/aptos-move/diem-framework/core/transactional-tests/diem/add_currency.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/diem/add_currency.move rename to aptos-move/diem-framework/core/transactional-tests/diem/add_currency.move diff --git a/diem-move/diem-framework/core/transactional-tests/diem/add_currency_to_system.exp b/aptos-move/diem-framework/core/transactional-tests/diem/add_currency_to_system.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/diem/add_currency_to_system.exp rename to aptos-move/diem-framework/core/transactional-tests/diem/add_currency_to_system.exp diff --git a/diem-move/diem-framework/core/transactional-tests/diem/add_currency_to_system.move b/aptos-move/diem-framework/core/transactional-tests/diem/add_currency_to_system.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/diem/add_currency_to_system.move rename to aptos-move/diem-framework/core/transactional-tests/diem/add_currency_to_system.move diff --git a/diem-move/diem-framework/core/transactional-tests/diem/blessing.exp b/aptos-move/diem-framework/core/transactional-tests/diem/blessing.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/diem/blessing.exp rename to aptos-move/diem-framework/core/transactional-tests/diem/blessing.exp diff --git a/diem-move/diem-framework/core/transactional-tests/diem/blessing.move b/aptos-move/diem-framework/core/transactional-tests/diem/blessing.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/diem/blessing.move rename to aptos-move/diem-framework/core/transactional-tests/diem/blessing.move diff --git a/diem-move/diem-framework/core/transactional-tests/diem/functionality.exp b/aptos-move/diem-framework/core/transactional-tests/diem/functionality.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/diem/functionality.exp rename to aptos-move/diem-framework/core/transactional-tests/diem/functionality.exp diff --git a/diem-move/diem-framework/core/transactional-tests/diem/functionality.move b/aptos-move/diem-framework/core/transactional-tests/diem/functionality.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/diem/functionality.move rename to aptos-move/diem-framework/core/transactional-tests/diem/functionality.move diff --git a/diem-move/diem-framework/core/transactional-tests/diem/mint.exp b/aptos-move/diem-framework/core/transactional-tests/diem/mint.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/diem/mint.exp rename to aptos-move/diem-framework/core/transactional-tests/diem/mint.exp diff --git a/diem-move/diem-framework/core/transactional-tests/diem/mint.move b/aptos-move/diem-framework/core/transactional-tests/diem/mint.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/diem/mint.move rename to aptos-move/diem-framework/core/transactional-tests/diem/mint.move diff --git a/diem-move/diem-framework/core/transactional-tests/diem/multi_currency.exp b/aptos-move/diem-framework/core/transactional-tests/diem/multi_currency.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/diem/multi_currency.exp rename to aptos-move/diem-framework/core/transactional-tests/diem/multi_currency.exp diff --git a/diem-move/diem-framework/core/transactional-tests/diem/multi_currency.move b/aptos-move/diem-framework/core/transactional-tests/diem/multi_currency.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/diem/multi_currency.move rename to aptos-move/diem-framework/core/transactional-tests/diem/multi_currency.move diff --git a/diem-move/diem-framework/core/transactional-tests/diem/preburn_burn.exp b/aptos-move/diem-framework/core/transactional-tests/diem/preburn_burn.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/diem/preburn_burn.exp rename to aptos-move/diem-framework/core/transactional-tests/diem/preburn_burn.exp diff --git a/diem-move/diem-framework/core/transactional-tests/diem/preburn_burn.move b/aptos-move/diem-framework/core/transactional-tests/diem/preburn_burn.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/diem/preburn_burn.move rename to aptos-move/diem-framework/core/transactional-tests/diem/preburn_burn.move diff --git a/diem-move/diem-framework/core/transactional-tests/diem/stop_minting.exp b/aptos-move/diem-framework/core/transactional-tests/diem/stop_minting.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/diem/stop_minting.exp rename to aptos-move/diem-framework/core/transactional-tests/diem/stop_minting.exp diff --git a/diem-move/diem-framework/core/transactional-tests/diem/stop_minting.move b/aptos-move/diem-framework/core/transactional-tests/diem/stop_minting.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/diem/stop_minting.move rename to aptos-move/diem-framework/core/transactional-tests/diem/stop_minting.move diff --git a/diem-move/diem-framework/core/transactional-tests/diem/xus.exp b/aptos-move/diem-framework/core/transactional-tests/diem/xus.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/diem/xus.exp rename to aptos-move/diem-framework/core/transactional-tests/diem/xus.exp diff --git a/diem-move/diem-framework/core/transactional-tests/diem/xus.move b/aptos-move/diem-framework/core/transactional-tests/diem/xus.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/diem/xus.move rename to aptos-move/diem-framework/core/transactional-tests/diem/xus.move diff --git a/diem-move/diem-framework/core/transactional-tests/diem_account/basics.exp b/aptos-move/diem-framework/core/transactional-tests/diem_account/basics.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/diem_account/basics.exp rename to aptos-move/diem-framework/core/transactional-tests/diem_account/basics.exp diff --git a/diem-move/diem-framework/core/transactional-tests/diem_account/basics.move b/aptos-move/diem-framework/core/transactional-tests/diem_account/basics.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/diem_account/basics.move rename to aptos-move/diem-framework/core/transactional-tests/diem_account/basics.move diff --git a/diem-move/diem-framework/core/transactional-tests/diem_account/create_account.exp b/aptos-move/diem-framework/core/transactional-tests/diem_account/create_account.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/diem_account/create_account.exp rename to aptos-move/diem-framework/core/transactional-tests/diem_account/create_account.exp diff --git a/diem-move/diem-framework/core/transactional-tests/diem_account/create_account.move b/aptos-move/diem-framework/core/transactional-tests/diem_account/create_account.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/diem_account/create_account.move rename to aptos-move/diem-framework/core/transactional-tests/diem_account/create_account.move diff --git a/diem-move/diem-framework/core/transactional-tests/diem_account/create_reserved.exp b/aptos-move/diem-framework/core/transactional-tests/diem_account/create_reserved.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/diem_account/create_reserved.exp rename to aptos-move/diem-framework/core/transactional-tests/diem_account/create_reserved.exp diff --git a/diem-move/diem-framework/core/transactional-tests/diem_account/create_reserved.move b/aptos-move/diem-framework/core/transactional-tests/diem_account/create_reserved.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/diem_account/create_reserved.move rename to aptos-move/diem-framework/core/transactional-tests/diem_account/create_reserved.move diff --git a/diem-move/diem-framework/core/transactional-tests/diem_account/delegate_rotation_capability.exp b/aptos-move/diem-framework/core/transactional-tests/diem_account/delegate_rotation_capability.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/diem_account/delegate_rotation_capability.exp rename to aptos-move/diem-framework/core/transactional-tests/diem_account/delegate_rotation_capability.exp diff --git a/diem-move/diem-framework/core/transactional-tests/diem_account/delegate_rotation_capability.move b/aptos-move/diem-framework/core/transactional-tests/diem_account/delegate_rotation_capability.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/diem_account/delegate_rotation_capability.move rename to aptos-move/diem-framework/core/transactional-tests/diem_account/delegate_rotation_capability.move diff --git a/diem-move/diem-framework/core/transactional-tests/diem_account/delegate_withdrawal_capability.exp b/aptos-move/diem-framework/core/transactional-tests/diem_account/delegate_withdrawal_capability.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/diem_account/delegate_withdrawal_capability.exp rename to aptos-move/diem-framework/core/transactional-tests/diem_account/delegate_withdrawal_capability.exp diff --git a/diem-move/diem-framework/core/transactional-tests/diem_account/delegate_withdrawal_capability.move b/aptos-move/diem-framework/core/transactional-tests/diem_account/delegate_withdrawal_capability.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/diem_account/delegate_withdrawal_capability.move rename to aptos-move/diem-framework/core/transactional-tests/diem_account/delegate_withdrawal_capability.move diff --git a/diem-move/diem-framework/core/transactional-tests/diem_account/different_currency.exp b/aptos-move/diem-framework/core/transactional-tests/diem_account/different_currency.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/diem_account/different_currency.exp rename to aptos-move/diem-framework/core/transactional-tests/diem_account/different_currency.exp diff --git a/diem-move/diem-framework/core/transactional-tests/diem_account/different_currency.move b/aptos-move/diem-framework/core/transactional-tests/diem_account/different_currency.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/diem_account/different_currency.move rename to aptos-move/diem-framework/core/transactional-tests/diem_account/different_currency.move diff --git a/diem-move/diem-framework/core/transactional-tests/diem_account/freezing.exp b/aptos-move/diem-framework/core/transactional-tests/diem_account/freezing.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/diem_account/freezing.exp rename to aptos-move/diem-framework/core/transactional-tests/diem_account/freezing.exp diff --git a/diem-move/diem-framework/core/transactional-tests/diem_account/freezing.move b/aptos-move/diem-framework/core/transactional-tests/diem_account/freezing.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/diem_account/freezing.move rename to aptos-move/diem-framework/core/transactional-tests/diem_account/freezing.move diff --git a/diem-move/diem-framework/core/transactional-tests/diem_account/pay_with_capability.exp b/aptos-move/diem-framework/core/transactional-tests/diem_account/pay_with_capability.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/diem_account/pay_with_capability.exp rename to aptos-move/diem-framework/core/transactional-tests/diem_account/pay_with_capability.exp diff --git a/diem-move/diem-framework/core/transactional-tests/diem_account/pay_with_capability.move b/aptos-move/diem-framework/core/transactional-tests/diem_account/pay_with_capability.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/diem_account/pay_with_capability.move rename to aptos-move/diem-framework/core/transactional-tests/diem_account/pay_with_capability.move diff --git a/diem-move/diem-framework/core/transactional-tests/diem_account/remove_then_replace_rotation_capability.exp b/aptos-move/diem-framework/core/transactional-tests/diem_account/remove_then_replace_rotation_capability.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/diem_account/remove_then_replace_rotation_capability.exp rename to aptos-move/diem-framework/core/transactional-tests/diem_account/remove_then_replace_rotation_capability.exp diff --git a/diem-move/diem-framework/core/transactional-tests/diem_account/remove_then_replace_rotation_capability.move b/aptos-move/diem-framework/core/transactional-tests/diem_account/remove_then_replace_rotation_capability.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/diem_account/remove_then_replace_rotation_capability.move rename to aptos-move/diem-framework/core/transactional-tests/diem_account/remove_then_replace_rotation_capability.move diff --git a/diem-move/diem-framework/core/transactional-tests/diem_account/remove_then_replace_withdrawal_capability.exp b/aptos-move/diem-framework/core/transactional-tests/diem_account/remove_then_replace_withdrawal_capability.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/diem_account/remove_then_replace_withdrawal_capability.exp rename to aptos-move/diem-framework/core/transactional-tests/diem_account/remove_then_replace_withdrawal_capability.exp diff --git a/diem-move/diem-framework/core/transactional-tests/diem_account/remove_then_replace_withdrawal_capability.move b/aptos-move/diem-framework/core/transactional-tests/diem_account/remove_then_replace_withdrawal_capability.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/diem_account/remove_then_replace_withdrawal_capability.move rename to aptos-move/diem-framework/core/transactional-tests/diem_account/remove_then_replace_withdrawal_capability.move diff --git a/diem-move/diem-framework/core/transactional-tests/dual_attestation/tests.exp b/aptos-move/diem-framework/core/transactional-tests/dual_attestation/tests.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/dual_attestation/tests.exp rename to aptos-move/diem-framework/core/transactional-tests/dual_attestation/tests.exp diff --git a/diem-move/diem-framework/core/transactional-tests/dual_attestation/tests.move b/aptos-move/diem-framework/core/transactional-tests/dual_attestation/tests.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/dual_attestation/tests.move rename to aptos-move/diem-framework/core/transactional-tests/dual_attestation/tests.move diff --git a/diem-move/diem-framework/core/transactional-tests/epilogue/charge_less_gas_for_less_work.exp b/aptos-move/diem-framework/core/transactional-tests/epilogue/charge_less_gas_for_less_work.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/epilogue/charge_less_gas_for_less_work.exp rename to aptos-move/diem-framework/core/transactional-tests/epilogue/charge_less_gas_for_less_work.exp diff --git a/diem-move/diem-framework/core/transactional-tests/epilogue/charge_less_gas_for_less_work.move b/aptos-move/diem-framework/core/transactional-tests/epilogue/charge_less_gas_for_less_work.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/epilogue/charge_less_gas_for_less_work.move rename to aptos-move/diem-framework/core/transactional-tests/epilogue/charge_less_gas_for_less_work.move diff --git a/diem-move/diem-framework/core/transactional-tests/epilogue/dont_increment_sequence_number_on_sequence_number_too_new.exp b/aptos-move/diem-framework/core/transactional-tests/epilogue/dont_increment_sequence_number_on_sequence_number_too_new.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/epilogue/dont_increment_sequence_number_on_sequence_number_too_new.exp rename to aptos-move/diem-framework/core/transactional-tests/epilogue/dont_increment_sequence_number_on_sequence_number_too_new.exp diff --git a/diem-move/diem-framework/core/transactional-tests/epilogue/dont_increment_sequence_number_on_sequence_number_too_new.move b/aptos-move/diem-framework/core/transactional-tests/epilogue/dont_increment_sequence_number_on_sequence_number_too_new.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/epilogue/dont_increment_sequence_number_on_sequence_number_too_new.move rename to aptos-move/diem-framework/core/transactional-tests/epilogue/dont_increment_sequence_number_on_sequence_number_too_new.move diff --git a/diem-move/diem-framework/core/transactional-tests/epilogue/dont_increment_sequence_number_on_sequence_number_too_old.exp b/aptos-move/diem-framework/core/transactional-tests/epilogue/dont_increment_sequence_number_on_sequence_number_too_old.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/epilogue/dont_increment_sequence_number_on_sequence_number_too_old.exp rename to aptos-move/diem-framework/core/transactional-tests/epilogue/dont_increment_sequence_number_on_sequence_number_too_old.exp diff --git a/diem-move/diem-framework/core/transactional-tests/epilogue/dont_increment_sequence_number_on_sequence_number_too_old.move b/aptos-move/diem-framework/core/transactional-tests/epilogue/dont_increment_sequence_number_on_sequence_number_too_old.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/epilogue/dont_increment_sequence_number_on_sequence_number_too_old.move rename to aptos-move/diem-framework/core/transactional-tests/epilogue/dont_increment_sequence_number_on_sequence_number_too_old.move diff --git a/diem-move/diem-framework/core/transactional-tests/epilogue/failure_epilogue_limit_exceeded.exp b/aptos-move/diem-framework/core/transactional-tests/epilogue/failure_epilogue_limit_exceeded.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/epilogue/failure_epilogue_limit_exceeded.exp rename to aptos-move/diem-framework/core/transactional-tests/epilogue/failure_epilogue_limit_exceeded.exp diff --git a/diem-move/diem-framework/core/transactional-tests/epilogue/failure_epilogue_limit_exceeded.move b/aptos-move/diem-framework/core/transactional-tests/epilogue/failure_epilogue_limit_exceeded.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/epilogue/failure_epilogue_limit_exceeded.move rename to aptos-move/diem-framework/core/transactional-tests/epilogue/failure_epilogue_limit_exceeded.move diff --git a/diem-move/diem-framework/core/transactional-tests/epilogue/fib_out_of_gas.exp b/aptos-move/diem-framework/core/transactional-tests/epilogue/fib_out_of_gas.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/epilogue/fib_out_of_gas.exp rename to aptos-move/diem-framework/core/transactional-tests/epilogue/fib_out_of_gas.exp diff --git a/diem-move/diem-framework/core/transactional-tests/epilogue/fib_out_of_gas.move b/aptos-move/diem-framework/core/transactional-tests/epilogue/fib_out_of_gas.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/epilogue/fib_out_of_gas.move rename to aptos-move/diem-framework/core/transactional-tests/epilogue/fib_out_of_gas.move diff --git a/diem-move/diem-framework/core/transactional-tests/epilogue/good_transaction_consumes_gas_less_than_or_equal_to_set_maximum.exp b/aptos-move/diem-framework/core/transactional-tests/epilogue/good_transaction_consumes_gas_less_than_or_equal_to_set_maximum.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/epilogue/good_transaction_consumes_gas_less_than_or_equal_to_set_maximum.exp rename to aptos-move/diem-framework/core/transactional-tests/epilogue/good_transaction_consumes_gas_less_than_or_equal_to_set_maximum.exp diff --git a/diem-move/diem-framework/core/transactional-tests/epilogue/good_transaction_consumes_gas_less_than_or_equal_to_set_maximum.move b/aptos-move/diem-framework/core/transactional-tests/epilogue/good_transaction_consumes_gas_less_than_or_equal_to_set_maximum.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/epilogue/good_transaction_consumes_gas_less_than_or_equal_to_set_maximum.move rename to aptos-move/diem-framework/core/transactional-tests/epilogue/good_transaction_consumes_gas_less_than_or_equal_to_set_maximum.move diff --git a/diem-move/diem-framework/core/transactional-tests/epilogue/increment_sequence_number_on_tx_script_failure.exp b/aptos-move/diem-framework/core/transactional-tests/epilogue/increment_sequence_number_on_tx_script_failure.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/epilogue/increment_sequence_number_on_tx_script_failure.exp rename to aptos-move/diem-framework/core/transactional-tests/epilogue/increment_sequence_number_on_tx_script_failure.exp diff --git a/diem-move/diem-framework/core/transactional-tests/epilogue/increment_sequence_number_on_tx_script_failure.move b/aptos-move/diem-framework/core/transactional-tests/epilogue/increment_sequence_number_on_tx_script_failure.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/epilogue/increment_sequence_number_on_tx_script_failure.move rename to aptos-move/diem-framework/core/transactional-tests/epilogue/increment_sequence_number_on_tx_script_failure.move diff --git a/diem-move/diem-framework/core/transactional-tests/epilogue/increment_sequence_number_on_tx_script_success.exp b/aptos-move/diem-framework/core/transactional-tests/epilogue/increment_sequence_number_on_tx_script_success.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/epilogue/increment_sequence_number_on_tx_script_success.exp rename to aptos-move/diem-framework/core/transactional-tests/epilogue/increment_sequence_number_on_tx_script_success.exp diff --git a/diem-move/diem-framework/core/transactional-tests/epilogue/increment_sequence_number_on_tx_script_success.move b/aptos-move/diem-framework/core/transactional-tests/epilogue/increment_sequence_number_on_tx_script_success.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/epilogue/increment_sequence_number_on_tx_script_success.move rename to aptos-move/diem-framework/core/transactional-tests/epilogue/increment_sequence_number_on_tx_script_success.move diff --git a/diem-move/diem-framework/core/transactional-tests/epilogue/loop_out_of_gas.exp b/aptos-move/diem-framework/core/transactional-tests/epilogue/loop_out_of_gas.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/epilogue/loop_out_of_gas.exp rename to aptos-move/diem-framework/core/transactional-tests/epilogue/loop_out_of_gas.exp diff --git a/diem-move/diem-framework/core/transactional-tests/epilogue/loop_out_of_gas.move b/aptos-move/diem-framework/core/transactional-tests/epilogue/loop_out_of_gas.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/epilogue/loop_out_of_gas.move rename to aptos-move/diem-framework/core/transactional-tests/epilogue/loop_out_of_gas.move diff --git a/diem-move/diem-framework/core/transactional-tests/epilogue/out_of_gas_in_nested_module.exp b/aptos-move/diem-framework/core/transactional-tests/epilogue/out_of_gas_in_nested_module.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/epilogue/out_of_gas_in_nested_module.exp rename to aptos-move/diem-framework/core/transactional-tests/epilogue/out_of_gas_in_nested_module.exp diff --git a/diem-move/diem-framework/core/transactional-tests/epilogue/out_of_gas_in_nested_module.move b/aptos-move/diem-framework/core/transactional-tests/epilogue/out_of_gas_in_nested_module.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/epilogue/out_of_gas_in_nested_module.move rename to aptos-move/diem-framework/core/transactional-tests/epilogue/out_of_gas_in_nested_module.move diff --git a/diem-move/diem-framework/core/transactional-tests/epilogue/recursion_out_of_gas.exp b/aptos-move/diem-framework/core/transactional-tests/epilogue/recursion_out_of_gas.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/epilogue/recursion_out_of_gas.exp rename to aptos-move/diem-framework/core/transactional-tests/epilogue/recursion_out_of_gas.exp diff --git a/diem-move/diem-framework/core/transactional-tests/epilogue/recursion_out_of_gas.move b/aptos-move/diem-framework/core/transactional-tests/epilogue/recursion_out_of_gas.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/epilogue/recursion_out_of_gas.move rename to aptos-move/diem-framework/core/transactional-tests/epilogue/recursion_out_of_gas.move diff --git a/diem-move/diem-framework/core/transactional-tests/epilogue/revert_tx_script_state_changes_after_failed_epilogue.exp b/aptos-move/diem-framework/core/transactional-tests/epilogue/revert_tx_script_state_changes_after_failed_epilogue.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/epilogue/revert_tx_script_state_changes_after_failed_epilogue.exp rename to aptos-move/diem-framework/core/transactional-tests/epilogue/revert_tx_script_state_changes_after_failed_epilogue.exp diff --git a/diem-move/diem-framework/core/transactional-tests/epilogue/revert_tx_script_state_changes_after_failed_epilogue.move b/aptos-move/diem-framework/core/transactional-tests/epilogue/revert_tx_script_state_changes_after_failed_epilogue.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/epilogue/revert_tx_script_state_changes_after_failed_epilogue.move rename to aptos-move/diem-framework/core/transactional-tests/epilogue/revert_tx_script_state_changes_after_failed_epilogue.move diff --git a/diem-move/diem-framework/core/transactional-tests/epilogue/revert_tx_script_state_changes_after_failure.exp b/aptos-move/diem-framework/core/transactional-tests/epilogue/revert_tx_script_state_changes_after_failure.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/epilogue/revert_tx_script_state_changes_after_failure.exp rename to aptos-move/diem-framework/core/transactional-tests/epilogue/revert_tx_script_state_changes_after_failure.exp diff --git a/diem-move/diem-framework/core/transactional-tests/epilogue/revert_tx_script_state_changes_after_failure.move b/aptos-move/diem-framework/core/transactional-tests/epilogue/revert_tx_script_state_changes_after_failure.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/epilogue/revert_tx_script_state_changes_after_failure.move rename to aptos-move/diem-framework/core/transactional-tests/epilogue/revert_tx_script_state_changes_after_failure.move diff --git a/diem-move/diem-framework/core/transactional-tests/epilogue/success_epilogue_limit_exceeded.exp b/aptos-move/diem-framework/core/transactional-tests/epilogue/success_epilogue_limit_exceeded.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/epilogue/success_epilogue_limit_exceeded.exp rename to aptos-move/diem-framework/core/transactional-tests/epilogue/success_epilogue_limit_exceeded.exp diff --git a/diem-move/diem-framework/core/transactional-tests/epilogue/success_epilogue_limit_exceeded.move b/aptos-move/diem-framework/core/transactional-tests/epilogue/success_epilogue_limit_exceeded.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/epilogue/success_epilogue_limit_exceeded.move rename to aptos-move/diem-framework/core/transactional-tests/epilogue/success_epilogue_limit_exceeded.move diff --git a/diem-move/diem-framework/core/transactional-tests/epilogue/while_out_of_gas.exp b/aptos-move/diem-framework/core/transactional-tests/epilogue/while_out_of_gas.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/epilogue/while_out_of_gas.exp rename to aptos-move/diem-framework/core/transactional-tests/epilogue/while_out_of_gas.exp diff --git a/diem-move/diem-framework/core/transactional-tests/epilogue/while_out_of_gas.move b/aptos-move/diem-framework/core/transactional-tests/epilogue/while_out_of_gas.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/epilogue/while_out_of_gas.move rename to aptos-move/diem-framework/core/transactional-tests/epilogue/while_out_of_gas.move diff --git a/diem-move/diem-framework/core/transactional-tests/events/event_emit_struct.exp b/aptos-move/diem-framework/core/transactional-tests/events/event_emit_struct.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/events/event_emit_struct.exp rename to aptos-move/diem-framework/core/transactional-tests/events/event_emit_struct.exp diff --git a/diem-move/diem-framework/core/transactional-tests/events/event_emit_struct.move b/aptos-move/diem-framework/core/transactional-tests/events/event_emit_struct.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/events/event_emit_struct.move rename to aptos-move/diem-framework/core/transactional-tests/events/event_emit_struct.move diff --git a/diem-move/diem-framework/core/transactional-tests/events/event_emit_struct_with_type_params.exp b/aptos-move/diem-framework/core/transactional-tests/events/event_emit_struct_with_type_params.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/events/event_emit_struct_with_type_params.exp rename to aptos-move/diem-framework/core/transactional-tests/events/event_emit_struct_with_type_params.exp diff --git a/diem-move/diem-framework/core/transactional-tests/events/event_emit_struct_with_type_params.move b/aptos-move/diem-framework/core/transactional-tests/events/event_emit_struct_with_type_params.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/events/event_emit_struct_with_type_params.move rename to aptos-move/diem-framework/core/transactional-tests/events/event_emit_struct_with_type_params.move diff --git a/diem-move/diem-framework/core/transactional-tests/events/event_emit_u64.exp b/aptos-move/diem-framework/core/transactional-tests/events/event_emit_u64.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/events/event_emit_u64.exp rename to aptos-move/diem-framework/core/transactional-tests/events/event_emit_u64.exp diff --git a/diem-move/diem-framework/core/transactional-tests/events/event_emit_u64.move b/aptos-move/diem-framework/core/transactional-tests/events/event_emit_u64.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/events/event_emit_u64.move rename to aptos-move/diem-framework/core/transactional-tests/events/event_emit_u64.move diff --git a/diem-move/diem-framework/core/transactional-tests/genesis/genesis_account_sequence_numbers.exp b/aptos-move/diem-framework/core/transactional-tests/genesis/genesis_account_sequence_numbers.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/genesis/genesis_account_sequence_numbers.exp rename to aptos-move/diem-framework/core/transactional-tests/genesis/genesis_account_sequence_numbers.exp diff --git a/diem-move/diem-framework/core/transactional-tests/genesis/genesis_account_sequence_numbers.move b/aptos-move/diem-framework/core/transactional-tests/genesis/genesis_account_sequence_numbers.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/genesis/genesis_account_sequence_numbers.move rename to aptos-move/diem-framework/core/transactional-tests/genesis/genesis_account_sequence_numbers.move diff --git a/diem-move/diem-framework/core/transactional-tests/multi_agent_scripts/multi_agent_peer_to_peer.exp b/aptos-move/diem-framework/core/transactional-tests/multi_agent_scripts/multi_agent_peer_to_peer.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/multi_agent_scripts/multi_agent_peer_to_peer.exp rename to aptos-move/diem-framework/core/transactional-tests/multi_agent_scripts/multi_agent_peer_to_peer.exp diff --git a/diem-move/diem-framework/core/transactional-tests/multi_agent_scripts/multi_agent_peer_to_peer.move b/aptos-move/diem-framework/core/transactional-tests/multi_agent_scripts/multi_agent_peer_to_peer.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/multi_agent_scripts/multi_agent_peer_to_peer.move rename to aptos-move/diem-framework/core/transactional-tests/multi_agent_scripts/multi_agent_peer_to_peer.move diff --git a/diem-move/diem-framework/core/transactional-tests/network_identity/network_identity.exp b/aptos-move/diem-framework/core/transactional-tests/network_identity/network_identity.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/network_identity/network_identity.exp rename to aptos-move/diem-framework/core/transactional-tests/network_identity/network_identity.exp diff --git a/diem-move/diem-framework/core/transactional-tests/network_identity/network_identity.move b/aptos-move/diem-framework/core/transactional-tests/network_identity/network_identity.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/network_identity/network_identity.move rename to aptos-move/diem-framework/core/transactional-tests/network_identity/network_identity.move diff --git a/diem-move/diem-framework/core/transactional-tests/on_chain_config/change_publishing_options.exp b/aptos-move/diem-framework/core/transactional-tests/on_chain_config/change_publishing_options.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/on_chain_config/change_publishing_options.exp rename to aptos-move/diem-framework/core/transactional-tests/on_chain_config/change_publishing_options.exp diff --git a/diem-move/diem-framework/core/transactional-tests/on_chain_config/change_publishing_options.move b/aptos-move/diem-framework/core/transactional-tests/on_chain_config/change_publishing_options.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/on_chain_config/change_publishing_options.move rename to aptos-move/diem-framework/core/transactional-tests/on_chain_config/change_publishing_options.move diff --git a/diem-move/diem-framework/core/transactional-tests/on_chain_config/disable_txes.exp b/aptos-move/diem-framework/core/transactional-tests/on_chain_config/disable_txes.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/on_chain_config/disable_txes.exp rename to aptos-move/diem-framework/core/transactional-tests/on_chain_config/disable_txes.exp diff --git a/diem-move/diem-framework/core/transactional-tests/on_chain_config/disable_txes.move b/aptos-move/diem-framework/core/transactional-tests/on_chain_config/disable_txes.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/on_chain_config/disable_txes.move rename to aptos-move/diem-framework/core/transactional-tests/on_chain_config/disable_txes.move diff --git a/diem-move/diem-framework/core/transactional-tests/on_chain_config/vm_config.exp b/aptos-move/diem-framework/core/transactional-tests/on_chain_config/vm_config.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/on_chain_config/vm_config.exp rename to aptos-move/diem-framework/core/transactional-tests/on_chain_config/vm_config.exp diff --git a/diem-move/diem-framework/core/transactional-tests/on_chain_config/vm_config.move b/aptos-move/diem-framework/core/transactional-tests/on_chain_config/vm_config.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/on_chain_config/vm_config.move rename to aptos-move/diem-framework/core/transactional-tests/on_chain_config/vm_config.move diff --git a/diem-move/diem-framework/core/transactional-tests/payment/cant_overdraft.exp b/aptos-move/diem-framework/core/transactional-tests/payment/cant_overdraft.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/payment/cant_overdraft.exp rename to aptos-move/diem-framework/core/transactional-tests/payment/cant_overdraft.exp diff --git a/diem-move/diem-framework/core/transactional-tests/payment/cant_overdraft.move b/aptos-move/diem-framework/core/transactional-tests/payment/cant_overdraft.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/payment/cant_overdraft.move rename to aptos-move/diem-framework/core/transactional-tests/payment/cant_overdraft.move diff --git a/diem-move/diem-framework/core/transactional-tests/payment/check_balance.exp b/aptos-move/diem-framework/core/transactional-tests/payment/check_balance.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/payment/check_balance.exp rename to aptos-move/diem-framework/core/transactional-tests/payment/check_balance.exp diff --git a/diem-move/diem-framework/core/transactional-tests/payment/check_balance.move b/aptos-move/diem-framework/core/transactional-tests/payment/check_balance.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/payment/check_balance.move rename to aptos-move/diem-framework/core/transactional-tests/payment/check_balance.move diff --git a/diem-move/diem-framework/core/transactional-tests/payment/payment_metadata.exp b/aptos-move/diem-framework/core/transactional-tests/payment/payment_metadata.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/payment/payment_metadata.exp rename to aptos-move/diem-framework/core/transactional-tests/payment/payment_metadata.exp diff --git a/diem-move/diem-framework/core/transactional-tests/payment/payment_metadata.move b/aptos-move/diem-framework/core/transactional-tests/payment/payment_metadata.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/payment/payment_metadata.move rename to aptos-move/diem-framework/core/transactional-tests/payment/payment_metadata.move diff --git a/diem-move/diem-framework/core/transactional-tests/payment/peer_to_peer_payment.exp b/aptos-move/diem-framework/core/transactional-tests/payment/peer_to_peer_payment.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/payment/peer_to_peer_payment.exp rename to aptos-move/diem-framework/core/transactional-tests/payment/peer_to_peer_payment.exp diff --git a/diem-move/diem-framework/core/transactional-tests/payment/peer_to_peer_payment.move b/aptos-move/diem-framework/core/transactional-tests/payment/peer_to_peer_payment.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/payment/peer_to_peer_payment.move rename to aptos-move/diem-framework/core/transactional-tests/payment/peer_to_peer_payment.move diff --git a/diem-move/diem-framework/core/transactional-tests/payment/zero_payment.exp b/aptos-move/diem-framework/core/transactional-tests/payment/zero_payment.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/payment/zero_payment.exp rename to aptos-move/diem-framework/core/transactional-tests/payment/zero_payment.exp diff --git a/diem-move/diem-framework/core/transactional-tests/payment/zero_payment.move b/aptos-move/diem-framework/core/transactional-tests/payment/zero_payment.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/payment/zero_payment.move rename to aptos-move/diem-framework/core/transactional-tests/payment/zero_payment.move diff --git a/diem-move/diem-framework/core/transactional-tests/prologue/fail_if_cant_pay_deposit.exp b/aptos-move/diem-framework/core/transactional-tests/prologue/fail_if_cant_pay_deposit.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/prologue/fail_if_cant_pay_deposit.exp rename to aptos-move/diem-framework/core/transactional-tests/prologue/fail_if_cant_pay_deposit.exp diff --git a/diem-move/diem-framework/core/transactional-tests/prologue/fail_if_cant_pay_deposit.move b/aptos-move/diem-framework/core/transactional-tests/prologue/fail_if_cant_pay_deposit.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/prologue/fail_if_cant_pay_deposit.move rename to aptos-move/diem-framework/core/transactional-tests/prologue/fail_if_cant_pay_deposit.move diff --git a/diem-move/diem-framework/core/transactional-tests/prologue/prologue_invalid_gas_currency.exp b/aptos-move/diem-framework/core/transactional-tests/prologue/prologue_invalid_gas_currency.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/prologue/prologue_invalid_gas_currency.exp rename to aptos-move/diem-framework/core/transactional-tests/prologue/prologue_invalid_gas_currency.exp diff --git a/diem-move/diem-framework/core/transactional-tests/prologue/prologue_invalid_gas_currency.move b/aptos-move/diem-framework/core/transactional-tests/prologue/prologue_invalid_gas_currency.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/prologue/prologue_invalid_gas_currency.move rename to aptos-move/diem-framework/core/transactional-tests/prologue/prologue_invalid_gas_currency.move diff --git a/diem-move/diem-framework/core/transactional-tests/prologue/sequence_number.exp b/aptos-move/diem-framework/core/transactional-tests/prologue/sequence_number.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/prologue/sequence_number.exp rename to aptos-move/diem-framework/core/transactional-tests/prologue/sequence_number.exp diff --git a/diem-move/diem-framework/core/transactional-tests/prologue/sequence_number.move b/aptos-move/diem-framework/core/transactional-tests/prologue/sequence_number.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/prologue/sequence_number.move rename to aptos-move/diem-framework/core/transactional-tests/prologue/sequence_number.move diff --git a/diem-move/diem-framework/core/transactional-tests/reconfiguration/reconfiguration.exp b/aptos-move/diem-framework/core/transactional-tests/reconfiguration/reconfiguration.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/reconfiguration/reconfiguration.exp rename to aptos-move/diem-framework/core/transactional-tests/reconfiguration/reconfiguration.exp diff --git a/diem-move/diem-framework/core/transactional-tests/reconfiguration/reconfiguration.move b/aptos-move/diem-framework/core/transactional-tests/reconfiguration/reconfiguration.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/reconfiguration/reconfiguration.move rename to aptos-move/diem-framework/core/transactional-tests/reconfiguration/reconfiguration.move diff --git a/diem-move/diem-framework/core/transactional-tests/recovery_address/basics.exp b/aptos-move/diem-framework/core/transactional-tests/recovery_address/basics.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/recovery_address/basics.exp rename to aptos-move/diem-framework/core/transactional-tests/recovery_address/basics.exp diff --git a/diem-move/diem-framework/core/transactional-tests/recovery_address/basics.move b/aptos-move/diem-framework/core/transactional-tests/recovery_address/basics.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/recovery_address/basics.move rename to aptos-move/diem-framework/core/transactional-tests/recovery_address/basics.move diff --git a/diem-move/diem-framework/core/transactional-tests/recovery_address/invalid_rotation_capability.exp b/aptos-move/diem-framework/core/transactional-tests/recovery_address/invalid_rotation_capability.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/recovery_address/invalid_rotation_capability.exp rename to aptos-move/diem-framework/core/transactional-tests/recovery_address/invalid_rotation_capability.exp diff --git a/diem-move/diem-framework/core/transactional-tests/recovery_address/invalid_rotation_capability.move b/aptos-move/diem-framework/core/transactional-tests/recovery_address/invalid_rotation_capability.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/recovery_address/invalid_rotation_capability.move rename to aptos-move/diem-framework/core/transactional-tests/recovery_address/invalid_rotation_capability.move diff --git a/diem-move/diem-framework/core/transactional-tests/sliding_nonce/basics.exp b/aptos-move/diem-framework/core/transactional-tests/sliding_nonce/basics.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/sliding_nonce/basics.exp rename to aptos-move/diem-framework/core/transactional-tests/sliding_nonce/basics.exp diff --git a/diem-move/diem-framework/core/transactional-tests/sliding_nonce/basics.move b/aptos-move/diem-framework/core/transactional-tests/sliding_nonce/basics.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/sliding_nonce/basics.move rename to aptos-move/diem-framework/core/transactional-tests/sliding_nonce/basics.move diff --git a/diem-move/diem-framework/core/transactional-tests/sliding_nonce/test.exp b/aptos-move/diem-framework/core/transactional-tests/sliding_nonce/test.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/sliding_nonce/test.exp rename to aptos-move/diem-framework/core/transactional-tests/sliding_nonce/test.exp diff --git a/diem-move/diem-framework/core/transactional-tests/sliding_nonce/test.move b/aptos-move/diem-framework/core/transactional-tests/sliding_nonce/test.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/sliding_nonce/test.move rename to aptos-move/diem-framework/core/transactional-tests/sliding_nonce/test.move diff --git a/diem-move/diem-framework/core/transactional-tests/smoke_tests/approved_payment.exp b/aptos-move/diem-framework/core/transactional-tests/smoke_tests/approved_payment.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/smoke_tests/approved_payment.exp rename to aptos-move/diem-framework/core/transactional-tests/smoke_tests/approved_payment.exp diff --git a/diem-move/diem-framework/core/transactional-tests/smoke_tests/approved_payment.move b/aptos-move/diem-framework/core/transactional-tests/smoke_tests/approved_payment.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/smoke_tests/approved_payment.move rename to aptos-move/diem-framework/core/transactional-tests/smoke_tests/approved_payment.move diff --git a/diem-move/diem-framework/core/transactional-tests/sys_admin/update_diem_version.exp b/aptos-move/diem-framework/core/transactional-tests/sys_admin/update_diem_version.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/sys_admin/update_diem_version.exp rename to aptos-move/diem-framework/core/transactional-tests/sys_admin/update_diem_version.exp diff --git a/diem-move/diem-framework/core/transactional-tests/sys_admin/update_diem_version.move b/aptos-move/diem-framework/core/transactional-tests/sys_admin/update_diem_version.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/sys_admin/update_diem_version.move rename to aptos-move/diem-framework/core/transactional-tests/sys_admin/update_diem_version.move diff --git a/diem-move/diem-framework/core/transactional-tests/transaction_fee/add_transaction_fee_currency.exp b/aptos-move/diem-framework/core/transactional-tests/transaction_fee/add_transaction_fee_currency.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/transaction_fee/add_transaction_fee_currency.exp rename to aptos-move/diem-framework/core/transactional-tests/transaction_fee/add_transaction_fee_currency.exp diff --git a/diem-move/diem-framework/core/transactional-tests/transaction_fee/add_transaction_fee_currency.move b/aptos-move/diem-framework/core/transactional-tests/transaction_fee/add_transaction_fee_currency.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/transaction_fee/add_transaction_fee_currency.move rename to aptos-move/diem-framework/core/transactional-tests/transaction_fee/add_transaction_fee_currency.move diff --git a/diem-move/diem-framework/core/transactional-tests/transaction_fee/burn_collected_fees.exp b/aptos-move/diem-framework/core/transactional-tests/transaction_fee/burn_collected_fees.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/transaction_fee/burn_collected_fees.exp rename to aptos-move/diem-framework/core/transactional-tests/transaction_fee/burn_collected_fees.exp diff --git a/diem-move/diem-framework/core/transactional-tests/transaction_fee/burn_collected_fees.move b/aptos-move/diem-framework/core/transactional-tests/transaction_fee/burn_collected_fees.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/transaction_fee/burn_collected_fees.move rename to aptos-move/diem-framework/core/transactional-tests/transaction_fee/burn_collected_fees.move diff --git a/diem-move/diem-framework/core/transactional-tests/validator_set/add_one_rotate_by_delegate.exp b/aptos-move/diem-framework/core/transactional-tests/validator_set/add_one_rotate_by_delegate.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/validator_set/add_one_rotate_by_delegate.exp rename to aptos-move/diem-framework/core/transactional-tests/validator_set/add_one_rotate_by_delegate.exp diff --git a/diem-move/diem-framework/core/transactional-tests/validator_set/add_one_rotate_by_delegate.move b/aptos-move/diem-framework/core/transactional-tests/validator_set/add_one_rotate_by_delegate.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/validator_set/add_one_rotate_by_delegate.move rename to aptos-move/diem-framework/core/transactional-tests/validator_set/add_one_rotate_by_delegate.move diff --git a/diem-move/diem-framework/core/transactional-tests/validator_set/add_two_rotate_by_delegate.exp b/aptos-move/diem-framework/core/transactional-tests/validator_set/add_two_rotate_by_delegate.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/validator_set/add_two_rotate_by_delegate.exp rename to aptos-move/diem-framework/core/transactional-tests/validator_set/add_two_rotate_by_delegate.exp diff --git a/diem-move/diem-framework/core/transactional-tests/validator_set/add_two_rotate_by_delegate.move b/aptos-move/diem-framework/core/transactional-tests/validator_set/add_two_rotate_by_delegate.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/validator_set/add_two_rotate_by_delegate.move rename to aptos-move/diem-framework/core/transactional-tests/validator_set/add_two_rotate_by_delegate.move diff --git a/diem-move/diem-framework/core/transactional-tests/validator_set/add_validator.exp b/aptos-move/diem-framework/core/transactional-tests/validator_set/add_validator.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/validator_set/add_validator.exp rename to aptos-move/diem-framework/core/transactional-tests/validator_set/add_validator.exp diff --git a/diem-move/diem-framework/core/transactional-tests/validator_set/add_validator.move b/aptos-move/diem-framework/core/transactional-tests/validator_set/add_validator.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/validator_set/add_validator.move rename to aptos-move/diem-framework/core/transactional-tests/validator_set/add_validator.move diff --git a/diem-move/diem-framework/core/transactional-tests/validator_set/basics.exp b/aptos-move/diem-framework/core/transactional-tests/validator_set/basics.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/validator_set/basics.exp rename to aptos-move/diem-framework/core/transactional-tests/validator_set/basics.exp diff --git a/diem-move/diem-framework/core/transactional-tests/validator_set/basics.move b/aptos-move/diem-framework/core/transactional-tests/validator_set/basics.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/validator_set/basics.move rename to aptos-move/diem-framework/core/transactional-tests/validator_set/basics.move diff --git a/diem-move/diem-framework/core/transactional-tests/validator_set/multiple_reconfigurations_at_once.exp b/aptos-move/diem-framework/core/transactional-tests/validator_set/multiple_reconfigurations_at_once.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/validator_set/multiple_reconfigurations_at_once.exp rename to aptos-move/diem-framework/core/transactional-tests/validator_set/multiple_reconfigurations_at_once.exp diff --git a/diem-move/diem-framework/core/transactional-tests/validator_set/multiple_reconfigurations_at_once.move b/aptos-move/diem-framework/core/transactional-tests/validator_set/multiple_reconfigurations_at_once.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/validator_set/multiple_reconfigurations_at_once.move rename to aptos-move/diem-framework/core/transactional-tests/validator_set/multiple_reconfigurations_at_once.move diff --git a/diem-move/diem-framework/core/transactional-tests/validator_set/reconfiguration_rate_limiting.exp b/aptos-move/diem-framework/core/transactional-tests/validator_set/reconfiguration_rate_limiting.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/validator_set/reconfiguration_rate_limiting.exp rename to aptos-move/diem-framework/core/transactional-tests/validator_set/reconfiguration_rate_limiting.exp diff --git a/diem-move/diem-framework/core/transactional-tests/validator_set/reconfiguration_rate_limiting.move b/aptos-move/diem-framework/core/transactional-tests/validator_set/reconfiguration_rate_limiting.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/validator_set/reconfiguration_rate_limiting.move rename to aptos-move/diem-framework/core/transactional-tests/validator_set/reconfiguration_rate_limiting.move diff --git a/diem-move/diem-framework/core/transactional-tests/validator_set/reconfiguration_via_key_rotation.exp b/aptos-move/diem-framework/core/transactional-tests/validator_set/reconfiguration_via_key_rotation.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/validator_set/reconfiguration_via_key_rotation.exp rename to aptos-move/diem-framework/core/transactional-tests/validator_set/reconfiguration_via_key_rotation.exp diff --git a/diem-move/diem-framework/core/transactional-tests/validator_set/reconfiguration_via_key_rotation.move b/aptos-move/diem-framework/core/transactional-tests/validator_set/reconfiguration_via_key_rotation.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/validator_set/reconfiguration_via_key_rotation.move rename to aptos-move/diem-framework/core/transactional-tests/validator_set/reconfiguration_via_key_rotation.move diff --git a/diem-move/diem-framework/core/transactional-tests/validator_set/reconfiguration_via_removal.exp b/aptos-move/diem-framework/core/transactional-tests/validator_set/reconfiguration_via_removal.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/validator_set/reconfiguration_via_removal.exp rename to aptos-move/diem-framework/core/transactional-tests/validator_set/reconfiguration_via_removal.exp diff --git a/diem-move/diem-framework/core/transactional-tests/validator_set/reconfiguration_via_removal.move b/aptos-move/diem-framework/core/transactional-tests/validator_set/reconfiguration_via_removal.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/validator_set/reconfiguration_via_removal.move rename to aptos-move/diem-framework/core/transactional-tests/validator_set/reconfiguration_via_removal.move diff --git a/diem-move/diem-framework/core/transactional-tests/validator_set/reconfiguration_via_validator_addition.exp b/aptos-move/diem-framework/core/transactional-tests/validator_set/reconfiguration_via_validator_addition.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/validator_set/reconfiguration_via_validator_addition.exp rename to aptos-move/diem-framework/core/transactional-tests/validator_set/reconfiguration_via_validator_addition.exp diff --git a/diem-move/diem-framework/core/transactional-tests/validator_set/reconfiguration_via_validator_addition.move b/aptos-move/diem-framework/core/transactional-tests/validator_set/reconfiguration_via_validator_addition.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/validator_set/reconfiguration_via_validator_addition.move rename to aptos-move/diem-framework/core/transactional-tests/validator_set/reconfiguration_via_validator_addition.move diff --git a/diem-move/diem-framework/core/transactional-tests/validator_set/reconfigure_twice_in_transaction.exp b/aptos-move/diem-framework/core/transactional-tests/validator_set/reconfigure_twice_in_transaction.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/validator_set/reconfigure_twice_in_transaction.exp rename to aptos-move/diem-framework/core/transactional-tests/validator_set/reconfigure_twice_in_transaction.exp diff --git a/diem-move/diem-framework/core/transactional-tests/validator_set/reconfigure_twice_in_transaction.move b/aptos-move/diem-framework/core/transactional-tests/validator_set/reconfigure_twice_in_transaction.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/validator_set/reconfigure_twice_in_transaction.move rename to aptos-move/diem-framework/core/transactional-tests/validator_set/reconfigure_twice_in_transaction.move diff --git a/diem-move/diem-framework/core/transactional-tests/validator_set/register_validator.exp b/aptos-move/diem-framework/core/transactional-tests/validator_set/register_validator.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/validator_set/register_validator.exp rename to aptos-move/diem-framework/core/transactional-tests/validator_set/register_validator.exp diff --git a/diem-move/diem-framework/core/transactional-tests/validator_set/register_validator.move b/aptos-move/diem-framework/core/transactional-tests/validator_set/register_validator.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/validator_set/register_validator.move rename to aptos-move/diem-framework/core/transactional-tests/validator_set/register_validator.move diff --git a/diem-move/diem-framework/core/transactional-tests/validator_set/remove_nonvalidator.exp b/aptos-move/diem-framework/core/transactional-tests/validator_set/remove_nonvalidator.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/validator_set/remove_nonvalidator.exp rename to aptos-move/diem-framework/core/transactional-tests/validator_set/remove_nonvalidator.exp diff --git a/diem-move/diem-framework/core/transactional-tests/validator_set/remove_nonvalidator.move b/aptos-move/diem-framework/core/transactional-tests/validator_set/remove_nonvalidator.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/validator_set/remove_nonvalidator.move rename to aptos-move/diem-framework/core/transactional-tests/validator_set/remove_nonvalidator.move diff --git a/diem-move/diem-framework/core/transactional-tests/validator_set/remove_validator.exp b/aptos-move/diem-framework/core/transactional-tests/validator_set/remove_validator.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/validator_set/remove_validator.exp rename to aptos-move/diem-framework/core/transactional-tests/validator_set/remove_validator.exp diff --git a/diem-move/diem-framework/core/transactional-tests/validator_set/remove_validator.move b/aptos-move/diem-framework/core/transactional-tests/validator_set/remove_validator.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/validator_set/remove_validator.move rename to aptos-move/diem-framework/core/transactional-tests/validator_set/remove_validator.move diff --git a/diem-move/diem-framework/core/transactional-tests/validator_set/rotate_and_reconfigure.exp b/aptos-move/diem-framework/core/transactional-tests/validator_set/rotate_and_reconfigure.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/validator_set/rotate_and_reconfigure.exp rename to aptos-move/diem-framework/core/transactional-tests/validator_set/rotate_and_reconfigure.exp diff --git a/diem-move/diem-framework/core/transactional-tests/validator_set/rotate_and_reconfigure.move b/aptos-move/diem-framework/core/transactional-tests/validator_set/rotate_and_reconfigure.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/validator_set/rotate_and_reconfigure.move rename to aptos-move/diem-framework/core/transactional-tests/validator_set/rotate_and_reconfigure.move diff --git a/diem-move/diem-framework/core/transactional-tests/validator_set/update_and_reconfigure_with_removed_validator.exp b/aptos-move/diem-framework/core/transactional-tests/validator_set/update_and_reconfigure_with_removed_validator.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/validator_set/update_and_reconfigure_with_removed_validator.exp rename to aptos-move/diem-framework/core/transactional-tests/validator_set/update_and_reconfigure_with_removed_validator.exp diff --git a/diem-move/diem-framework/core/transactional-tests/validator_set/update_and_reconfigure_with_removed_validator.move b/aptos-move/diem-framework/core/transactional-tests/validator_set/update_and_reconfigure_with_removed_validator.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/validator_set/update_and_reconfigure_with_removed_validator.move rename to aptos-move/diem-framework/core/transactional-tests/validator_set/update_and_reconfigure_with_removed_validator.move diff --git a/diem-move/diem-framework/core/transactional-tests/validator_set/zero_validators.exp b/aptos-move/diem-framework/core/transactional-tests/validator_set/zero_validators.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/validator_set/zero_validators.exp rename to aptos-move/diem-framework/core/transactional-tests/validator_set/zero_validators.exp diff --git a/diem-move/diem-framework/core/transactional-tests/validator_set/zero_validators.move b/aptos-move/diem-framework/core/transactional-tests/validator_set/zero_validators.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/validator_set/zero_validators.move rename to aptos-move/diem-framework/core/transactional-tests/validator_set/zero_validators.move diff --git a/diem-move/diem-framework/core/transactional-tests/vasp_domain/vasp_domain.exp b/aptos-move/diem-framework/core/transactional-tests/vasp_domain/vasp_domain.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/vasp_domain/vasp_domain.exp rename to aptos-move/diem-framework/core/transactional-tests/vasp_domain/vasp_domain.exp diff --git a/diem-move/diem-framework/core/transactional-tests/vasp_domain/vasp_domain.move b/aptos-move/diem-framework/core/transactional-tests/vasp_domain/vasp_domain.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/vasp_domain/vasp_domain.move rename to aptos-move/diem-framework/core/transactional-tests/vasp_domain/vasp_domain.move diff --git a/diem-move/diem-framework/core/transactional-tests/vasps/create_parent_and_child_vasp_accounts.exp b/aptos-move/diem-framework/core/transactional-tests/vasps/create_parent_and_child_vasp_accounts.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/vasps/create_parent_and_child_vasp_accounts.exp rename to aptos-move/diem-framework/core/transactional-tests/vasps/create_parent_and_child_vasp_accounts.exp diff --git a/diem-move/diem-framework/core/transactional-tests/vasps/create_parent_and_child_vasp_accounts.move b/aptos-move/diem-framework/core/transactional-tests/vasps/create_parent_and_child_vasp_accounts.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/vasps/create_parent_and_child_vasp_accounts.move rename to aptos-move/diem-framework/core/transactional-tests/vasps/create_parent_and_child_vasp_accounts.move diff --git a/diem-move/diem-framework/core/transactional-tests/vasps/vasps.exp b/aptos-move/diem-framework/core/transactional-tests/vasps/vasps.exp similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/vasps/vasps.exp rename to aptos-move/diem-framework/core/transactional-tests/vasps/vasps.exp diff --git a/diem-move/diem-framework/core/transactional-tests/vasps/vasps.move b/aptos-move/diem-framework/core/transactional-tests/vasps/vasps.move similarity index 100% rename from diem-move/diem-framework/core/transactional-tests/vasps/vasps.move rename to aptos-move/diem-framework/core/transactional-tests/vasps/vasps.move diff --git a/diem-move/diem-framework/experimental/DPN/releases/artifacts/current/error_description/error_description.errmap b/aptos-move/diem-framework/experimental/DPN/releases/artifacts/current/error_description/error_description.errmap similarity index 100% rename from diem-move/diem-framework/experimental/DPN/releases/artifacts/current/error_description/error_description.errmap rename to aptos-move/diem-framework/experimental/DPN/releases/artifacts/current/error_description/error_description.errmap diff --git a/diem-move/diem-framework/experimental/DPN/releases/artifacts/current/transaction_script_builder.rs b/aptos-move/diem-framework/experimental/DPN/releases/artifacts/current/transaction_script_builder.rs similarity index 99% rename from diem-move/diem-framework/experimental/DPN/releases/artifacts/current/transaction_script_builder.rs rename to aptos-move/diem-framework/experimental/DPN/releases/artifacts/current/transaction_script_builder.rs index ec2ae2eefe8d7..84e454cd96a06 100644 --- a/diem-move/diem-framework/experimental/DPN/releases/artifacts/current/transaction_script_builder.rs +++ b/aptos-move/diem-framework/experimental/DPN/releases/artifacts/current/transaction_script_builder.rs @@ -12,7 +12,7 @@ #![allow(clippy::unnecessary_wraps)] #![allow(unused_imports)] -use diem_types::{ +use aptos_types::{ account_address::AccountAddress, transaction::{Script, ScriptFunction, TransactionArgument, TransactionPayload, VecBytes}, }; @@ -832,7 +832,7 @@ pub enum ScriptFunctionCall { /// Transfers `amount` coins of type `Currency` from `payer` to `payee` with (optional) associated /// `metadata`. /// Dual attestation is not applied to this script as payee is also a signer of the transaction. - /// Standardized `metadata` BCS format can be found in `diem_types::transaction::metadata::Metadata`. + /// Standardized `metadata` BCS format can be found in `aptos_types::transaction::metadata::Metadata`. /// /// # Events /// Successful execution of this script emits two events: @@ -890,7 +890,7 @@ pub enum ScriptFunctionCall { /// `DualAttestation::get_cur_microdiem_limit` XDX and `payer` and `payee` are distinct VASPs. /// However, a transaction sender can opt in to dual attestation even when it is not required /// (e.g., a DesignatedDealer -> VASP payment) by providing a non-empty `metadata_signature`. - /// Standardized `metadata` BCS format can be found in `diem_types::transaction::metadata::Metadata`. + /// Standardized `metadata` BCS format can be found in `aptos_types::transaction::metadata::Metadata`. /// /// # Events /// Successful execution of this script emits two events: @@ -3096,7 +3096,7 @@ pub fn encode_opt_in_to_crsn_script_function(crsn_size: u64) -> TransactionPaylo /// Transfers `amount` coins of type `Currency` from `payer` to `payee` with (optional) associated /// `metadata`. /// Dual attestation is not applied to this script as payee is also a signer of the transaction. -/// Standardized `metadata` BCS format can be found in `diem_types::transaction::metadata::Metadata`. +/// Standardized `metadata` BCS format can be found in `aptos_types::transaction::metadata::Metadata`. /// /// # Events /// Successful execution of this script emits two events: @@ -3167,7 +3167,7 @@ pub fn encode_peer_to_peer_by_signers_script_function( /// `DualAttestation::get_cur_microdiem_limit` XDX and `payer` and `payee` are distinct VASPs. /// However, a transaction sender can opt in to dual attestation even when it is not required /// (e.g., a DesignatedDealer -> VASP payment) by providing a non-empty `metadata_signature`. -/// Standardized `metadata` BCS format can be found in `diem_types::transaction::metadata::Metadata`. +/// Standardized `metadata` BCS format can be found in `aptos_types::transaction::metadata::Metadata`. /// /// # Events /// Successful execution of this script emits two events: diff --git a/diem-move/diem-framework/experimental/Move.toml b/aptos-move/diem-framework/experimental/Move.toml similarity index 100% rename from diem-move/diem-framework/experimental/Move.toml rename to aptos-move/diem-framework/experimental/Move.toml diff --git a/diem-move/diem-framework/experimental/releases/Cargo.toml b/aptos-move/diem-framework/experimental/releases/Cargo.toml similarity index 79% rename from diem-move/diem-framework/experimental/releases/Cargo.toml rename to aptos-move/diem-framework/experimental/releases/Cargo.toml index 35e87e4aed9fa..c30d7a2827616 100644 --- a/diem-move/diem-framework/experimental/releases/Cargo.toml +++ b/aptos-move/diem-framework/experimental/releases/Cargo.toml @@ -12,9 +12,9 @@ publish = false [dependencies] move-command-line-common = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } -diem-crypto = { path = "../../../../crates/diem-crypto" } -diem-types = { path = "../../../../types" } -diem-workspace-hack = { path = "../../../../crates/diem-workspace-hack" } +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/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } framework-releases = { path = "../../releases" } diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/BuildInfo.yaml b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/BuildInfo.yaml similarity index 97% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/BuildInfo.yaml rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/BuildInfo.yaml index 7b9a2d461adaa..2ce697e6051e5 100644 --- a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/BuildInfo.yaml +++ b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/BuildInfo.yaml @@ -88,7 +88,7 @@ compiled_package_info: ? address: "00000000000000000000000000000001" name: Vector : Std - source_digest: 786A026BE6183B5ADEF51BE5098B0FF1345B3BE455F22C0323049BD9D0543ACD + source_digest: 11C424995F38872F71C83513C0957BA5825979D0541753259A3D7BFDC8EFE9CE build_flags: dev_mode: false test_mode: false diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/Account.mv b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/Account.mv similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/Account.mv rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/Account.mv diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/ChainId.mv b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/ChainId.mv similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/ChainId.mv rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/ChainId.mv diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/CoreGenesis.mv b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/CoreGenesis.mv similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/CoreGenesis.mv rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/CoreGenesis.mv diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/DiemBlock.mv b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/DiemBlock.mv similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/DiemBlock.mv rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/DiemBlock.mv diff --git a/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/DiemConfig.mv b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/DiemConfig.mv new file mode 100644 index 0000000000000..656276690e657 Binary files /dev/null and b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/DiemConfig.mv differ diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/DiemConsensusConfig.mv b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/DiemConsensusConfig.mv similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/DiemConsensusConfig.mv rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/DiemConsensusConfig.mv diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/DiemSystem.mv b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/DiemSystem.mv similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/DiemSystem.mv rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/DiemSystem.mv diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/DiemTimestamp.mv b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/DiemTimestamp.mv similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/DiemTimestamp.mv rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/DiemTimestamp.mv diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/DiemVMConfig.mv b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/DiemVMConfig.mv similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/DiemVMConfig.mv rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/DiemVMConfig.mv diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/DiemVersion.mv b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/DiemVersion.mv similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/DiemVersion.mv rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/DiemVersion.mv diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/ParallelExecutionConfig.mv b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/ParallelExecutionConfig.mv similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/ParallelExecutionConfig.mv rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/ParallelExecutionConfig.mv diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/Signature.mv b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/Signature.mv similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/Signature.mv rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/Signature.mv diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/SystemAddresses.mv b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/SystemAddresses.mv similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/SystemAddresses.mv rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/SystemAddresses.mv diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/ValidatorConfig.mv b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/ValidatorConfig.mv similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/ValidatorConfig.mv rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/ValidatorConfig.mv diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/ValidatorOperatorConfig.mv b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/ValidatorOperatorConfig.mv similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/ValidatorOperatorConfig.mv rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/ValidatorOperatorConfig.mv diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/Account.md b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/Account.md similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/Account.md rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/Account.md diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/ChainId.md b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/ChainId.md similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/ChainId.md rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/ChainId.md diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/CoreGenesis.md b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/CoreGenesis.md similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/CoreGenesis.md rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/CoreGenesis.md diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/DiemBlock.md b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/DiemBlock.md similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/DiemBlock.md rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/DiemBlock.md diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/DiemConfig.md b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/DiemConfig.md similarity index 93% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/DiemConfig.md rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/DiemConfig.md index c18f14cd38976..867fedba48953 100644 --- a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/DiemConfig.md +++ b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/DiemConfig.md @@ -23,6 +23,7 @@ to synchronize configuration changes for the validators. 
use 0x1::DiemTimestamp;
 use 0x1::Errors;
 use 0x1::Event;
+use 0x1::GUID;
 use 0x1::Signer;
 use 0x1::SystemAddresses;
@@ -172,6 +173,16 @@ An invalid block time was encountered. + + +An invalid block time was encountered. + + +
const EINVALID_GUID_FOR_EVENT: u64 = 4;
+
+ + + A ModifyConfigCapability is in a different state than was expected @@ -204,6 +215,8 @@ Publishes Configurati DiemTimestamp::assert_genesis(); SystemAddresses::assert_core_resource(account); assert!(!exists<Configuration>(@CoreResources), Errors::already_published(ECONFIGURATION)); + // assert it matches `new_epoch_event_key()`, otherwise the event can't be recognized + assert!(GUID::get_next_creation_num(Signer::address_of(account)) == 4, Errors::invalid_state(EINVALID_GUID_FOR_EVENT)); move_to<Configuration>( account, Configuration { diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/DiemConsensusConfig.md b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/DiemConsensusConfig.md similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/DiemConsensusConfig.md rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/DiemConsensusConfig.md diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/DiemSystem.md b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/DiemSystem.md similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/DiemSystem.md rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/DiemSystem.md diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/DiemTimestamp.md b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/DiemTimestamp.md similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/DiemTimestamp.md rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/DiemTimestamp.md diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/DiemVMConfig.md b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/DiemVMConfig.md similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/DiemVMConfig.md rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/DiemVMConfig.md diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/DiemVersion.md b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/DiemVersion.md similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/DiemVersion.md rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/DiemVersion.md diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/ParallelExecutionConfig.md b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/ParallelExecutionConfig.md similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/ParallelExecutionConfig.md rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/ParallelExecutionConfig.md diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/Signature.md b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/Signature.md similarity index 95% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/Signature.md rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/Signature.md index 71b3203e8e3c6..4333a0ef74530 100644 --- a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/Signature.md +++ b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/Signature.md @@ -20,7 +20,7 @@ Contains functions for [ed25519](https://en.wikipedia.org/wiki/EdDSA) digital si Return true if the bytes in public_key can be parsed as a valid Ed25519 public key. Returns false if public_key is not 32 bytes OR is 32 bytes, but does not pass -points-on-curve or small subgroup checks. See the Rust diem_crypto::Ed25519PublicKey type +points-on-curve or small subgroup checks. See the Rust aptos_crypto::Ed25519PublicKey type for more details. Does not abort. diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/SystemAddresses.md b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/SystemAddresses.md similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/SystemAddresses.md rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/SystemAddresses.md diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/ValidatorConfig.md b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/ValidatorConfig.md similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/ValidatorConfig.md rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/ValidatorConfig.md diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/ValidatorOperatorConfig.md b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/ValidatorOperatorConfig.md similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/ValidatorOperatorConfig.md rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/ValidatorOperatorConfig.md diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/overview.md b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/overview.md similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/overview.md rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/overview.md diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/references.md b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/references.md similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/references.md rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/references.md diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/script_documentation.md b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/script_documentation.md similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/script_documentation.md rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/script_documentation.md diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/spec_documentation.md b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/spec_documentation.md similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/spec_documentation.md rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/docs/spec_documentation.md diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/source_maps/Account.mvsm b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/source_maps/Account.mvsm similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/source_maps/Account.mvsm rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/source_maps/Account.mvsm diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/source_maps/ChainId.mvsm b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/source_maps/ChainId.mvsm similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/source_maps/ChainId.mvsm rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/source_maps/ChainId.mvsm diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/source_maps/CoreGenesis.mvsm b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/source_maps/CoreGenesis.mvsm similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/source_maps/CoreGenesis.mvsm rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/source_maps/CoreGenesis.mvsm diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/source_maps/DiemBlock.mvsm b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/source_maps/DiemBlock.mvsm similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/source_maps/DiemBlock.mvsm rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/source_maps/DiemBlock.mvsm diff --git a/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/source_maps/DiemConfig.mvsm b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/source_maps/DiemConfig.mvsm new file mode 100644 index 0000000000000..071de68142c99 Binary files /dev/null and b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/source_maps/DiemConfig.mvsm differ diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/source_maps/DiemConsensusConfig.mvsm b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/source_maps/DiemConsensusConfig.mvsm similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/source_maps/DiemConsensusConfig.mvsm rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/source_maps/DiemConsensusConfig.mvsm diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/source_maps/DiemSystem.mvsm b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/source_maps/DiemSystem.mvsm similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/source_maps/DiemSystem.mvsm rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/source_maps/DiemSystem.mvsm diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/source_maps/DiemTimestamp.mvsm b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/source_maps/DiemTimestamp.mvsm similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/source_maps/DiemTimestamp.mvsm rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/source_maps/DiemTimestamp.mvsm diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/source_maps/DiemVMConfig.mvsm b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/source_maps/DiemVMConfig.mvsm similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/source_maps/DiemVMConfig.mvsm rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/source_maps/DiemVMConfig.mvsm diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/source_maps/DiemVersion.mvsm b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/source_maps/DiemVersion.mvsm similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/source_maps/DiemVersion.mvsm rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/source_maps/DiemVersion.mvsm diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/source_maps/ParallelExecutionConfig.mvsm b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/source_maps/ParallelExecutionConfig.mvsm similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/source_maps/ParallelExecutionConfig.mvsm rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/source_maps/ParallelExecutionConfig.mvsm diff --git a/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/source_maps/Signature.mvsm b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/source_maps/Signature.mvsm new file mode 100644 index 0000000000000..7d5bf9ffc9c7a Binary files /dev/null and b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/source_maps/Signature.mvsm differ diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/source_maps/SystemAddresses.mvsm b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/source_maps/SystemAddresses.mvsm similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/source_maps/SystemAddresses.mvsm rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/source_maps/SystemAddresses.mvsm diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/source_maps/ValidatorConfig.mvsm b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/source_maps/ValidatorConfig.mvsm similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/source_maps/ValidatorConfig.mvsm rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/source_maps/ValidatorConfig.mvsm diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/source_maps/ValidatorOperatorConfig.mvsm b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/source_maps/ValidatorOperatorConfig.mvsm similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/source_maps/ValidatorOperatorConfig.mvsm rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/source_maps/ValidatorOperatorConfig.mvsm diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/sources/Account.move b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/sources/Account.move similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/sources/Account.move rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/sources/Account.move diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/sources/ChainId.move b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/sources/ChainId.move similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/sources/ChainId.move rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/sources/ChainId.move diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/sources/CoreGenesis.move b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/sources/CoreGenesis.move similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/sources/CoreGenesis.move rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/sources/CoreGenesis.move diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/sources/DiemBlock.move b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/sources/DiemBlock.move similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/sources/DiemBlock.move rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/sources/DiemBlock.move diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/sources/DiemConfig.move b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/sources/DiemConfig.move similarity index 94% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/sources/DiemConfig.move rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/sources/DiemConfig.move index 7415d87a5f07e..5875c8b113507 100644 --- a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/sources/DiemConfig.move +++ b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/sources/DiemConfig.move @@ -4,6 +4,7 @@ module CoreFramework::DiemConfig { use Std::Errors; use Std::Event; use Std::Signer; + use Std::GUID; use CoreFramework::DiemTimestamp; use CoreFramework::SystemAddresses; @@ -42,6 +43,8 @@ module CoreFramework::DiemConfig { const EMODIFY_CAPABILITY: u64 = 2; /// An invalid block time was encountered. const EINVALID_BLOCK_TIME: u64 = 3; + /// An invalid block time was encountered. + const EINVALID_GUID_FOR_EVENT: u64 = 4; /// The largest possible u64 value const MAX_U64: u64 = 18446744073709551615; @@ -52,6 +55,8 @@ module CoreFramework::DiemConfig { DiemTimestamp::assert_genesis(); SystemAddresses::assert_core_resource(account); assert!(!exists(@CoreResources), Errors::already_published(ECONFIGURATION)); + // assert it matches `new_epoch_event_key()`, otherwise the event can't be recognized + assert!(GUID::get_next_creation_num(Signer::address_of(account)) == 4, Errors::invalid_state(EINVALID_GUID_FOR_EVENT)); move_to( account, Configuration { diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/sources/DiemConsensusConfig.move b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/sources/DiemConsensusConfig.move similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/sources/DiemConsensusConfig.move rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/sources/DiemConsensusConfig.move diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/sources/DiemSystem.move b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/sources/DiemSystem.move similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/sources/DiemSystem.move rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/sources/DiemSystem.move diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/sources/DiemTimestamp.move b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/sources/DiemTimestamp.move similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/sources/DiemTimestamp.move rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/sources/DiemTimestamp.move diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/sources/DiemVMConfig.move b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/sources/DiemVMConfig.move similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/sources/DiemVMConfig.move rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/sources/DiemVMConfig.move diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/sources/DiemVersion.move b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/sources/DiemVersion.move similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/sources/DiemVersion.move rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/sources/DiemVersion.move diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/sources/ParallelExecutionConfig.move b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/sources/ParallelExecutionConfig.move similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/sources/ParallelExecutionConfig.move rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/sources/ParallelExecutionConfig.move diff --git a/diem-move/diem-framework/core/sources/Signature.move b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/sources/Signature.move similarity index 96% rename from diem-move/diem-framework/core/sources/Signature.move rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/sources/Signature.move index e265918c3f662..4987ec6246fe6 100644 --- a/diem-move/diem-framework/core/sources/Signature.move +++ b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/sources/Signature.move @@ -3,7 +3,7 @@ module CoreFramework::Signature { /// Return `true` if the bytes in `public_key` can be parsed as a valid Ed25519 public key. /// Returns `false` if `public_key` is not 32 bytes OR is 32 bytes, but does not pass - /// points-on-curve or small subgroup checks. See the Rust `diem_crypto::Ed25519PublicKey` type + /// points-on-curve or small subgroup checks. See the Rust `aptos_crypto::Ed25519PublicKey` type /// for more details. /// Does not abort. native public fun ed25519_validate_pubkey(public_key: vector): bool; diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/sources/SystemAddresses.move b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/sources/SystemAddresses.move similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/sources/SystemAddresses.move rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/sources/SystemAddresses.move diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/sources/ValidatorConfig.move b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/sources/ValidatorConfig.move similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/sources/ValidatorConfig.move rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/sources/ValidatorConfig.move diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/sources/ValidatorOperatorConfig.move b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/sources/ValidatorOperatorConfig.move similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/sources/ValidatorOperatorConfig.move rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/sources/ValidatorOperatorConfig.move diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/BuildInfo.yaml b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/BuildInfo.yaml similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/BuildInfo.yaml rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/BuildInfo.yaml diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/abis/AccountCreationScripts/create_account.abi b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/abis/AccountCreationScripts/create_account.abi similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/abis/AccountCreationScripts/create_account.abi rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/abis/AccountCreationScripts/create_account.abi diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/abis/AccountCreationScripts/create_validator_account.abi b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/abis/AccountCreationScripts/create_validator_account.abi similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/abis/AccountCreationScripts/create_validator_account.abi rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/abis/AccountCreationScripts/create_validator_account.abi diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/abis/AccountCreationScripts/create_validator_operator_account.abi b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/abis/AccountCreationScripts/create_validator_operator_account.abi similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/abis/AccountCreationScripts/create_validator_operator_account.abi rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/abis/AccountCreationScripts/create_validator_operator_account.abi diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/abis/BARS/mint_bars.abi b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/abis/BARS/mint_bars.abi similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/abis/BARS/mint_bars.abi rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/abis/BARS/mint_bars.abi diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/abis/BARS/register_bars_user.abi b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/abis/BARS/register_bars_user.abi similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/abis/BARS/register_bars_user.abi rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/abis/BARS/register_bars_user.abi diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/abis/MultiTokenBalance/transfer_multi_token_between_galleries.abi b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/abis/MultiTokenBalance/transfer_multi_token_between_galleries.abi similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/abis/MultiTokenBalance/transfer_multi_token_between_galleries.abi rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/abis/MultiTokenBalance/transfer_multi_token_between_galleries.abi diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/abis/NFT/nft_initialize.abi b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/abis/NFT/nft_initialize.abi similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/abis/NFT/nft_initialize.abi rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/abis/NFT/nft_initialize.abi diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/abis/NFTGallery/transfer_token_between_galleries.abi b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/abis/NFTGallery/transfer_token_between_galleries.abi similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/abis/NFTGallery/transfer_token_between_galleries.abi rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/abis/NFTGallery/transfer_token_between_galleries.abi diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/abis/SystemAdministrationScripts/initialize_diem_consensus_config.abi b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/abis/SystemAdministrationScripts/initialize_diem_consensus_config.abi similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/abis/SystemAdministrationScripts/initialize_diem_consensus_config.abi rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/abis/SystemAdministrationScripts/initialize_diem_consensus_config.abi diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/abis/SystemAdministrationScripts/set_gas_constants.abi b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/abis/SystemAdministrationScripts/set_gas_constants.abi similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/abis/SystemAdministrationScripts/set_gas_constants.abi rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/abis/SystemAdministrationScripts/set_gas_constants.abi diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/abis/SystemAdministrationScripts/update_diem_consensus_config.abi b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/abis/SystemAdministrationScripts/update_diem_consensus_config.abi similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/abis/SystemAdministrationScripts/update_diem_consensus_config.abi rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/abis/SystemAdministrationScripts/update_diem_consensus_config.abi diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/abis/SystemAdministrationScripts/update_diem_version.abi b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/abis/SystemAdministrationScripts/update_diem_version.abi similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/abis/SystemAdministrationScripts/update_diem_version.abi rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/abis/SystemAdministrationScripts/update_diem_version.abi diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/abis/Vote/gc_ballots.abi b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/abis/Vote/gc_ballots.abi similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/abis/Vote/gc_ballots.abi rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/abis/Vote/gc_ballots.abi diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/bytecode_modules/AccountCreationScripts.mv b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/bytecode_modules/AccountCreationScripts.mv similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/bytecode_modules/AccountCreationScripts.mv rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/bytecode_modules/AccountCreationScripts.mv diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/bytecode_modules/BARSToken.mv b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/bytecode_modules/BARSToken.mv similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/bytecode_modules/BARSToken.mv rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/bytecode_modules/BARSToken.mv diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/bytecode_modules/ExperimentalAccount.mv b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/bytecode_modules/ExperimentalAccount.mv similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/bytecode_modules/ExperimentalAccount.mv rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/bytecode_modules/ExperimentalAccount.mv diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/bytecode_modules/ExperimentalConsensusConfig.mv b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/bytecode_modules/ExperimentalConsensusConfig.mv similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/bytecode_modules/ExperimentalConsensusConfig.mv rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/bytecode_modules/ExperimentalConsensusConfig.mv diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/bytecode_modules/ExperimentalParallelExecutionConfig.mv b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/bytecode_modules/ExperimentalParallelExecutionConfig.mv similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/bytecode_modules/ExperimentalParallelExecutionConfig.mv rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/bytecode_modules/ExperimentalParallelExecutionConfig.mv diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/bytecode_modules/ExperimentalVMConfig.mv b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/bytecode_modules/ExperimentalVMConfig.mv similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/bytecode_modules/ExperimentalVMConfig.mv rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/bytecode_modules/ExperimentalVMConfig.mv diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/bytecode_modules/ExperimentalValidatorConfig.mv b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/bytecode_modules/ExperimentalValidatorConfig.mv similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/bytecode_modules/ExperimentalValidatorConfig.mv rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/bytecode_modules/ExperimentalValidatorConfig.mv diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/bytecode_modules/ExperimentalValidatorOperatorConfig.mv b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/bytecode_modules/ExperimentalValidatorOperatorConfig.mv similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/bytecode_modules/ExperimentalValidatorOperatorConfig.mv rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/bytecode_modules/ExperimentalValidatorOperatorConfig.mv diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/bytecode_modules/ExperimentalValidatorSet.mv b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/bytecode_modules/ExperimentalValidatorSet.mv similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/bytecode_modules/ExperimentalValidatorSet.mv rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/bytecode_modules/ExperimentalValidatorSet.mv diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/bytecode_modules/ExperimentalVersion.mv b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/bytecode_modules/ExperimentalVersion.mv similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/bytecode_modules/ExperimentalVersion.mv rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/bytecode_modules/ExperimentalVersion.mv diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/bytecode_modules/Genesis.mv b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/bytecode_modules/Genesis.mv similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/bytecode_modules/Genesis.mv rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/bytecode_modules/Genesis.mv diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/bytecode_modules/MultiToken.mv b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/bytecode_modules/MultiToken.mv similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/bytecode_modules/MultiToken.mv rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/bytecode_modules/MultiToken.mv diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/bytecode_modules/MultiTokenBalance.mv b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/bytecode_modules/MultiTokenBalance.mv similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/bytecode_modules/MultiTokenBalance.mv rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/bytecode_modules/MultiTokenBalance.mv diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/bytecode_modules/NFT.mv b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/bytecode_modules/NFT.mv similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/bytecode_modules/NFT.mv rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/bytecode_modules/NFT.mv diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/bytecode_modules/NFTGallery.mv b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/bytecode_modules/NFTGallery.mv similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/bytecode_modules/NFTGallery.mv rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/bytecode_modules/NFTGallery.mv diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/bytecode_modules/SystemAdministrationScripts.mv b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/bytecode_modules/SystemAdministrationScripts.mv similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/bytecode_modules/SystemAdministrationScripts.mv rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/bytecode_modules/SystemAdministrationScripts.mv diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/bytecode_modules/Vote.mv b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/bytecode_modules/Vote.mv similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/bytecode_modules/Vote.mv rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/bytecode_modules/Vote.mv diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/docs/AccountCreationScripts.md b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/docs/AccountCreationScripts.md similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/docs/AccountCreationScripts.md rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/docs/AccountCreationScripts.md diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/docs/BARS.md b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/docs/BARS.md similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/docs/BARS.md rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/docs/BARS.md diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/docs/ExperimentalAccount.md b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/docs/ExperimentalAccount.md similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/docs/ExperimentalAccount.md rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/docs/ExperimentalAccount.md diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/docs/ExperimentalConsensusConfig.md b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/docs/ExperimentalConsensusConfig.md similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/docs/ExperimentalConsensusConfig.md rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/docs/ExperimentalConsensusConfig.md diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/docs/ExperimentalParallelExecutionConfig.md b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/docs/ExperimentalParallelExecutionConfig.md similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/docs/ExperimentalParallelExecutionConfig.md rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/docs/ExperimentalParallelExecutionConfig.md diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/docs/ExperimentalVMConfig.md b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/docs/ExperimentalVMConfig.md similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/docs/ExperimentalVMConfig.md rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/docs/ExperimentalVMConfig.md diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/docs/ExperimentalValidatorConfig.md b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/docs/ExperimentalValidatorConfig.md similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/docs/ExperimentalValidatorConfig.md rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/docs/ExperimentalValidatorConfig.md diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/docs/ExperimentalValidatorOperatorConfig.md b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/docs/ExperimentalValidatorOperatorConfig.md similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/docs/ExperimentalValidatorOperatorConfig.md rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/docs/ExperimentalValidatorOperatorConfig.md diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/docs/ExperimentalValidatorSet.md b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/docs/ExperimentalValidatorSet.md similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/docs/ExperimentalValidatorSet.md rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/docs/ExperimentalValidatorSet.md diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/docs/ExperimentalVersion.md b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/docs/ExperimentalVersion.md similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/docs/ExperimentalVersion.md rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/docs/ExperimentalVersion.md diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/docs/Genesis.md b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/docs/Genesis.md similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/docs/Genesis.md rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/docs/Genesis.md diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/docs/MultiToken.md b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/docs/MultiToken.md similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/docs/MultiToken.md rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/docs/MultiToken.md diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/docs/MultiTokenBalance.md b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/docs/MultiTokenBalance.md similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/docs/MultiTokenBalance.md rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/docs/MultiTokenBalance.md diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/docs/NFT.md b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/docs/NFT.md similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/docs/NFT.md rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/docs/NFT.md diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/docs/NFTGallery.md b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/docs/NFTGallery.md similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/docs/NFTGallery.md rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/docs/NFTGallery.md diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/docs/SystemAdministrationScripts.md b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/docs/SystemAdministrationScripts.md similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/docs/SystemAdministrationScripts.md rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/docs/SystemAdministrationScripts.md diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/docs/Vote.md b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/docs/Vote.md similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/docs/Vote.md rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/docs/Vote.md diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/source_maps/AccountCreationScripts.mvsm b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/source_maps/AccountCreationScripts.mvsm similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/source_maps/AccountCreationScripts.mvsm rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/source_maps/AccountCreationScripts.mvsm diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/source_maps/BARSToken.mvsm b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/source_maps/BARSToken.mvsm similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/source_maps/BARSToken.mvsm rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/source_maps/BARSToken.mvsm diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/source_maps/ExperimentalAccount.mvsm b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/source_maps/ExperimentalAccount.mvsm similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/source_maps/ExperimentalAccount.mvsm rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/source_maps/ExperimentalAccount.mvsm diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/source_maps/ExperimentalConsensusConfig.mvsm b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/source_maps/ExperimentalConsensusConfig.mvsm similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/source_maps/ExperimentalConsensusConfig.mvsm rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/source_maps/ExperimentalConsensusConfig.mvsm diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/source_maps/ExperimentalParallelExecutionConfig.mvsm b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/source_maps/ExperimentalParallelExecutionConfig.mvsm similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/source_maps/ExperimentalParallelExecutionConfig.mvsm rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/source_maps/ExperimentalParallelExecutionConfig.mvsm diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/source_maps/ExperimentalVMConfig.mvsm b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/source_maps/ExperimentalVMConfig.mvsm similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/source_maps/ExperimentalVMConfig.mvsm rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/source_maps/ExperimentalVMConfig.mvsm diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/source_maps/ExperimentalValidatorConfig.mvsm b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/source_maps/ExperimentalValidatorConfig.mvsm similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/source_maps/ExperimentalValidatorConfig.mvsm rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/source_maps/ExperimentalValidatorConfig.mvsm diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/source_maps/ExperimentalValidatorOperatorConfig.mvsm b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/source_maps/ExperimentalValidatorOperatorConfig.mvsm similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/source_maps/ExperimentalValidatorOperatorConfig.mvsm rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/source_maps/ExperimentalValidatorOperatorConfig.mvsm diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/source_maps/ExperimentalValidatorSet.mvsm b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/source_maps/ExperimentalValidatorSet.mvsm similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/source_maps/ExperimentalValidatorSet.mvsm rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/source_maps/ExperimentalValidatorSet.mvsm diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/source_maps/ExperimentalVersion.mvsm b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/source_maps/ExperimentalVersion.mvsm similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/source_maps/ExperimentalVersion.mvsm rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/source_maps/ExperimentalVersion.mvsm diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/source_maps/Genesis.mvsm b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/source_maps/Genesis.mvsm similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/source_maps/Genesis.mvsm rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/source_maps/Genesis.mvsm diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/source_maps/MultiToken.mvsm b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/source_maps/MultiToken.mvsm similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/source_maps/MultiToken.mvsm rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/source_maps/MultiToken.mvsm diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/source_maps/MultiTokenBalance.mvsm b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/source_maps/MultiTokenBalance.mvsm similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/source_maps/MultiTokenBalance.mvsm rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/source_maps/MultiTokenBalance.mvsm diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/source_maps/NFT.mvsm b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/source_maps/NFT.mvsm similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/source_maps/NFT.mvsm rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/source_maps/NFT.mvsm diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/source_maps/NFTGallery.mvsm b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/source_maps/NFTGallery.mvsm similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/source_maps/NFTGallery.mvsm rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/source_maps/NFTGallery.mvsm diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/source_maps/SystemAdministrationScripts.mvsm b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/source_maps/SystemAdministrationScripts.mvsm similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/source_maps/SystemAdministrationScripts.mvsm rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/source_maps/SystemAdministrationScripts.mvsm diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/source_maps/Vote.mvsm b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/source_maps/Vote.mvsm similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/source_maps/Vote.mvsm rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/source_maps/Vote.mvsm diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/sources/AccountCreationScripts.move b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/sources/AccountCreationScripts.move similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/sources/AccountCreationScripts.move rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/sources/AccountCreationScripts.move diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/sources/BARS.move b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/sources/BARS.move similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/sources/BARS.move rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/sources/BARS.move diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/sources/ExperimentalAccount.move b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/sources/ExperimentalAccount.move similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/sources/ExperimentalAccount.move rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/sources/ExperimentalAccount.move diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/sources/ExperimentalConsensusConfig.move b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/sources/ExperimentalConsensusConfig.move similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/sources/ExperimentalConsensusConfig.move rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/sources/ExperimentalConsensusConfig.move diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/sources/ExperimentalParallelExecutionConfig.move b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/sources/ExperimentalParallelExecutionConfig.move similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/sources/ExperimentalParallelExecutionConfig.move rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/sources/ExperimentalParallelExecutionConfig.move diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/sources/ExperimentalVMConfig.move b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/sources/ExperimentalVMConfig.move similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/sources/ExperimentalVMConfig.move rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/sources/ExperimentalVMConfig.move diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/sources/ExperimentalValidatorConfig.move b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/sources/ExperimentalValidatorConfig.move similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/sources/ExperimentalValidatorConfig.move rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/sources/ExperimentalValidatorConfig.move diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/sources/ExperimentalValidatorOperatorConfig.move b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/sources/ExperimentalValidatorOperatorConfig.move similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/sources/ExperimentalValidatorOperatorConfig.move rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/sources/ExperimentalValidatorOperatorConfig.move diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/sources/ExperimentalValidatorSet.move b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/sources/ExperimentalValidatorSet.move similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/sources/ExperimentalValidatorSet.move rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/sources/ExperimentalValidatorSet.move diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/sources/ExperimentalVersion.move b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/sources/ExperimentalVersion.move similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/sources/ExperimentalVersion.move rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/sources/ExperimentalVersion.move diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/sources/Genesis.move b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/sources/Genesis.move similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/sources/Genesis.move rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/sources/Genesis.move diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/sources/MultiToken.move b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/sources/MultiToken.move similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/sources/MultiToken.move rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/sources/MultiToken.move diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/sources/MultiTokenBalance.move b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/sources/MultiTokenBalance.move similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/sources/MultiTokenBalance.move rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/sources/MultiTokenBalance.move diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/sources/NFT.move b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/sources/NFT.move similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/sources/NFT.move rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/sources/NFT.move diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/sources/NFTGallery.move b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/sources/NFTGallery.move similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/sources/NFTGallery.move rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/sources/NFTGallery.move diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/sources/SystemAdministrationScripts.move b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/sources/SystemAdministrationScripts.move similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/sources/SystemAdministrationScripts.move rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/sources/SystemAdministrationScripts.move diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/sources/Vote.move b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/sources/Vote.move similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/sources/Vote.move rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/DiemExperimental/sources/Vote.move diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/BuildInfo.yaml b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/BuildInfo.yaml similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/BuildInfo.yaml rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/BuildInfo.yaml diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/bytecode_modules/ASCII.mv b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/bytecode_modules/ASCII.mv similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/bytecode_modules/ASCII.mv rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/bytecode_modules/ASCII.mv diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/bytecode_modules/BCS.mv b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/bytecode_modules/BCS.mv similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/bytecode_modules/BCS.mv rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/bytecode_modules/BCS.mv diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/bytecode_modules/BitVector.mv b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/bytecode_modules/BitVector.mv similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/bytecode_modules/BitVector.mv rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/bytecode_modules/BitVector.mv diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Capability.mv b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Capability.mv similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Capability.mv rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Capability.mv diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Errors.mv b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Errors.mv similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Errors.mv rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Errors.mv diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Event.mv b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Event.mv similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Event.mv rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Event.mv diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/bytecode_modules/FixedPoint32.mv b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/bytecode_modules/FixedPoint32.mv similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/bytecode_modules/FixedPoint32.mv rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/bytecode_modules/FixedPoint32.mv diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/bytecode_modules/GUID.mv b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/bytecode_modules/GUID.mv similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/bytecode_modules/GUID.mv rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/bytecode_modules/GUID.mv diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Hash.mv b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Hash.mv similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Hash.mv rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Hash.mv diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Option.mv b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Option.mv similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Option.mv rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Option.mv diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Signer.mv b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Signer.mv similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Signer.mv rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Signer.mv diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Vector.mv b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Vector.mv similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Vector.mv rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/bytecode_modules/Vector.mv diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/docs/ASCII.md b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/docs/ASCII.md similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/docs/ASCII.md rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/docs/ASCII.md diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/docs/BCS.md b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/docs/BCS.md similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/docs/BCS.md rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/docs/BCS.md diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/docs/BitVector.md b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/docs/BitVector.md similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/docs/BitVector.md rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/docs/BitVector.md diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/docs/Capability.md b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/docs/Capability.md similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/docs/Capability.md rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/docs/Capability.md diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/docs/Errors.md b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/docs/Errors.md similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/docs/Errors.md rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/docs/Errors.md diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/docs/Event.md b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/docs/Event.md similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/docs/Event.md rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/docs/Event.md diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/docs/FixedPoint32.md b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/docs/FixedPoint32.md similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/docs/FixedPoint32.md rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/docs/FixedPoint32.md diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/docs/GUID.md b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/docs/GUID.md similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/docs/GUID.md rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/docs/GUID.md diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/docs/Hash.md b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/docs/Hash.md similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/docs/Hash.md rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/docs/Hash.md diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/docs/Option.md b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/docs/Option.md similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/docs/Option.md rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/docs/Option.md diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/docs/Signer.md b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/docs/Signer.md similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/docs/Signer.md rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/docs/Signer.md diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/docs/Vector.md b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/docs/Vector.md similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/docs/Vector.md rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/docs/Vector.md diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/docs/overview.md b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/docs/overview.md similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/docs/overview.md rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/docs/overview.md diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/docs/references.md b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/docs/references.md similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/docs/references.md rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/docs/references.md diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/source_maps/ASCII.mvsm b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/source_maps/ASCII.mvsm similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/source_maps/ASCII.mvsm rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/source_maps/ASCII.mvsm diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/source_maps/BCS.mvsm b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/source_maps/BCS.mvsm similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/source_maps/BCS.mvsm rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/source_maps/BCS.mvsm diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/source_maps/BitVector.mvsm b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/source_maps/BitVector.mvsm similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/source_maps/BitVector.mvsm rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/source_maps/BitVector.mvsm diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/source_maps/Capability.mvsm b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/source_maps/Capability.mvsm similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/source_maps/Capability.mvsm rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/source_maps/Capability.mvsm diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/source_maps/Errors.mvsm b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/source_maps/Errors.mvsm similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/source_maps/Errors.mvsm rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/source_maps/Errors.mvsm diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/source_maps/Event.mvsm b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/source_maps/Event.mvsm similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/source_maps/Event.mvsm rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/source_maps/Event.mvsm diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/source_maps/FixedPoint32.mvsm b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/source_maps/FixedPoint32.mvsm similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/source_maps/FixedPoint32.mvsm rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/source_maps/FixedPoint32.mvsm diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/source_maps/GUID.mvsm b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/source_maps/GUID.mvsm similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/source_maps/GUID.mvsm rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/source_maps/GUID.mvsm diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/source_maps/Hash.mvsm b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/source_maps/Hash.mvsm similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/source_maps/Hash.mvsm rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/source_maps/Hash.mvsm diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/source_maps/Option.mvsm b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/source_maps/Option.mvsm similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/source_maps/Option.mvsm rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/source_maps/Option.mvsm diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/source_maps/Signer.mvsm b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/source_maps/Signer.mvsm similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/source_maps/Signer.mvsm rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/source_maps/Signer.mvsm diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/source_maps/Vector.mvsm b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/source_maps/Vector.mvsm similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/source_maps/Vector.mvsm rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/source_maps/Vector.mvsm diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/sources/ASCII.move b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/sources/ASCII.move similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/sources/ASCII.move rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/sources/ASCII.move diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/sources/BCS.move b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/sources/BCS.move similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/sources/BCS.move rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/sources/BCS.move diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/sources/BitVector.move b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/sources/BitVector.move similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/sources/BitVector.move rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/sources/BitVector.move diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/sources/Capability.move b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/sources/Capability.move similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/sources/Capability.move rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/sources/Capability.move diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/sources/Errors.move b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/sources/Errors.move similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/sources/Errors.move rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/sources/Errors.move diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/sources/Event.move b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/sources/Event.move similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/sources/Event.move rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/sources/Event.move diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/sources/FixedPoint32.move b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/sources/FixedPoint32.move similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/sources/FixedPoint32.move rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/sources/FixedPoint32.move diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/sources/GUID.move b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/sources/GUID.move similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/sources/GUID.move rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/sources/GUID.move diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/sources/Hash.move b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/sources/Hash.move similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/sources/Hash.move rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/sources/Hash.move diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/sources/Option.move b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/sources/Option.move similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/sources/Option.move rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/sources/Option.move diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/sources/Signer.move b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/sources/Signer.move similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/sources/Signer.move rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/sources/Signer.move diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/sources/Vector.move b/aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/sources/Vector.move similarity index 100% rename from diem-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/sources/Vector.move rename to aptos-move/diem-framework/experimental/releases/artifacts/current/build/MoveStdlib/sources/Vector.move diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/error_description/error_description.errmap b/aptos-move/diem-framework/experimental/releases/artifacts/current/error_description/error_description.errmap similarity index 98% rename from diem-move/diem-framework/experimental/releases/artifacts/current/error_description/error_description.errmap rename to aptos-move/diem-framework/experimental/releases/artifacts/current/error_description/error_description.errmap index efdd8e01af58c..d3312913bc656 100644 Binary files a/diem-move/diem-framework/experimental/releases/artifacts/current/error_description/error_description.errmap and b/aptos-move/diem-framework/experimental/releases/artifacts/current/error_description/error_description.errmap differ diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/transaction_script_builder.rs b/aptos-move/diem-framework/experimental/releases/artifacts/current/transaction_script_builder.rs similarity index 99% rename from diem-move/diem-framework/experimental/releases/artifacts/current/transaction_script_builder.rs rename to aptos-move/diem-framework/experimental/releases/artifacts/current/transaction_script_builder.rs index 09dc18fa32f95..c50460aed1d1a 100644 --- a/diem-move/diem-framework/experimental/releases/artifacts/current/transaction_script_builder.rs +++ b/aptos-move/diem-framework/experimental/releases/artifacts/current/transaction_script_builder.rs @@ -12,7 +12,7 @@ #![allow(clippy::unnecessary_wraps)] #![allow(unused_imports)] -use diem_types::{ +use aptos_types::{ account_address::AccountAddress, transaction::{Script, ScriptFunction, TransactionArgument, TransactionPayload, VecBytes}, }; diff --git a/diem-move/diem-framework/experimental/releases/src/lib.rs b/aptos-move/diem-framework/experimental/releases/src/lib.rs similarity index 100% rename from diem-move/diem-framework/experimental/releases/src/lib.rs rename to aptos-move/diem-framework/experimental/releases/src/lib.rs diff --git a/diem-move/diem-framework/experimental/sources/AccountCreationScripts.move b/aptos-move/diem-framework/experimental/sources/AccountCreationScripts.move similarity index 100% rename from diem-move/diem-framework/experimental/sources/AccountCreationScripts.move rename to aptos-move/diem-framework/experimental/sources/AccountCreationScripts.move diff --git a/diem-move/diem-framework/experimental/sources/BARS.move b/aptos-move/diem-framework/experimental/sources/BARS.move similarity index 100% rename from diem-move/diem-framework/experimental/sources/BARS.move rename to aptos-move/diem-framework/experimental/sources/BARS.move diff --git a/diem-move/diem-framework/experimental/sources/ExperimentalAccount.move b/aptos-move/diem-framework/experimental/sources/ExperimentalAccount.move similarity index 100% rename from diem-move/diem-framework/experimental/sources/ExperimentalAccount.move rename to aptos-move/diem-framework/experimental/sources/ExperimentalAccount.move diff --git a/diem-move/diem-framework/experimental/sources/Genesis.move b/aptos-move/diem-framework/experimental/sources/Genesis.move similarity index 100% rename from diem-move/diem-framework/experimental/sources/Genesis.move rename to aptos-move/diem-framework/experimental/sources/Genesis.move diff --git a/diem-move/diem-framework/experimental/sources/MultiToken.move b/aptos-move/diem-framework/experimental/sources/MultiToken.move similarity index 100% rename from diem-move/diem-framework/experimental/sources/MultiToken.move rename to aptos-move/diem-framework/experimental/sources/MultiToken.move diff --git a/diem-move/diem-framework/experimental/sources/MultiTokenBalance.move b/aptos-move/diem-framework/experimental/sources/MultiTokenBalance.move similarity index 100% rename from diem-move/diem-framework/experimental/sources/MultiTokenBalance.move rename to aptos-move/diem-framework/experimental/sources/MultiTokenBalance.move diff --git a/diem-move/diem-framework/experimental/sources/NFT.move b/aptos-move/diem-framework/experimental/sources/NFT.move similarity index 100% rename from diem-move/diem-framework/experimental/sources/NFT.move rename to aptos-move/diem-framework/experimental/sources/NFT.move diff --git a/diem-move/diem-framework/experimental/sources/NFTGallery.move b/aptos-move/diem-framework/experimental/sources/NFTGallery.move similarity index 100% rename from diem-move/diem-framework/experimental/sources/NFTGallery.move rename to aptos-move/diem-framework/experimental/sources/NFTGallery.move diff --git a/diem-move/diem-framework/experimental/sources/SystemAdministrationScripts.move b/aptos-move/diem-framework/experimental/sources/SystemAdministrationScripts.move similarity index 100% rename from diem-move/diem-framework/experimental/sources/SystemAdministrationScripts.move rename to aptos-move/diem-framework/experimental/sources/SystemAdministrationScripts.move diff --git a/diem-move/diem-framework/experimental/sources/Vote.move b/aptos-move/diem-framework/experimental/sources/Vote.move similarity index 100% rename from diem-move/diem-framework/experimental/sources/Vote.move rename to aptos-move/diem-framework/experimental/sources/Vote.move diff --git a/diem-move/diem-framework/experimental/sources/configs/ExperimentalConsensusConfig.move b/aptos-move/diem-framework/experimental/sources/configs/ExperimentalConsensusConfig.move similarity index 100% rename from diem-move/diem-framework/experimental/sources/configs/ExperimentalConsensusConfig.move rename to aptos-move/diem-framework/experimental/sources/configs/ExperimentalConsensusConfig.move diff --git a/diem-move/diem-framework/experimental/sources/configs/ExperimentalParallelExecutionConfig.move b/aptos-move/diem-framework/experimental/sources/configs/ExperimentalParallelExecutionConfig.move similarity index 100% rename from diem-move/diem-framework/experimental/sources/configs/ExperimentalParallelExecutionConfig.move rename to aptos-move/diem-framework/experimental/sources/configs/ExperimentalParallelExecutionConfig.move diff --git a/diem-move/diem-framework/experimental/sources/configs/ExperimentalVMConfig.move b/aptos-move/diem-framework/experimental/sources/configs/ExperimentalVMConfig.move similarity index 100% rename from diem-move/diem-framework/experimental/sources/configs/ExperimentalVMConfig.move rename to aptos-move/diem-framework/experimental/sources/configs/ExperimentalVMConfig.move diff --git a/diem-move/diem-framework/experimental/sources/configs/ExperimentalValidatorConfig.move b/aptos-move/diem-framework/experimental/sources/configs/ExperimentalValidatorConfig.move similarity index 100% rename from diem-move/diem-framework/experimental/sources/configs/ExperimentalValidatorConfig.move rename to aptos-move/diem-framework/experimental/sources/configs/ExperimentalValidatorConfig.move diff --git a/diem-move/diem-framework/experimental/sources/configs/ExperimentalValidatorOperatorConfig.move b/aptos-move/diem-framework/experimental/sources/configs/ExperimentalValidatorOperatorConfig.move similarity index 100% rename from diem-move/diem-framework/experimental/sources/configs/ExperimentalValidatorOperatorConfig.move rename to aptos-move/diem-framework/experimental/sources/configs/ExperimentalValidatorOperatorConfig.move diff --git a/diem-move/diem-framework/experimental/sources/configs/ExperimentalValidatorSet.move b/aptos-move/diem-framework/experimental/sources/configs/ExperimentalValidatorSet.move similarity index 100% rename from diem-move/diem-framework/experimental/sources/configs/ExperimentalValidatorSet.move rename to aptos-move/diem-framework/experimental/sources/configs/ExperimentalValidatorSet.move diff --git a/diem-move/diem-framework/experimental/sources/configs/ExperimentalVersion.move b/aptos-move/diem-framework/experimental/sources/configs/ExperimentalVersion.move similarity index 100% rename from diem-move/diem-framework/experimental/sources/configs/ExperimentalVersion.move rename to aptos-move/diem-framework/experimental/sources/configs/ExperimentalVersion.move diff --git a/diem-move/diem-framework/experimental/sources/configs/README.md b/aptos-move/diem-framework/experimental/sources/configs/README.md similarity index 100% rename from diem-move/diem-framework/experimental/sources/configs/README.md rename to aptos-move/diem-framework/experimental/sources/configs/README.md diff --git a/diem-move/diem-framework/experimental/tests/MultiTokenTests.move b/aptos-move/diem-framework/experimental/tests/MultiTokenTests.move similarity index 100% rename from diem-move/diem-framework/experimental/tests/MultiTokenTests.move rename to aptos-move/diem-framework/experimental/tests/MultiTokenTests.move diff --git a/diem-move/diem-framework/experimental/tests/NFTTests.move b/aptos-move/diem-framework/experimental/tests/NFTTests.move similarity index 100% rename from diem-move/diem-framework/experimental/tests/NFTTests.move rename to aptos-move/diem-framework/experimental/tests/NFTTests.move diff --git a/diem-move/diem-framework/experimental/tests/VoteTests.move b/aptos-move/diem-framework/experimental/tests/VoteTests.move similarity index 100% rename from diem-move/diem-framework/experimental/tests/VoteTests.move rename to aptos-move/diem-framework/experimental/tests/VoteTests.move diff --git a/diem-move/diem-framework/move-stdlib/Move.toml b/aptos-move/diem-framework/move-stdlib/Move.toml similarity index 100% rename from diem-move/diem-framework/move-stdlib/Move.toml rename to aptos-move/diem-framework/move-stdlib/Move.toml diff --git a/diem-move/diem-framework/move-stdlib/doc_templates/overview.md b/aptos-move/diem-framework/move-stdlib/doc_templates/overview.md similarity index 100% rename from diem-move/diem-framework/move-stdlib/doc_templates/overview.md rename to aptos-move/diem-framework/move-stdlib/doc_templates/overview.md diff --git a/diem-move/diem-framework/move-stdlib/doc_templates/references.md b/aptos-move/diem-framework/move-stdlib/doc_templates/references.md similarity index 100% rename from diem-move/diem-framework/move-stdlib/doc_templates/references.md rename to aptos-move/diem-framework/move-stdlib/doc_templates/references.md diff --git a/diem-move/diem-framework/move-stdlib/docs/ASCII.md b/aptos-move/diem-framework/move-stdlib/docs/ASCII.md similarity index 100% rename from diem-move/diem-framework/move-stdlib/docs/ASCII.md rename to aptos-move/diem-framework/move-stdlib/docs/ASCII.md diff --git a/diem-move/diem-framework/move-stdlib/docs/BCS.md b/aptos-move/diem-framework/move-stdlib/docs/BCS.md similarity index 100% rename from diem-move/diem-framework/move-stdlib/docs/BCS.md rename to aptos-move/diem-framework/move-stdlib/docs/BCS.md diff --git a/diem-move/diem-framework/move-stdlib/docs/BitVector.md b/aptos-move/diem-framework/move-stdlib/docs/BitVector.md similarity index 100% rename from diem-move/diem-framework/move-stdlib/docs/BitVector.md rename to aptos-move/diem-framework/move-stdlib/docs/BitVector.md diff --git a/diem-move/diem-framework/move-stdlib/docs/Capability.md b/aptos-move/diem-framework/move-stdlib/docs/Capability.md similarity index 100% rename from diem-move/diem-framework/move-stdlib/docs/Capability.md rename to aptos-move/diem-framework/move-stdlib/docs/Capability.md diff --git a/diem-move/diem-framework/move-stdlib/docs/Errors.md b/aptos-move/diem-framework/move-stdlib/docs/Errors.md similarity index 100% rename from diem-move/diem-framework/move-stdlib/docs/Errors.md rename to aptos-move/diem-framework/move-stdlib/docs/Errors.md diff --git a/diem-move/diem-framework/move-stdlib/docs/Event.md b/aptos-move/diem-framework/move-stdlib/docs/Event.md similarity index 100% rename from diem-move/diem-framework/move-stdlib/docs/Event.md rename to aptos-move/diem-framework/move-stdlib/docs/Event.md diff --git a/diem-move/diem-framework/move-stdlib/docs/FixedPoint32.md b/aptos-move/diem-framework/move-stdlib/docs/FixedPoint32.md similarity index 100% rename from diem-move/diem-framework/move-stdlib/docs/FixedPoint32.md rename to aptos-move/diem-framework/move-stdlib/docs/FixedPoint32.md diff --git a/diem-move/diem-framework/move-stdlib/docs/GUID.md b/aptos-move/diem-framework/move-stdlib/docs/GUID.md similarity index 100% rename from diem-move/diem-framework/move-stdlib/docs/GUID.md rename to aptos-move/diem-framework/move-stdlib/docs/GUID.md diff --git a/diem-move/diem-framework/move-stdlib/docs/Hash.md b/aptos-move/diem-framework/move-stdlib/docs/Hash.md similarity index 100% rename from diem-move/diem-framework/move-stdlib/docs/Hash.md rename to aptos-move/diem-framework/move-stdlib/docs/Hash.md diff --git a/diem-move/diem-framework/move-stdlib/docs/Option.md b/aptos-move/diem-framework/move-stdlib/docs/Option.md similarity index 100% rename from diem-move/diem-framework/move-stdlib/docs/Option.md rename to aptos-move/diem-framework/move-stdlib/docs/Option.md diff --git a/diem-move/diem-framework/move-stdlib/docs/Signer.md b/aptos-move/diem-framework/move-stdlib/docs/Signer.md similarity index 100% rename from diem-move/diem-framework/move-stdlib/docs/Signer.md rename to aptos-move/diem-framework/move-stdlib/docs/Signer.md diff --git a/diem-move/diem-framework/move-stdlib/docs/Vector.md b/aptos-move/diem-framework/move-stdlib/docs/Vector.md similarity index 100% rename from diem-move/diem-framework/move-stdlib/docs/Vector.md rename to aptos-move/diem-framework/move-stdlib/docs/Vector.md diff --git a/diem-move/diem-framework/move-stdlib/docs/overview.md b/aptos-move/diem-framework/move-stdlib/docs/overview.md similarity index 100% rename from diem-move/diem-framework/move-stdlib/docs/overview.md rename to aptos-move/diem-framework/move-stdlib/docs/overview.md diff --git a/diem-move/diem-framework/move-stdlib/error_description.errmap b/aptos-move/diem-framework/move-stdlib/error_description.errmap similarity index 100% rename from diem-move/diem-framework/move-stdlib/error_description.errmap rename to aptos-move/diem-framework/move-stdlib/error_description.errmap diff --git a/diem-move/diem-framework/move-stdlib/nursery/Move.toml b/aptos-move/diem-framework/move-stdlib/nursery/Move.toml similarity index 100% rename from diem-move/diem-framework/move-stdlib/nursery/Move.toml rename to aptos-move/diem-framework/move-stdlib/nursery/Move.toml diff --git a/diem-move/diem-framework/move-stdlib/nursery/docs/ACL.md b/aptos-move/diem-framework/move-stdlib/nursery/docs/ACL.md similarity index 100% rename from diem-move/diem-framework/move-stdlib/nursery/docs/ACL.md rename to aptos-move/diem-framework/move-stdlib/nursery/docs/ACL.md diff --git a/diem-move/diem-framework/move-stdlib/nursery/docs/Compare.md b/aptos-move/diem-framework/move-stdlib/nursery/docs/Compare.md similarity index 100% rename from diem-move/diem-framework/move-stdlib/nursery/docs/Compare.md rename to aptos-move/diem-framework/move-stdlib/nursery/docs/Compare.md diff --git a/diem-move/diem-framework/move-stdlib/nursery/docs/Debug.md b/aptos-move/diem-framework/move-stdlib/nursery/docs/Debug.md similarity index 100% rename from diem-move/diem-framework/move-stdlib/nursery/docs/Debug.md rename to aptos-move/diem-framework/move-stdlib/nursery/docs/Debug.md diff --git a/diem-move/diem-framework/move-stdlib/nursery/docs/Offer.md b/aptos-move/diem-framework/move-stdlib/nursery/docs/Offer.md similarity index 100% rename from diem-move/diem-framework/move-stdlib/nursery/docs/Offer.md rename to aptos-move/diem-framework/move-stdlib/nursery/docs/Offer.md diff --git a/diem-move/diem-framework/move-stdlib/nursery/docs/Role.md b/aptos-move/diem-framework/move-stdlib/nursery/docs/Role.md similarity index 100% rename from diem-move/diem-framework/move-stdlib/nursery/docs/Role.md rename to aptos-move/diem-framework/move-stdlib/nursery/docs/Role.md diff --git a/diem-move/diem-framework/move-stdlib/nursery/docs/Vault.md b/aptos-move/diem-framework/move-stdlib/nursery/docs/Vault.md similarity index 100% rename from diem-move/diem-framework/move-stdlib/nursery/docs/Vault.md rename to aptos-move/diem-framework/move-stdlib/nursery/docs/Vault.md diff --git a/diem-move/diem-framework/move-stdlib/nursery/sources/ACL.move b/aptos-move/diem-framework/move-stdlib/nursery/sources/ACL.move similarity index 100% rename from diem-move/diem-framework/move-stdlib/nursery/sources/ACL.move rename to aptos-move/diem-framework/move-stdlib/nursery/sources/ACL.move diff --git a/diem-move/diem-framework/move-stdlib/nursery/sources/Compare.move b/aptos-move/diem-framework/move-stdlib/nursery/sources/Compare.move similarity index 100% rename from diem-move/diem-framework/move-stdlib/nursery/sources/Compare.move rename to aptos-move/diem-framework/move-stdlib/nursery/sources/Compare.move diff --git a/diem-move/diem-framework/move-stdlib/nursery/sources/Debug.move b/aptos-move/diem-framework/move-stdlib/nursery/sources/Debug.move similarity index 100% rename from diem-move/diem-framework/move-stdlib/nursery/sources/Debug.move rename to aptos-move/diem-framework/move-stdlib/nursery/sources/Debug.move diff --git a/diem-move/diem-framework/move-stdlib/nursery/sources/Offer.move b/aptos-move/diem-framework/move-stdlib/nursery/sources/Offer.move similarity index 100% rename from diem-move/diem-framework/move-stdlib/nursery/sources/Offer.move rename to aptos-move/diem-framework/move-stdlib/nursery/sources/Offer.move diff --git a/diem-move/diem-framework/move-stdlib/nursery/sources/Role.move b/aptos-move/diem-framework/move-stdlib/nursery/sources/Role.move similarity index 100% rename from diem-move/diem-framework/move-stdlib/nursery/sources/Role.move rename to aptos-move/diem-framework/move-stdlib/nursery/sources/Role.move diff --git a/diem-move/diem-framework/move-stdlib/nursery/sources/Vault.move b/aptos-move/diem-framework/move-stdlib/nursery/sources/Vault.move similarity index 100% rename from diem-move/diem-framework/move-stdlib/nursery/sources/Vault.move rename to aptos-move/diem-framework/move-stdlib/nursery/sources/Vault.move diff --git a/diem-move/diem-framework/move-stdlib/nursery/sources/docs/Compare.md b/aptos-move/diem-framework/move-stdlib/nursery/sources/docs/Compare.md similarity index 100% rename from diem-move/diem-framework/move-stdlib/nursery/sources/docs/Compare.md rename to aptos-move/diem-framework/move-stdlib/nursery/sources/docs/Compare.md diff --git a/diem-move/diem-framework/move-stdlib/nursery/sources/docs/Debug.md b/aptos-move/diem-framework/move-stdlib/nursery/sources/docs/Debug.md similarity index 100% rename from diem-move/diem-framework/move-stdlib/nursery/sources/docs/Debug.md rename to aptos-move/diem-framework/move-stdlib/nursery/sources/docs/Debug.md diff --git a/diem-move/diem-framework/move-stdlib/nursery/sources/docs/Offer.md b/aptos-move/diem-framework/move-stdlib/nursery/sources/docs/Offer.md similarity index 100% rename from diem-move/diem-framework/move-stdlib/nursery/sources/docs/Offer.md rename to aptos-move/diem-framework/move-stdlib/nursery/sources/docs/Offer.md diff --git a/diem-move/diem-framework/move-stdlib/nursery/sources/docs/Vault.md b/aptos-move/diem-framework/move-stdlib/nursery/sources/docs/Vault.md similarity index 100% rename from diem-move/diem-framework/move-stdlib/nursery/sources/docs/Vault.md rename to aptos-move/diem-framework/move-stdlib/nursery/sources/docs/Vault.md diff --git a/diem-move/diem-framework/move-stdlib/nursery/tests/ACLTests.move b/aptos-move/diem-framework/move-stdlib/nursery/tests/ACLTests.move similarity index 100% rename from diem-move/diem-framework/move-stdlib/nursery/tests/ACLTests.move rename to aptos-move/diem-framework/move-stdlib/nursery/tests/ACLTests.move diff --git a/diem-move/diem-framework/move-stdlib/nursery/tests/CompareTests.move b/aptos-move/diem-framework/move-stdlib/nursery/tests/CompareTests.move similarity index 100% rename from diem-move/diem-framework/move-stdlib/nursery/tests/CompareTests.move rename to aptos-move/diem-framework/move-stdlib/nursery/tests/CompareTests.move diff --git a/diem-move/diem-framework/move-stdlib/nursery/tests/RoleTests.move b/aptos-move/diem-framework/move-stdlib/nursery/tests/RoleTests.move similarity index 100% rename from diem-move/diem-framework/move-stdlib/nursery/tests/RoleTests.move rename to aptos-move/diem-framework/move-stdlib/nursery/tests/RoleTests.move diff --git a/diem-move/diem-framework/move-stdlib/sources/ASCII.move b/aptos-move/diem-framework/move-stdlib/sources/ASCII.move similarity index 100% rename from diem-move/diem-framework/move-stdlib/sources/ASCII.move rename to aptos-move/diem-framework/move-stdlib/sources/ASCII.move diff --git a/diem-move/diem-framework/move-stdlib/sources/BCS.move b/aptos-move/diem-framework/move-stdlib/sources/BCS.move similarity index 100% rename from diem-move/diem-framework/move-stdlib/sources/BCS.move rename to aptos-move/diem-framework/move-stdlib/sources/BCS.move diff --git a/diem-move/diem-framework/move-stdlib/sources/BitVector.move b/aptos-move/diem-framework/move-stdlib/sources/BitVector.move similarity index 100% rename from diem-move/diem-framework/move-stdlib/sources/BitVector.move rename to aptos-move/diem-framework/move-stdlib/sources/BitVector.move diff --git a/diem-move/diem-framework/move-stdlib/sources/Capability.move b/aptos-move/diem-framework/move-stdlib/sources/Capability.move similarity index 100% rename from diem-move/diem-framework/move-stdlib/sources/Capability.move rename to aptos-move/diem-framework/move-stdlib/sources/Capability.move diff --git a/diem-move/diem-framework/move-stdlib/sources/Errors.move b/aptos-move/diem-framework/move-stdlib/sources/Errors.move similarity index 100% rename from diem-move/diem-framework/move-stdlib/sources/Errors.move rename to aptos-move/diem-framework/move-stdlib/sources/Errors.move diff --git a/diem-move/diem-framework/move-stdlib/sources/Event.move b/aptos-move/diem-framework/move-stdlib/sources/Event.move similarity index 100% rename from diem-move/diem-framework/move-stdlib/sources/Event.move rename to aptos-move/diem-framework/move-stdlib/sources/Event.move diff --git a/diem-move/diem-framework/move-stdlib/sources/FixedPoint32.move b/aptos-move/diem-framework/move-stdlib/sources/FixedPoint32.move similarity index 100% rename from diem-move/diem-framework/move-stdlib/sources/FixedPoint32.move rename to aptos-move/diem-framework/move-stdlib/sources/FixedPoint32.move diff --git a/diem-move/diem-framework/move-stdlib/sources/GUID.move b/aptos-move/diem-framework/move-stdlib/sources/GUID.move similarity index 100% rename from diem-move/diem-framework/move-stdlib/sources/GUID.move rename to aptos-move/diem-framework/move-stdlib/sources/GUID.move diff --git a/diem-move/diem-framework/move-stdlib/sources/Hash.move b/aptos-move/diem-framework/move-stdlib/sources/Hash.move similarity index 100% rename from diem-move/diem-framework/move-stdlib/sources/Hash.move rename to aptos-move/diem-framework/move-stdlib/sources/Hash.move diff --git a/diem-move/diem-framework/move-stdlib/sources/Option.move b/aptos-move/diem-framework/move-stdlib/sources/Option.move similarity index 100% rename from diem-move/diem-framework/move-stdlib/sources/Option.move rename to aptos-move/diem-framework/move-stdlib/sources/Option.move diff --git a/diem-move/diem-framework/move-stdlib/sources/Signer.move b/aptos-move/diem-framework/move-stdlib/sources/Signer.move similarity index 100% rename from diem-move/diem-framework/move-stdlib/sources/Signer.move rename to aptos-move/diem-framework/move-stdlib/sources/Signer.move diff --git a/diem-move/diem-framework/move-stdlib/sources/UnitTest.move b/aptos-move/diem-framework/move-stdlib/sources/UnitTest.move similarity index 100% rename from diem-move/diem-framework/move-stdlib/sources/UnitTest.move rename to aptos-move/diem-framework/move-stdlib/sources/UnitTest.move diff --git a/diem-move/diem-framework/move-stdlib/sources/Vector.move b/aptos-move/diem-framework/move-stdlib/sources/Vector.move similarity index 100% rename from diem-move/diem-framework/move-stdlib/sources/Vector.move rename to aptos-move/diem-framework/move-stdlib/sources/Vector.move diff --git a/diem-move/diem-framework/releases/Cargo.toml b/aptos-move/diem-framework/releases/Cargo.toml similarity index 92% rename from diem-move/diem-framework/releases/Cargo.toml rename to aptos-move/diem-framework/releases/Cargo.toml index eda2033d26473..746fac0941bb3 100644 --- a/diem-move/diem-framework/releases/Cargo.toml +++ b/aptos-move/diem-framework/releases/Cargo.toml @@ -12,8 +12,8 @@ publish = false [dependencies] move-bytecode-verifier = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } move-compiler = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } -diem-types = { path = "../../../types" } -diem-workspace-hack = { path = "../../../crates/diem-workspace-hack" } +aptos-types = { path = "../../../types" } +aptos-workspace-hack = { path = "../../../crates/aptos-workspace-hack" } move-binary-format = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } move-core-types = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } move-vm-types = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } diff --git a/diem-move/diem-framework/releases/src/lib.rs b/aptos-move/diem-framework/releases/src/lib.rs similarity index 100% rename from diem-move/diem-framework/releases/src/lib.rs rename to aptos-move/diem-framework/releases/src/lib.rs diff --git a/diem-move/diem-framework/src/lib.rs b/aptos-move/diem-framework/src/lib.rs similarity index 100% rename from diem-move/diem-framework/src/lib.rs rename to aptos-move/diem-framework/src/lib.rs diff --git a/diem-move/diem-framework/src/main.rs b/aptos-move/diem-framework/src/main.rs similarity index 100% rename from diem-move/diem-framework/src/main.rs rename to aptos-move/diem-framework/src/main.rs diff --git a/diem-move/diem-framework/src/natives/account.rs b/aptos-move/diem-framework/src/natives/account.rs similarity index 100% rename from diem-move/diem-framework/src/natives/account.rs rename to aptos-move/diem-framework/src/natives/account.rs diff --git a/diem-move/diem-framework/src/natives/mod.rs b/aptos-move/diem-framework/src/natives/mod.rs similarity index 100% rename from diem-move/diem-framework/src/natives/mod.rs rename to aptos-move/diem-framework/src/natives/mod.rs diff --git a/diem-move/diem-framework/src/natives/signature.rs b/aptos-move/diem-framework/src/natives/signature.rs similarity index 98% rename from diem-move/diem-framework/src/natives/signature.rs rename to aptos-move/diem-framework/src/natives/signature.rs index ae241a2367f5c..e7791d5630cf3 100644 --- a/diem-move/diem-framework/src/natives/signature.rs +++ b/aptos-move/diem-framework/src/natives/signature.rs @@ -1,7 +1,7 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_crypto::{ed25519, traits::*}; +use aptos_crypto::{ed25519, traits::*}; use move_binary_format::errors::PartialVMResult; use move_vm_runtime::native_functions::NativeContext; use move_vm_types::{ diff --git a/diem-move/diem-framework/src/release.rs b/aptos-move/diem-framework/src/release.rs similarity index 100% rename from diem-move/diem-framework/src/release.rs rename to aptos-move/diem-framework/src/release.rs diff --git a/diem-move/diem-framework/tests/aptos_transactional_tests.rs b/aptos-move/diem-framework/tests/aptos_transactional_tests.rs similarity index 75% rename from diem-move/diem-framework/tests/aptos_transactional_tests.rs rename to aptos-move/diem-framework/tests/aptos_transactional_tests.rs index 1b319a2cf82f5..63cb830f6656e 100644 --- a/diem-move/diem-framework/tests/aptos_transactional_tests.rs +++ b/aptos-move/diem-framework/tests/aptos_transactional_tests.rs @@ -2,7 +2,7 @@ fn main() {} -// use diem_transactional_test_harness::run_aptos_test; +// use aptos_transactional_test_harness::run_aptos_test; // datatest_stable::harness!( // run_aptos_test, diff --git a/diem-move/diem-framework/tests/dpn_transactional_tests.rs b/aptos-move/diem-framework/tests/dpn_transactional_tests.rs similarity index 76% rename from diem-move/diem-framework/tests/dpn_transactional_tests.rs rename to aptos-move/diem-framework/tests/dpn_transactional_tests.rs index 2b9c0c0b1ec68..b6280487160bf 100644 --- a/diem-move/diem-framework/tests/dpn_transactional_tests.rs +++ b/aptos-move/diem-framework/tests/dpn_transactional_tests.rs @@ -1,6 +1,6 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_transactional_test_harness::run_dpn_test; +use aptos_transactional_test_harness::run_dpn_test; datatest_stable::harness!(run_dpn_test, "DPN/transactional-tests", r".*\.(mvir|move)$"); diff --git a/diem-move/diem-framework/tests/generated_files.rs b/aptos-move/diem-framework/tests/generated_files.rs similarity index 100% rename from diem-move/diem-framework/tests/generated_files.rs rename to aptos-move/diem-framework/tests/generated_files.rs diff --git a/diem-move/diem-framework/tests/move_unit_test.rs b/aptos-move/diem-framework/tests/move_unit_test.rs similarity index 93% rename from diem-move/diem-framework/tests/move_unit_test.rs rename to aptos-move/diem-framework/tests/move_unit_test.rs index aab9345bb7bad..33612de618f1b 100644 --- a/diem-move/diem-framework/tests/move_unit_test.rs +++ b/aptos-move/diem-framework/tests/move_unit_test.rs @@ -1,8 +1,8 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 +use aptos_vm::natives::aptos_natives; use diem_framework::path_in_crate; -use diem_vm::natives::diem_natives; use move_cli::package::cli; use move_unit_test::UnitTestingConfig; use tempfile::tempdir; @@ -17,7 +17,7 @@ fn run_tests_for_pkg(path_to_pkg: impl Into) { ..Default::default() }, UnitTestingConfig::default_with_bound(Some(100_000)), - diem_natives(), + aptos_natives(), /* compute_coverage */ false, ) .unwrap(); diff --git a/diem-move/diem-framework/tests/move_verification_test.rs b/aptos-move/diem-framework/tests/move_verification_test.rs similarity index 100% rename from diem-move/diem-framework/tests/move_verification_test.rs rename to aptos-move/diem-framework/tests/move_verification_test.rs diff --git a/diem-move/e2e-tests-replay/Cargo.toml b/aptos-move/e2e-tests-replay/Cargo.toml similarity index 78% rename from diem-move/e2e-tests-replay/Cargo.toml rename to aptos-move/e2e-tests-replay/Cargo.toml index 9c0398e34389d..ffa61d216979b 100644 --- a/diem-move/e2e-tests-replay/Cargo.toml +++ b/aptos-move/e2e-tests-replay/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "diem-e2e-tests-replay" +name = "aptos-e2e-tests-replay" version = "0.1.0" authors = ["Diem Association "] description = "A tool that reconstructs and replays test cases from the trace dump of E2E tests" @@ -13,11 +13,11 @@ bcs = "0.1.2" structopt = "0.3.21" walkdir = "2.3.1" -diem-workspace-hack = { path = "../../crates/diem-workspace-hack" } +aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" } move-stackless-bytecode-interpreter = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } -diem-types = { path = "../../types", features = ["fuzzing"] } -diem-framework = { path = "../../diem-move/diem-framework" } -diem-vm = { path = "../../diem-move/diem-vm" } +aptos-types = { path = "../../types", features = ["fuzzing"] } +diem-framework = { path = "../../aptos-move/diem-framework" } +aptos-vm = { path = "../../aptos-move/aptos-vm" } language-e2e-tests = { path = "../e2e-tests" } move-binary-format = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } move-core-types = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } diff --git a/diem-move/e2e-tests-replay/src/lib.rs b/aptos-move/e2e-tests-replay/src/lib.rs similarity index 99% rename from diem-move/e2e-tests-replay/src/lib.rs rename to aptos-move/e2e-tests-replay/src/lib.rs index 039ab134b03d3..335de35f3a278 100644 --- a/diem-move/e2e-tests-replay/src/lib.rs +++ b/aptos-move/e2e-tests-replay/src/lib.rs @@ -9,7 +9,7 @@ use std::{ }; use walkdir::WalkDir; -use diem_types::{ +use aptos_types::{ access_path::Path as AP, account_address::AccountAddress, account_config::{ @@ -23,9 +23,9 @@ use diem_types::{ TransactionPayload, TransactionStatus, WriteSetPayload, }, }; -use diem_vm::{ +use aptos_vm::{ convert_changeset_and_events, - natives::diem_natives, + natives::aptos_natives, script_to_script_function::remapping, system_module_names::{ BLOCK_PROLOGUE, DIEM_BLOCK_MODULE, SCRIPT_PROLOGUE_NAME, USER_EPILOGUE_NAME, @@ -286,7 +286,7 @@ impl<'env> CrossRunner<'env> { if self.flags.verbose_vm { env::set_var(MOVE_VM_TRACING_ENV_VAR_NAME, MOVE_VM_TRACING_LOG_FILENAME); } - let move_vm = MoveVM::new(diem_natives()).unwrap(); + let move_vm = MoveVM::new(aptos_natives()).unwrap(); let mut session = move_vm.new_session(&self.move_vm_state); let move_vm_return_values = execute_function_via_session( &mut session, @@ -348,7 +348,7 @@ impl<'env> CrossRunner<'env> { } // execute via move VM - let move_vm = MoveVM::new(diem_natives()).unwrap(); + let move_vm = MoveVM::new(aptos_natives()).unwrap(); let mut session = move_vm.new_session(&self.move_vm_state); let move_vm_return_values = execute_script_function_via_session( &mut session, @@ -500,7 +500,7 @@ impl<'env> TraceReplayer<'env> { .collect(); // execute - let move_vm = MoveVM::new(diem_natives()).unwrap(); + let move_vm = MoveVM::new(aptos_natives()).unwrap(); let mut session = move_vm.new_session(&self.data_store); let mut xrunner = if self.flags.xrun { Some(CrossRunner::new( @@ -540,7 +540,7 @@ impl<'env> TraceReplayer<'env> { let gas_currency_ty = type_tag_for_currency_code(from_currency_code_string(gas_currency).unwrap()); - let move_vm = MoveVM::new(diem_natives()).unwrap(); + let move_vm = MoveVM::new(aptos_natives()).unwrap(); let mut session = move_vm.new_session(&self.data_store); let mut xrunner = if self.flags.xrun { Some(CrossRunner::new( @@ -613,7 +613,7 @@ impl<'env> TraceReplayer<'env> { txn_meta: TransactionMetadata, script_fun: ScriptFunction, ) -> VMResult<(ChangeSet, Vec)> { - let move_vm = MoveVM::new(diem_natives()).unwrap(); + let move_vm = MoveVM::new(aptos_natives()).unwrap(); let mut session = move_vm.new_session(&self.data_store); let mut xrunner = if self.flags.xrun { Some(CrossRunner::new( diff --git a/diem-move/e2e-tests-replay/src/main.rs b/aptos-move/e2e-tests-replay/src/main.rs similarity index 94% rename from diem-move/e2e-tests-replay/src/main.rs rename to aptos-move/e2e-tests-replay/src/main.rs index 8aafaeb5a5640..c78eafee695e8 100644 --- a/diem-move/e2e-tests-replay/src/main.rs +++ b/aptos-move/e2e-tests-replay/src/main.rs @@ -5,14 +5,14 @@ use anyhow::{bail, Result}; use std::collections::{BTreeMap, BTreeSet}; use structopt::StructOpt; +use aptos_types::on_chain_config::{DiemVersion, DIEM_MAX_KNOWN_VERSION}; use diem_framework::dpn_files; -use diem_types::on_chain_config::{DiemVersion, DIEM_MAX_KNOWN_VERSION}; use move_model::run_model_builder; use move_stackless_bytecode_interpreter::{ concrete::settings::InterpreterSettings, StacklessBytecodeInterpreter, }; -use diem_e2e_tests_replay::{self, ReplayFlags}; +use aptos_e2e_tests_replay::{self, ReplayFlags}; #[derive(StructOpt)] struct ReplayArgs { @@ -95,7 +95,7 @@ pub fn main() -> Result<()> { let env = run_model_builder(&dpn_files(), &[])?; let interpreter = StacklessBytecodeInterpreter::new(&env, None, settings); for trace in args.trace_files { - diem_e2e_tests_replay::replay(trace, &interpreter, &flags)?; + aptos_e2e_tests_replay::replay(trace, &interpreter, &flags)?; } Ok(()) } diff --git a/diem-move/e2e-tests/Cargo.toml b/aptos-move/e2e-tests/Cargo.toml similarity index 70% rename from diem-move/e2e-tests/Cargo.toml rename to aptos-move/e2e-tests/Cargo.toml index 3ea67cc900e5f..d2cf20df63383 100644 --- a/diem-move/e2e-tests/Cargo.toml +++ b/aptos-move/e2e-tests/Cargo.toml @@ -30,17 +30,17 @@ read-write-set = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223 move-command-line-common = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } ## Diem-Move dependencies -diem-writeset-generator = { path = "../writeset-transaction-generator" } +aptos-writeset-generator = { path = "../writeset-transaction-generator" } vm-genesis = { path = "../vm-genesis" } -diem-vm = { path = "../diem-vm" } -diem-keygen = { path = "../diem-keygen" } +aptos-vm = { path = "../aptos-vm" } +aptos-keygen = { path = "../aptos-keygen" } diem-framework-releases = { path = "../diem-framework/DPN/releases" } ## Other Diem Dependencies -diem-crypto = { path = "../../crates/diem-crypto", features = ["fuzzing"] } -diem-state-view = { path = "../../storage/state-view" } -diem-types = { path = "../../types", features = ["fuzzing"] } -diem-proptest-helpers = { path = "../../crates/diem-proptest-helpers" } -diem-config = { path = "../../config" } -diem-transaction-builder = { path = "../../sdk/transaction-builder" } -diem-workspace-hack = { version = "0.1", path = "../../crates/diem-workspace-hack" } +aptos-crypto = { path = "../../crates/aptos-crypto", features = ["fuzzing"] } +aptos-state-view = { path = "../../storage/state-view" } +aptos-types = { path = "../../types", features = ["fuzzing"] } +aptos-proptest-helpers = { path = "../../crates/aptos-proptest-helpers" } +aptos-config = { path = "../../config" } +aptos-transaction-builder = { path = "../../sdk/transaction-builder" } +aptos-workspace-hack = { version = "0.1", path = "../../crates/aptos-workspace-hack" } diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__account_limits__account_limits.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__account_limits__account_limits.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__account_limits__account_limits.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__account_limits__account_limits.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__admin_script__admin_script_rotate_key_multi_signer.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__admin_script__admin_script_rotate_key_multi_signer.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__admin_script__admin_script_rotate_key_multi_signer.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__admin_script__admin_script_rotate_key_multi_signer.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__admin_script__admin_script_rotate_key_single_signer_new_epoch.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__admin_script__admin_script_rotate_key_single_signer_new_epoch.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__admin_script__admin_script_rotate_key_single_signer_new_epoch.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__admin_script__admin_script_rotate_key_single_signer_new_epoch.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__admin_script__admin_script_rotate_key_single_signer_no_epoch.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__admin_script__admin_script_rotate_key_single_signer_no_epoch.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__admin_script__admin_script_rotate_key_single_signer_no_epoch.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__admin_script__admin_script_rotate_key_single_signer_no_epoch.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__create_account__create_account.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__create_account__create_account.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__create_account__create_account.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__create_account__create_account.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__crsn__can_opt_in_to_crsn.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__crsn__can_opt_in_to_crsn.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__crsn__can_opt_in_to_crsn.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__crsn__can_opt_in_to_crsn.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__crsn__crsns_can_be_executed_out_of_order.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__crsn__crsns_can_be_executed_out_of_order.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__crsn__crsns_can_be_executed_out_of_order.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__crsn__crsns_can_be_executed_out_of_order.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__crsn__crsns_prevent_replay_no_window_shift.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__crsn__crsns_prevent_replay_no_window_shift.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__crsn__crsns_prevent_replay_no_window_shift.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__crsn__crsns_prevent_replay_no_window_shift.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__crsn__crsns_prevent_replay_window_shift.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__crsn__crsns_prevent_replay_window_shift.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__crsn__crsns_prevent_replay_window_shift.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__crsn__crsns_prevent_replay_window_shift.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__crsn__force_expiration_of_crsns.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__crsn__force_expiration_of_crsns.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__crsn__force_expiration_of_crsns.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__crsn__force_expiration_of_crsns.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__data_store__borrow_after_move.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__data_store__borrow_after_move.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__data_store__borrow_after_move.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__data_store__borrow_after_move.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__data_store__change_after_move.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__data_store__change_after_move.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__data_store__change_after_move.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__data_store__change_after_move.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__data_store__move_from_across_blocks.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__data_store__move_from_across_blocks.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__data_store__move_from_across_blocks.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__data_store__move_from_across_blocks.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__emergency_admin_script__halt_network_version_2.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__emergency_admin_script__halt_network_version_2.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__emergency_admin_script__halt_network_version_2.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__emergency_admin_script__halt_network_version_2.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__emergency_admin_script__halt_network_version_3.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__emergency_admin_script__halt_network_version_3.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__emergency_admin_script__halt_network_version_3.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__emergency_admin_script__halt_network_version_3.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__emergency_admin_script__halt_network_version_4.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__emergency_admin_script__halt_network_version_4.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__emergency_admin_script__halt_network_version_4.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__emergency_admin_script__halt_network_version_4.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__emergency_admin_script__validator_batch_remove_version_4.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__emergency_admin_script__validator_batch_remove_version_4.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__emergency_admin_script__validator_batch_remove_version_4.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__emergency_admin_script__validator_batch_remove_version_4.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__experimental__experimental_genesis_execute_txn_non_existent_sender.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__experimental__experimental_genesis_execute_txn_non_existent_sender.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__experimental__experimental_genesis_execute_txn_non_existent_sender.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__experimental__experimental_genesis_execute_txn_non_existent_sender.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__experimental__experimental_genesis_execute_txn_successful.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__experimental__experimental_genesis_execute_txn_successful.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__experimental__experimental_genesis_execute_txn_successful.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__experimental__experimental_genesis_execute_txn_successful.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__failed_transaction_tests__failed_transaction_cleanup_test_version_4.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__failed_transaction_tests__failed_transaction_cleanup_test_version_4.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__failed_transaction_tests__failed_transaction_cleanup_test_version_4.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__failed_transaction_tests__failed_transaction_cleanup_test_version_4.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__failed_transaction_tests__non_existent_sender_version_4.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__failed_transaction_tests__non_existent_sender_version_4.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__failed_transaction_tests__non_existent_sender_version_4.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__failed_transaction_tests__non_existent_sender_version_4.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__mint__mint_to_existing_not_dd_version_4.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__mint__mint_to_existing_not_dd_version_4.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__mint__mint_to_existing_not_dd_version_4.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__mint__mint_to_existing_not_dd_version_4.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__mint__mint_to_new_account_version_4.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__mint__mint_to_new_account_version_4.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__mint__mint_to_new_account_version_4.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__mint__mint_to_new_account_version_4.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__mint__tiered_mint_designated_dealer_version_4.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__mint__tiered_mint_designated_dealer_version_4.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__mint__tiered_mint_designated_dealer_version_4.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__mint__tiered_mint_designated_dealer_version_4.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__mint__tiered_update_exchange_rate_version_4.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__mint__tiered_update_exchange_rate_version_4.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__mint__tiered_update_exchange_rate_version_4.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__mint__tiered_update_exchange_rate_version_4.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__module_publishing__bad_module_address.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__module_publishing__bad_module_address.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__module_publishing__bad_module_address.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__module_publishing__bad_module_address.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__module_publishing__duplicate_module.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__module_publishing__duplicate_module.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__module_publishing__duplicate_module.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__module_publishing__duplicate_module.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__module_publishing__layout_compatible_module.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__module_publishing__layout_compatible_module.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__module_publishing__layout_compatible_module.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__module_publishing__layout_compatible_module.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__module_publishing__layout_incompatible_module_with_changed_field.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__module_publishing__layout_incompatible_module_with_changed_field.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__module_publishing__layout_incompatible_module_with_changed_field.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__module_publishing__layout_incompatible_module_with_changed_field.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__module_publishing__layout_incompatible_module_with_new_field.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__module_publishing__layout_incompatible_module_with_new_field.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__module_publishing__layout_incompatible_module_with_new_field.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__module_publishing__layout_incompatible_module_with_new_field.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__module_publishing__layout_incompatible_module_with_removed_field.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__module_publishing__layout_incompatible_module_with_removed_field.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__module_publishing__layout_incompatible_module_with_removed_field.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__module_publishing__layout_incompatible_module_with_removed_field.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__module_publishing__layout_incompatible_module_with_removed_struct.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__module_publishing__layout_incompatible_module_with_removed_struct.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__module_publishing__layout_incompatible_module_with_removed_struct.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__module_publishing__layout_incompatible_module_with_removed_struct.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__module_publishing__linking_compatible_module.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__module_publishing__linking_compatible_module.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__module_publishing__linking_compatible_module.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__module_publishing__linking_compatible_module.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__module_publishing__linking_incompatible_module_with_added_param.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__module_publishing__linking_incompatible_module_with_added_param.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__module_publishing__linking_incompatible_module_with_added_param.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__module_publishing__linking_incompatible_module_with_added_param.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__module_publishing__linking_incompatible_module_with_changed_param.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__module_publishing__linking_incompatible_module_with_changed_param.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__module_publishing__linking_incompatible_module_with_changed_param.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__module_publishing__linking_incompatible_module_with_changed_param.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__module_publishing__linking_incompatible_module_with_removed_pub_fn.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__module_publishing__linking_incompatible_module_with_removed_pub_fn.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__module_publishing__linking_incompatible_module_with_removed_pub_fn.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__module_publishing__linking_incompatible_module_with_removed_pub_fn.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__module_publishing__test_publishing_allow_modules.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__module_publishing__test_publishing_allow_modules.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__module_publishing__test_publishing_allow_modules.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__module_publishing__test_publishing_allow_modules.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__module_publishing__test_publishing_no_modules_core_code_sender.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__module_publishing__test_publishing_no_modules_core_code_sender.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__module_publishing__test_publishing_no_modules_core_code_sender.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__module_publishing__test_publishing_no_modules_core_code_sender.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__module_publishing__test_publishing_no_modules_invalid_sender.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__module_publishing__test_publishing_no_modules_invalid_sender.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__module_publishing__test_publishing_no_modules_invalid_sender.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__module_publishing__test_publishing_no_modules_invalid_sender.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__module_publishing__test_publishing_no_modules_non_allowlist_script.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__module_publishing__test_publishing_no_modules_non_allowlist_script.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__module_publishing__test_publishing_no_modules_non_allowlist_script.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__module_publishing__test_publishing_no_modules_non_allowlist_script.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__module_publishing__test_publishing_no_modules_non_allowlist_script_proper_sender.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__module_publishing__test_publishing_no_modules_non_allowlist_script_proper_sender.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__module_publishing__test_publishing_no_modules_non_allowlist_script_proper_sender.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__module_publishing__test_publishing_no_modules_non_allowlist_script_proper_sender.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__module_publishing__test_publishing_no_modules_proper_sender.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__module_publishing__test_publishing_no_modules_proper_sender.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__module_publishing__test_publishing_no_modules_proper_sender.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__module_publishing__test_publishing_no_modules_proper_sender.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__multi_agent__multi_agent_mint.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__multi_agent__multi_agent_mint.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__multi_agent__multi_agent_mint.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__multi_agent__multi_agent_mint.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__multi_agent__multi_agent_p2p.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__multi_agent__multi_agent_p2p.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__multi_agent__multi_agent_p2p.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__multi_agent__multi_agent_p2p.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__multi_agent__multi_agent_swap.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__multi_agent__multi_agent_swap.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__multi_agent__multi_agent_swap.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__multi_agent__multi_agent_swap.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__multi_agent__multi_agent_wrong_number_of_signers.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__multi_agent__multi_agent_wrong_number_of_signers.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__multi_agent__multi_agent_wrong_number_of_signers.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__multi_agent__multi_agent_wrong_number_of_signers.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__on_chain_configs__drop_txn_after_reconfiguration_version_4.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__on_chain_configs__drop_txn_after_reconfiguration_version_4.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__on_chain_configs__drop_txn_after_reconfiguration_version_4.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__on_chain_configs__drop_txn_after_reconfiguration_version_4.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__on_chain_configs__initial_diem_version_version_4.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__on_chain_configs__initial_aptos_version_version_4.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__on_chain_configs__initial_diem_version_version_4.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__on_chain_configs__initial_aptos_version_version_4.exp diff --git a/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__on_chain_configs__initial_diem_version_version_4.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__on_chain_configs__initial_diem_version_version_4.exp new file mode 100644 index 0000000000000..e831a5f99e7f9 --- /dev/null +++ b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__on_chain_configs__initial_diem_version_version_4.exp @@ -0,0 +1,2 @@ +Ok([TransactionOutput { write_set: WriteSet(WriteSetMut { write_set: [(AccessPath { address: 0000000000000000000000000a550c18, path: 0100000000000000000000000000000001094469656d426c6f636b0d426c6f636b4d6574616461746100 }, Value(010000000000000001000000000000001811000000000000000000000000000000000000000a550c18)), (AccessPath { address: 0000000000000000000000000a550c18, path: 01000000000000000000000000000000010d4469656d54696d657374616d701743757272656e7454696d654d6963726f7365636f6e647300 }, Value(0100000000000000))] }), events: [ContractEvent { key: EventKey(11000000000000000000000000000000000000000a550c18), index: 0, type: Struct(StructTag { address: 00000000000000000000000000000001, module: Identifier("DiemBlock"), name: Identifier("NewBlockEvent"), type_params: [] }), event_data: "000000000000000051c1b9fc2f32d6f2fff669823ef31cbe000100000000000000" }], gas_used: 100000000, status: Keep(EXECUTED) }]) +Ok([TransactionOutput { write_set: WriteSet(WriteSetMut { write_set: [(AccessPath { address: 0000000000000000000000000a550c18, path: 01000000000000000000000000000000010b4469656d4163636f756e740b4469656d4163636f756e7400 }, Value(20872d108c30648f16843e29655b181edc12dcc9318ec7d90d98a52801cdcd96c9010000000000000000000000000a550c18010000000000000000000000000a550c1800000000000000001802000000000000000000000000000000000000000a550c1800000000000000001803000000000000000000000000000000000000000a550c180100000000000000)), (AccessPath { address: 0000000000000000000000000a550c18, path: 01000000000000000000000000000000010a4469656d436f6e6669670d436f6e66696775726174696f6e00 }, Value(0200000000000000010000000000000002000000000000001804000000000000000000000000000000000000000a550c18)), (AccessPath { address: 0000000000000000000000000a550c18, path: 01000000000000000000000000000000010a4469656d436f6e6669670a4469656d436f6e6669670107000000000000000000000000000000010b4469656d56657273696f6e0b4469656d56657273696f6e00 }, Value(0500000000000000))] }), events: [ContractEvent { key: EventKey(04000000000000000000000000000000000000000a550c18), index: 1, type: Struct(StructTag { address: 00000000000000000000000000000001, module: Identifier("DiemConfig"), name: Identifier("NewEpochEvent"), type_params: [] }), event_data: "0200000000000000" }], gas_used: 104, status: Keep(EXECUTED) }]) diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__on_chain_configs__update_consensus_config_version_4.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__on_chain_configs__update_consensus_config_version_4.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__on_chain_configs__update_consensus_config_version_4.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__on_chain_configs__update_consensus_config_version_4.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__on_chain_configs__update_script_allow_list.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__on_chain_configs__update_script_allow_list.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__on_chain_configs__update_script_allow_list.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__on_chain_configs__update_script_allow_list.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__on_chain_configs__updated_limit_allows_txn_version_4.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__on_chain_configs__updated_limit_allows_txn_version_4.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__on_chain_configs__updated_limit_allows_txn_version_4.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__on_chain_configs__updated_limit_allows_txn_version_4.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__peer_to_peer__cycle_peer_to_peer_multi_block_version_4.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__peer_to_peer__cycle_peer_to_peer_multi_block_version_4.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__peer_to_peer__cycle_peer_to_peer_multi_block_version_4.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__peer_to_peer__cycle_peer_to_peer_multi_block_version_4.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__peer_to_peer__cycle_peer_to_peer_version_4.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__peer_to_peer__cycle_peer_to_peer_version_4.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__peer_to_peer__cycle_peer_to_peer_version_4.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__peer_to_peer__cycle_peer_to_peer_version_4.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__peer_to_peer__few_peer_to_peer_with_event_version_4.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__peer_to_peer__few_peer_to_peer_with_event_version_4.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__peer_to_peer__few_peer_to_peer_with_event_version_4.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__peer_to_peer__few_peer_to_peer_with_event_version_4.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__peer_to_peer__many_to_one_peer_to_peer_version_4.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__peer_to_peer__many_to_one_peer_to_peer_version_4.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__peer_to_peer__many_to_one_peer_to_peer_version_4.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__peer_to_peer__many_to_one_peer_to_peer_version_4.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__peer_to_peer__one_to_many_peer_to_peer_version_4.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__peer_to_peer__one_to_many_peer_to_peer_version_4.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__peer_to_peer__one_to_many_peer_to_peer_version_4.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__peer_to_peer__one_to_many_peer_to_peer_version_4.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__peer_to_peer__single_peer_to_peer_with_event_version_4.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__peer_to_peer__single_peer_to_peer_with_event_version_4.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__peer_to_peer__single_peer_to_peer_with_event_version_4.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__peer_to_peer__single_peer_to_peer_with_event_version_4.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__peer_to_peer__single_peer_to_peer_with_padding.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__peer_to_peer__single_peer_to_peer_with_padding.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__peer_to_peer__single_peer_to_peer_with_padding.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__peer_to_peer__single_peer_to_peer_with_padding.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__peer_to_peer__zero_amount_peer_to_peer_version_4.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__peer_to_peer__zero_amount_peer_to_peer_version_4.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__peer_to_peer__zero_amount_peer_to_peer_version_4.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__peer_to_peer__zero_amount_peer_to_peer_version_4.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__preburn_queue__concurrent_preburns_old_data_old_df_new_scripts.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__preburn_queue__concurrent_preburns_old_data_old_df_new_scripts.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__preburn_queue__concurrent_preburns_old_data_old_df_new_scripts.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__preburn_queue__concurrent_preburns_old_data_old_df_new_scripts.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__preburn_queue__concurrent_preburns_test_upgrade_empty_preburn.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__preburn_queue__concurrent_preburns_test_upgrade_empty_preburn.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__preburn_queue__concurrent_preburns_test_upgrade_empty_preburn.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__preburn_queue__concurrent_preburns_test_upgrade_empty_preburn.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__preburn_queue__concurrent_preburns_test_upgrade_empty_preburn_multiple_initial_preburns.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__preburn_queue__concurrent_preburns_test_upgrade_empty_preburn_multiple_initial_preburns.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__preburn_queue__concurrent_preburns_test_upgrade_empty_preburn_multiple_initial_preburns.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__preburn_queue__concurrent_preburns_test_upgrade_empty_preburn_multiple_initial_preburns.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__preburn_queue__concurrent_preburns_test_upgrade_existing_balance_at_upgrade.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__preburn_queue__concurrent_preburns_test_upgrade_existing_balance_at_upgrade.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__preburn_queue__concurrent_preburns_test_upgrade_existing_balance_at_upgrade.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__preburn_queue__concurrent_preburns_test_upgrade_existing_balance_at_upgrade.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__preburn_queue__concurrent_preburns_test_upgrade_new_data_new_df_old_scripts_fail.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__preburn_queue__concurrent_preburns_test_upgrade_new_data_new_df_old_scripts_fail.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__preburn_queue__concurrent_preburns_test_upgrade_new_data_new_df_old_scripts_fail.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__preburn_queue__concurrent_preburns_test_upgrade_new_data_new_df_old_scripts_fail.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__preburn_queue__concurrent_preburns_test_upgrade_old_data_new_df_old_scripts_fail.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__preburn_queue__concurrent_preburns_test_upgrade_old_data_new_df_old_scripts_fail.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__preburn_queue__concurrent_preburns_test_upgrade_old_data_new_df_old_scripts_fail.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__preburn_queue__concurrent_preburns_test_upgrade_old_data_new_df_old_scripts_fail.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__rotate_key__rotate_ed25519_key_version_4.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__rotate_key__rotate_ed25519_key_version_4.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__rotate_key__rotate_ed25519_key_version_4.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__rotate_key__rotate_ed25519_key_version_4.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__rotate_key__rotate_ed25519_multisig_key_version_4.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__rotate_key__rotate_ed25519_multisig_key_version_4.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__rotate_key__rotate_ed25519_multisig_key_version_4.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__rotate_key__rotate_ed25519_multisig_key_version_4.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__script_functions__script_fn_payload_invoke_private_fn.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__script_functions__script_fn_payload_invoke_private_fn.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__script_functions__script_fn_payload_invoke_private_fn.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__script_functions__script_fn_payload_invoke_private_fn.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__script_functions__script_fn_payload_invoke_public_fn.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__script_functions__script_fn_payload_invoke_public_fn.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__script_functions__script_fn_payload_invoke_public_fn.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__script_functions__script_fn_payload_invoke_public_fn.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__script_functions__script_fn_payload_invoke_script_fn.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__script_functions__script_fn_payload_invoke_script_fn.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__script_functions__script_fn_payload_invoke_script_fn.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__script_functions__script_fn_payload_invoke_script_fn.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__scripts__script_bad_sig_function_dep.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__scripts__script_bad_sig_function_dep.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__scripts__script_bad_sig_function_dep.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__scripts__script_bad_sig_function_dep.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__scripts__script_code_unverifiable.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__scripts__script_code_unverifiable.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__scripts__script_code_unverifiable.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__scripts__script_code_unverifiable.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__scripts__script_nested_type_argument_module_does_not_exist.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__scripts__script_nested_type_argument_module_does_not_exist.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__scripts__script_nested_type_argument_module_does_not_exist.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__scripts__script_nested_type_argument_module_does_not_exist.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__scripts__script_non_existing_function_dep.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__scripts__script_non_existing_function_dep.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__scripts__script_non_existing_function_dep.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__scripts__script_non_existing_function_dep.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__scripts__script_none_existing_module_dep.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__scripts__script_none_existing_module_dep.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__scripts__script_none_existing_module_dep.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__scripts__script_none_existing_module_dep.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__scripts__script_type_argument_module_does_not_exist.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__scripts__script_type_argument_module_does_not_exist.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__scripts__script_type_argument_module_does_not_exist.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__scripts__script_type_argument_module_does_not_exist.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__transaction_builder__add_child_currencies.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__transaction_builder__add_child_currencies.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__transaction_builder__add_child_currencies.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__transaction_builder__add_child_currencies.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__transaction_builder__create_child_vasp_all_currencies_version_4.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__transaction_builder__create_child_vasp_all_currencies_version_4.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__transaction_builder__create_child_vasp_all_currencies_version_4.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__transaction_builder__create_child_vasp_all_currencies_version_4.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__transaction_builder__create_child_vasp_with_balance_version_4.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__transaction_builder__create_child_vasp_with_balance_version_4.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__transaction_builder__create_child_vasp_with_balance_version_4.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__transaction_builder__create_child_vasp_with_balance_version_4.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__transaction_builder__create_parent_and_child_vasp_version_4.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__transaction_builder__create_parent_and_child_vasp_version_4.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__transaction_builder__create_parent_and_child_vasp_version_4.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__transaction_builder__create_parent_and_child_vasp_version_4.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__transaction_builder__dd_dual_attestation_payments_version_4.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__transaction_builder__dd_dual_attestation_payments_version_4.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__transaction_builder__dd_dual_attestation_payments_version_4.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__transaction_builder__dd_dual_attestation_payments_version_4.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__transaction_builder__dual_attestation_payment_version_4.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__transaction_builder__dual_attestation_payment_version_4.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__transaction_builder__dual_attestation_payment_version_4.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__transaction_builder__dual_attestation_payment_version_4.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__transaction_builder__freeze_unfreeze_account_version_4.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__transaction_builder__freeze_unfreeze_account_version_4.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__transaction_builder__freeze_unfreeze_account_version_4.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__transaction_builder__freeze_unfreeze_account_version_4.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__transaction_builder__publish_rotate_shared_ed25519_public_key_version_4.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__transaction_builder__publish_rotate_shared_ed25519_public_key_version_4.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__transaction_builder__publish_rotate_shared_ed25519_public_key_version_4.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__transaction_builder__publish_rotate_shared_ed25519_public_key_version_4.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__transaction_builder__recovery_address_version_4.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__transaction_builder__recovery_address_version_4.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__transaction_builder__recovery_address_version_4.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__transaction_builder__recovery_address_version_4.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__transaction_builder__test_rotate_authentication_key_with_nonce_admin_version_4.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__transaction_builder__test_rotate_authentication_key_with_nonce_admin_version_4.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__transaction_builder__test_rotate_authentication_key_with_nonce_admin_version_4.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__transaction_builder__test_rotate_authentication_key_with_nonce_admin_version_4.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__transaction_fees__burn_txn_fees_version_4.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__transaction_fees__burn_txn_fees_version_4.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__transaction_fees__burn_txn_fees_version_4.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__transaction_fees__burn_txn_fees_version_4.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__validator_set_management__validator_add_max_number.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__validator_set_management__validator_add_max_number.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__validator_set_management__validator_add_max_number.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__validator_set_management__validator_add_max_number.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__validator_set_management__validator_add_version_4.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__validator_set_management__validator_add_version_4.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__validator_set_management__validator_add_version_4.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__validator_set_management__validator_add_version_4.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__validator_set_management__validator_rotate_key_and_reconfigure_version_4.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__validator_set_management__validator_rotate_key_and_reconfigure_version_4.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__validator_set_management__validator_rotate_key_and_reconfigure_version_4.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__validator_set_management__validator_rotate_key_and_reconfigure_version_4.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__validator_set_management__validator_set_operator_set_key_reconfigure_version_4.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__validator_set_management__validator_set_operator_set_key_reconfigure_version_4.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__validator_set_management__validator_set_operator_set_key_reconfigure_version_4.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__validator_set_management__validator_set_operator_set_key_reconfigure_version_4.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__vasps__max_child_accounts_for_vasp_recovery_address_version_4.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__vasps__max_child_accounts_for_vasp_recovery_address_version_4.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__vasps__max_child_accounts_for_vasp_recovery_address_version_4.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__vasps__max_child_accounts_for_vasp_recovery_address_version_4.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__vasps__valid_creator_already_vasp_version_4.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__vasps__valid_creator_already_vasp_version_4.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__vasps__valid_creator_already_vasp_version_4.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__vasps__valid_creator_already_vasp_version_4.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__charge_gas_invalid_args_version_4.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__charge_gas_invalid_args_version_4.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__charge_gas_invalid_args_version_4.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__charge_gas_invalid_args_version_4.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__publish_and_register_new_currency.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__publish_and_register_new_currency.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__publish_and_register_new_currency.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__publish_and_register_new_currency.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__test_allowlist.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__test_allowlist.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__test_allowlist.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__test_allowlist.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__test_arbitrary_script_execution.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__test_arbitrary_script_execution.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__test_arbitrary_script_execution.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__test_arbitrary_script_execution.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__test_module_dependency_fails_verification.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__test_module_dependency_fails_verification.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__test_module_dependency_fails_verification.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__test_module_dependency_fails_verification.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__test_module_transitive_dependency_fails_verification.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__test_module_transitive_dependency_fails_verification.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__test_module_transitive_dependency_fails_verification.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__test_module_transitive_dependency_fails_verification.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__test_no_publishing_diem_root_sender.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__test_no_publishing_aptos_root_sender.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__test_no_publishing_diem_root_sender.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__test_no_publishing_aptos_root_sender.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__test_open_publishing.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__test_open_publishing.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__test_open_publishing.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__test_open_publishing.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__test_open_publishing_invalid_address.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__test_open_publishing_invalid_address.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__test_open_publishing_invalid_address.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__test_open_publishing_invalid_address.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__test_publish_from_diem_root.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__test_publish_from_aptos_root.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__test_publish_from_diem_root.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__test_publish_from_aptos_root.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__test_script_dependency_fails_verification.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__test_script_dependency_fails_verification.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__test_script_dependency_fails_verification.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__test_script_dependency_fails_verification.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__test_script_transitive_dependency_fails_verification.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__test_script_transitive_dependency_fails_verification.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__test_script_transitive_dependency_fails_verification.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__test_script_transitive_dependency_fails_verification.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__test_type_tag_dependency_fails_verification.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__test_type_tag_dependency_fails_verification.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__test_type_tag_dependency_fails_verification.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__test_type_tag_dependency_fails_verification.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__test_type_tag_transitive_dependency_fails_verification.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__test_type_tag_transitive_dependency_fails_verification.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__test_type_tag_transitive_dependency_fails_verification.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__test_type_tag_transitive_dependency_fails_verification.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_chain_id_version_4.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_chain_id_version_4.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_chain_id_version_4.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_chain_id_version_4.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_expiration_time_version_4.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_expiration_time_version_4.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_expiration_time_version_4.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_expiration_time_version_4.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_gas_currency_code_version_4.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_gas_currency_code_version_4.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_gas_currency_code_version_4.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_gas_currency_code_version_4.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_gas_currency_with_bad_identifier_version_4.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_gas_currency_with_bad_identifier_version_4.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_gas_currency_with_bad_identifier_version_4.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_gas_currency_with_bad_identifier_version_4.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_max_sequence_number_version_4.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_max_sequence_number_version_4.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_max_sequence_number_version_4.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_max_sequence_number_version_4.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_multi_agent.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_multi_agent.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_multi_agent.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_multi_agent.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_multi_agent_duplicate_secondary_signer.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_multi_agent_duplicate_secondary_signer.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_multi_agent_duplicate_secondary_signer.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_multi_agent_duplicate_secondary_signer.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_multi_agent_duplicate_sender.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_multi_agent_duplicate_sender.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_multi_agent_duplicate_sender.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_multi_agent_duplicate_sender.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_multi_agent_invalid_secondary_signature.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_multi_agent_invalid_secondary_signature.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_multi_agent_invalid_secondary_signature.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_multi_agent_invalid_secondary_signature.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_multi_agent_invalid_sender_signature.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_multi_agent_invalid_sender_signature.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_multi_agent_invalid_sender_signature.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_multi_agent_invalid_sender_signature.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_multi_agent_invalid_version.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_multi_agent_invalid_version.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_multi_agent_invalid_version.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_multi_agent_invalid_version.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_multi_agent_multiple_secondary_signers.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_multi_agent_multiple_secondary_signers.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_multi_agent_multiple_secondary_signers.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_multi_agent_multiple_secondary_signers.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_multi_agent_nonexistent_secondary_signer.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_multi_agent_nonexistent_secondary_signer.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_multi_agent_nonexistent_secondary_signer.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_multi_agent_nonexistent_secondary_signer.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_multi_agent_num_sigs_exceeds.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_multi_agent_num_sigs_exceeds.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_multi_agent_num_sigs_exceeds.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_multi_agent_num_sigs_exceeds.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_multi_agent_wrong_number_of_signer.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_multi_agent_wrong_number_of_signer.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_multi_agent_wrong_number_of_signer.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_multi_agent_wrong_number_of_signer.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_reserved_sender_version_4.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_reserved_sender_version_4.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_reserved_sender_version_4.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_reserved_sender_version_4.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_signature_version_4.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_signature_version_4.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_signature_version_4.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_signature_version_4.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_simple_payment_version_4.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_simple_payment_version_4.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_simple_payment_version_4.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__verify_txn__verify_simple_payment_version_4.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__write_set__bad_writesets_version_4.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__write_set__bad_writesets_version_4.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__write_set__bad_writesets_version_4.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__write_set__bad_writesets_version_4.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__write_set__invalid_write_set_signer_version_4.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__write_set__invalid_write_set_signer_version_4.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__write_set__invalid_write_set_signer_version_4.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__write_set__invalid_write_set_signer_version_4.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__write_set__transfer_and_execute_writeset_version_4.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__write_set__transfer_and_execute_writeset_version_4.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__write_set__transfer_and_execute_writeset_version_4.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__write_set__transfer_and_execute_writeset_version_4.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__write_set__verify_and_execute_writeset_version_4.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__write_set__verify_and_execute_writeset_version_4.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__write_set__verify_and_execute_writeset_version_4.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__write_set__verify_and_execute_writeset_version_4.exp diff --git a/diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__writeset_builder__build_upgrade_writeset.exp b/aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__writeset_builder__build_upgrade_writeset.exp similarity index 100% rename from diem-move/e2e-tests/goldens/language_e2e_testsuite__tests__writeset_builder__build_upgrade_writeset.exp rename to aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__writeset_builder__build_upgrade_writeset.exp diff --git a/diem-move/e2e-tests/src/account.rs b/aptos-move/e2e-tests/src/account.rs similarity index 98% rename from diem-move/e2e-tests/src/account.rs rename to aptos-move/e2e-tests/src/account.rs index 5083f69bc0f6a..e11f8f6fcf6ea 100644 --- a/diem-move/e2e-tests/src/account.rs +++ b/aptos-move/e2e-tests/src/account.rs @@ -5,9 +5,9 @@ use crate::gas_costs; use anyhow::{Error, Result}; -use diem_crypto::ed25519::*; -use diem_keygen::KeyGen; -use diem_types::{ +use aptos_crypto::ed25519::*; +use aptos_keygen::KeyGen; +use aptos_types::{ access_path::AccessPath, account_address::AccountAddress, account_config::{ @@ -84,7 +84,7 @@ impl Account { /// Like with [`Account::new`], the account returned by this constructor is a purely logical /// entity. pub fn with_keypair(privkey: Ed25519PrivateKey, pubkey: Ed25519PublicKey) -> Self { - let addr = diem_types::account_address::from_public_key(&pubkey); + let addr = aptos_types::account_address::from_public_key(&pubkey); Account { addr, privkey, @@ -122,10 +122,10 @@ impl Account { /// Creates a new account representing the diem root account in memory. /// - /// The address will be [`diem_root_address`][account_config::diem_root_address], and + /// The address will be [`aptos_root_address`][account_config::aptos_root_address], and /// the account will use [`GENESIS_KEYPAIR`][struct@GENESIS_KEYPAIR] as its keypair. - pub fn new_diem_root() -> Self { - Self::new_genesis_account(account_config::diem_root_address()) + pub fn new_aptos_root() -> Self { + Self::new_genesis_account(account_config::aptos_root_address()) } pub fn new_testing_dd() -> Self { diff --git a/diem-move/e2e-tests/src/account_universe.rs b/aptos-move/e2e-tests/src/account_universe.rs similarity index 99% rename from diem-move/e2e-tests/src/account_universe.rs rename to aptos-move/e2e-tests/src/account_universe.rs index 2ac668f75c665..2106ab54a5381 100644 --- a/diem-move/e2e-tests/src/account_universe.rs +++ b/aptos-move/e2e-tests/src/account_universe.rs @@ -27,8 +27,8 @@ use crate::{ executor::FakeExecutor, gas_costs, transaction_status_eq, }; -use diem_crypto::ed25519::{Ed25519PrivateKey, Ed25519PublicKey}; -use diem_types::{ +use aptos_crypto::ed25519::{Ed25519PrivateKey, Ed25519PublicKey}; +use aptos_types::{ transaction::{SignedTransaction, TransactionStatus}, vm_status::{known_locations, KeptVMStatus, StatusCode}, }; diff --git a/diem-move/e2e-tests/src/account_universe/bad_transaction.rs b/aptos-move/e2e-tests/src/account_universe/bad_transaction.rs similarity index 97% rename from diem-move/e2e-tests/src/account_universe/bad_transaction.rs rename to aptos-move/e2e-tests/src/account_universe/bad_transaction.rs index e09f7946ea366..6c4dd1a00ad60 100644 --- a/diem-move/e2e-tests/src/account_universe/bad_transaction.rs +++ b/aptos-move/e2e-tests/src/account_universe/bad_transaction.rs @@ -6,12 +6,12 @@ use crate::{ common_transactions::{empty_txn, EMPTY_SCRIPT}, gas_costs, }; -use diem_crypto::{ +use aptos_crypto::{ ed25519::{Ed25519PrivateKey, Ed25519PublicKey}, test_utils::KeyPair, }; -use diem_proptest_helpers::Index; -use diem_types::{ +use aptos_proptest_helpers::Index; +use aptos_types::{ account_config::XUS_NAME, transaction::{Script, SignedTransaction, TransactionStatus}, vm_status::StatusCode, @@ -135,7 +135,7 @@ impl AUTransactionGen for InsufficientBalanceGen { pub struct InvalidAuthkeyGen { sender: Index, #[proptest( - strategy = "diem_crypto::test_utils::uniform_keypair_strategy_with_perturbation(1)" + strategy = "aptos_crypto::test_utils::uniform_keypair_strategy_with_perturbation(1)" )] new_keypair: KeyPair, } diff --git a/diem-move/e2e-tests/src/account_universe/create_account.rs b/aptos-move/e2e-tests/src/account_universe/create_account.rs similarity index 98% rename from diem-move/e2e-tests/src/account_universe/create_account.rs rename to aptos-move/e2e-tests/src/account_universe/create_account.rs index b7b9764cb6e27..eb3535910d0c5 100644 --- a/diem-move/e2e-tests/src/account_universe/create_account.rs +++ b/aptos-move/e2e-tests/src/account_universe/create_account.rs @@ -9,8 +9,8 @@ use crate::{ common_transactions::create_account_txn, gas_costs, }; -use diem_proptest_helpers::Index; -use diem_types::{ +use aptos_proptest_helpers::Index; +use aptos_types::{ account_config, transaction::{SignedTransaction, TransactionStatus}, vm_status::{AbortLocation, KeptVMStatus, StatusCode}, diff --git a/diem-move/e2e-tests/src/account_universe/peer_to_peer.rs b/aptos-move/e2e-tests/src/account_universe/peer_to_peer.rs similarity index 99% rename from diem-move/e2e-tests/src/account_universe/peer_to_peer.rs rename to aptos-move/e2e-tests/src/account_universe/peer_to_peer.rs index 19b1706262743..d7059d748e54a 100644 --- a/diem-move/e2e-tests/src/account_universe/peer_to_peer.rs +++ b/aptos-move/e2e-tests/src/account_universe/peer_to_peer.rs @@ -5,7 +5,7 @@ use crate::{ account_universe::{AUTransactionGen, AccountPair, AccountPairGen, AccountUniverse}, common_transactions::peer_to_peer_txn, }; -use diem_types::{ +use aptos_types::{ transaction::{SignedTransaction, TransactionStatus}, vm_status::{known_locations, KeptVMStatus, StatusCode}, }; diff --git a/diem-move/e2e-tests/src/account_universe/rotate_key.rs b/aptos-move/e2e-tests/src/account_universe/rotate_key.rs similarity index 92% rename from diem-move/e2e-tests/src/account_universe/rotate_key.rs rename to aptos-move/e2e-tests/src/account_universe/rotate_key.rs index f604762d1a145..cceb6910204aa 100644 --- a/diem-move/e2e-tests/src/account_universe/rotate_key.rs +++ b/aptos-move/e2e-tests/src/account_universe/rotate_key.rs @@ -6,12 +6,12 @@ use crate::{ common_transactions::rotate_key_txn, gas_costs, }; -use diem_crypto::{ +use aptos_crypto::{ ed25519::{Ed25519PrivateKey, Ed25519PublicKey}, test_utils::KeyPair, }; -use diem_proptest_helpers::Index; -use diem_types::{ +use aptos_proptest_helpers::Index; +use aptos_types::{ transaction::{authenticator::AuthenticationKey, SignedTransaction, TransactionStatus}, vm_status::{KeptVMStatus, StatusCode}, }; @@ -24,7 +24,7 @@ use proptest_derive::Arbitrary; pub struct RotateKeyGen { sender: Index, #[proptest( - strategy = "diem_crypto::test_utils::uniform_keypair_strategy_with_perturbation(0)" + strategy = "aptos_crypto::test_utils::uniform_keypair_strategy_with_perturbation(0)" )] new_keypair: KeyPair, } diff --git a/diem-move/e2e-tests/src/account_universe/universe.rs b/aptos-move/e2e-tests/src/account_universe/universe.rs similarity index 99% rename from diem-move/e2e-tests/src/account_universe/universe.rs rename to aptos-move/e2e-tests/src/account_universe/universe.rs index 6dcd060f66a99..4a9430f3c5773 100644 --- a/diem-move/e2e-tests/src/account_universe/universe.rs +++ b/aptos-move/e2e-tests/src/account_universe/universe.rs @@ -8,7 +8,7 @@ use crate::{ account_universe::{default_num_accounts, default_num_transactions, AccountCurrent}, executor::FakeExecutor, }; -use diem_proptest_helpers::{pick_slice_idxs, Index}; +use aptos_proptest_helpers::{pick_slice_idxs, Index}; use proptest::{ collection::{vec, SizeRange}, prelude::*, diff --git a/diem-move/e2e-tests/src/common_transactions.rs b/aptos-move/e2e-tests/src/common_transactions.rs similarity index 99% rename from diem-move/e2e-tests/src/common_transactions.rs rename to aptos-move/e2e-tests/src/common_transactions.rs index 3d4745074b55b..87e04741b3d5d 100644 --- a/diem-move/e2e-tests/src/common_transactions.rs +++ b/aptos-move/e2e-tests/src/common_transactions.rs @@ -4,14 +4,14 @@ //! Support for encoding transactions for common situations. use crate::account::Account; -use diem_framework_releases::legacy::transaction_scripts::LegacyStdlibScript; -use diem_transaction_builder::stdlib::encode_peer_to_peer_by_signers_script_function; -use diem_types::{ +use aptos_transaction_builder::stdlib::encode_peer_to_peer_by_signers_script_function; +use aptos_types::{ account_config, transaction::{ RawTransaction, Script, SignedTransaction, TransactionArgument, TransactionPayload, }, }; +use diem_framework_releases::legacy::transaction_scripts::LegacyStdlibScript; use move_core_types::language_storage::TypeTag; use move_ir_compiler::Compiler; use once_cell::sync::Lazy; diff --git a/diem-move/e2e-tests/src/compile.rs b/aptos-move/e2e-tests/src/compile.rs similarity index 96% rename from diem-move/e2e-tests/src/compile.rs rename to aptos-move/e2e-tests/src/compile.rs index 183b04fc123ca..d4924c92e26b4 100644 --- a/diem-move/e2e-tests/src/compile.rs +++ b/aptos-move/e2e-tests/src/compile.rs @@ -5,7 +5,7 @@ use move_ir_compiler::Compiler; -use diem_types::transaction::{Module, Script}; +use aptos_types::transaction::{Module, Script}; use move_binary_format::CompiledModule; /// Compile the provided Move code into a blob which can be used as the code to be published diff --git a/diem-move/e2e-tests/src/currencies.rs b/aptos-move/e2e-tests/src/currencies.rs similarity index 98% rename from diem-move/e2e-tests/src/currencies.rs rename to aptos-move/e2e-tests/src/currencies.rs index 40a4fcdd42b03..288468910ae36 100644 --- a/diem-move/e2e-tests/src/currencies.rs +++ b/aptos-move/e2e-tests/src/currencies.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 use crate::{account::Account, compile, executor::FakeExecutor}; -use diem_types::transaction::WriteSetPayload; +use aptos_types::transaction::WriteSetPayload; pub fn add_currency_to_system( executor: &mut FakeExecutor, diff --git a/diem-move/e2e-tests/src/data_store.rs b/aptos-move/e2e-tests/src/data_store.rs similarity index 97% rename from diem-move/e2e-tests/src/data_store.rs rename to aptos-move/e2e-tests/src/data_store.rs index a67f64068c676..4ec10759b79d7 100644 --- a/diem-move/e2e-tests/src/data_store.rs +++ b/aptos-move/e2e-tests/src/data_store.rs @@ -5,14 +5,14 @@ use crate::account::AccountData; use anyhow::Result; -use diem_state_view::StateView; -use diem_types::{ +use aptos_state_view::StateView; +use aptos_types::{ access_path::AccessPath, on_chain_config::ConfigStorage, transaction::ChangeSet, write_set::{WriteOp, WriteSet}, }; -use diem_vm::data_cache::RemoteStorage; +use aptos_vm::data_cache::RemoteStorage; use move_binary_format::errors::*; use move_core_types::{ account_address::AccountAddress, diff --git a/diem-move/e2e-tests/src/execution_strategies/basic_strategy.rs b/aptos-move/e2e-tests/src/execution_strategies/basic_strategy.rs similarity index 94% rename from diem-move/e2e-tests/src/execution_strategies/basic_strategy.rs rename to aptos-move/e2e-tests/src/execution_strategies/basic_strategy.rs index f36f558aa1d19..8131f573dddf5 100644 --- a/diem-move/e2e-tests/src/execution_strategies/basic_strategy.rs +++ b/aptos-move/e2e-tests/src/execution_strategies/basic_strategy.rs @@ -7,7 +7,7 @@ use crate::{ execution_strategies::types::{Block, Executor, ExecutorResult, PartitionStrategy}, executor::FakeExecutor, }; -use diem_types::{transaction::SignedTransaction, vm_status::VMStatus}; +use aptos_types::{transaction::SignedTransaction, vm_status::VMStatus}; #[derive(Debug, Clone)] pub struct BasicStrategy; diff --git a/diem-move/e2e-tests/src/execution_strategies/guided_strategy.rs b/aptos-move/e2e-tests/src/execution_strategies/guided_strategy.rs similarity index 97% rename from diem-move/e2e-tests/src/execution_strategies/guided_strategy.rs rename to aptos-move/e2e-tests/src/execution_strategies/guided_strategy.rs index e17c9ef902ad3..7ad3ed1b60524 100644 --- a/diem-move/e2e-tests/src/execution_strategies/guided_strategy.rs +++ b/aptos-move/e2e-tests/src/execution_strategies/guided_strategy.rs @@ -6,7 +6,7 @@ use crate::{ execution_strategies::types::{Block, Executor, ExecutorResult, PartitionStrategy}, executor::FakeExecutor, }; -use diem_types::{transaction::SignedTransaction, vm_status::VMStatus}; +use aptos_types::{transaction::SignedTransaction, vm_status::VMStatus}; #[derive(Debug, Clone, PartialEq)] pub enum AnnotatedTransaction { diff --git a/diem-move/e2e-tests/src/execution_strategies/mod.rs b/aptos-move/e2e-tests/src/execution_strategies/mod.rs similarity index 100% rename from diem-move/e2e-tests/src/execution_strategies/mod.rs rename to aptos-move/e2e-tests/src/execution_strategies/mod.rs diff --git a/diem-move/e2e-tests/src/execution_strategies/multi_strategy.rs b/aptos-move/e2e-tests/src/execution_strategies/multi_strategy.rs similarity index 98% rename from diem-move/e2e-tests/src/execution_strategies/multi_strategy.rs rename to aptos-move/e2e-tests/src/execution_strategies/multi_strategy.rs index a424e36e5c1d6..281c0c88322b2 100644 --- a/diem-move/e2e-tests/src/execution_strategies/multi_strategy.rs +++ b/aptos-move/e2e-tests/src/execution_strategies/multi_strategy.rs @@ -3,7 +3,7 @@ #![forbid(unsafe_code)] use crate::execution_strategies::types::{Block, Executor, ExecutorResult}; -use diem_types::transaction::TransactionOutput; +use aptos_types::transaction::TransactionOutput; use std::{collections::BTreeMap, error::Error, fmt}; #[derive(Debug)] diff --git a/diem-move/e2e-tests/src/execution_strategies/random_strategy.rs b/aptos-move/e2e-tests/src/execution_strategies/random_strategy.rs similarity index 96% rename from diem-move/e2e-tests/src/execution_strategies/random_strategy.rs rename to aptos-move/e2e-tests/src/execution_strategies/random_strategy.rs index 906653a855b1c..58981208acbe2 100644 --- a/diem-move/e2e-tests/src/execution_strategies/random_strategy.rs +++ b/aptos-move/e2e-tests/src/execution_strategies/random_strategy.rs @@ -6,7 +6,7 @@ use crate::{ execution_strategies::types::{Block, Executor, ExecutorResult, PartitionStrategy}, executor::FakeExecutor, }; -use diem_types::{transaction::SignedTransaction, vm_status::VMStatus}; +use aptos_types::{transaction::SignedTransaction, vm_status::VMStatus}; use rand::{ rngs::{OsRng, StdRng}, Rng, SeedableRng, diff --git a/diem-move/e2e-tests/src/execution_strategies/types.rs b/aptos-move/e2e-tests/src/execution_strategies/types.rs similarity index 87% rename from diem-move/e2e-tests/src/execution_strategies/types.rs rename to aptos-move/e2e-tests/src/execution_strategies/types.rs index 2174388599975..3a18371837333 100644 --- a/diem-move/e2e-tests/src/execution_strategies/types.rs +++ b/aptos-move/e2e-tests/src/execution_strategies/types.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 #![forbid(unsafe_code)] -use diem_types::transaction::{SignedTransaction, TransactionOutput}; +use aptos_types::transaction::{SignedTransaction, TransactionOutput}; pub type Block = Vec; pub type ExecutorResult = Result, T>; diff --git a/diem-move/e2e-tests/src/executor.rs b/aptos-move/e2e-tests/src/executor.rs similarity index 97% rename from diem-move/e2e-tests/src/executor.rs rename to aptos-move/e2e-tests/src/executor.rs index 08bb3bd887d22..cddaedb76c148 100644 --- a/diem-move/e2e-tests/src/executor.rs +++ b/aptos-move/e2e-tests/src/executor.rs @@ -19,13 +19,10 @@ use crate::{ }, golden_outputs::GoldenOutputs, }; -use diem_crypto::HashValue; -use diem_framework_releases::{ - current_module_blobs, current_modules, legacy::transaction_scripts::LegacyStdlibScript, -}; -use diem_keygen::KeyGen; -use diem_state_view::StateView; -use diem_types::{ +use aptos_crypto::HashValue; +use aptos_keygen::KeyGen; +use aptos_state_view::StateView; +use aptos_types::{ access_path::AccessPath, account_config::{ type_tag_for_currency_code, BalanceResource, DiemAccountResource, CORE_CODE_ADDRESS, @@ -41,13 +38,16 @@ use diem_types::{ vm_status::{KeptVMStatus, VMStatus}, write_set::WriteSet, }; -use diem_vm::{ +use aptos_vm::{ convert_changeset_and_events, data_cache::RemoteStorage, parallel_executor::ParallelDiemVM, read_write_set_analysis::add_on_functions_list, DiemVM, VMExecutor, VMValidator, }; -use diem_writeset_generator::{ +use aptos_writeset_generator::{ encode_disable_parallel_execution, encode_enable_parallel_execution_with_config, }; +use diem_framework_releases::{ + current_module_blobs, current_modules, legacy::transaction_scripts::LegacyStdlibScript, +}; use move_core_types::{ account_address::AccountAddress, identifier::Identifier, @@ -503,13 +503,13 @@ impl FakeExecutor { } pub fn enable_parallel_execution(&mut self) { - let diem_root = Account::new_diem_root(); + let aptos_root = Account::new_aptos_root(); let seq_num = self - .read_account_resource_at_address(diem_root.address()) + .read_account_resource_at_address(aptos_root.address()) .unwrap() .sequence_number(); - let txn = diem_root + let txn = aptos_root .transaction() .write_set(encode_enable_parallel_execution_with_config()) .sequence_number(seq_num) @@ -520,12 +520,12 @@ impl FakeExecutor { pub fn disable_parallel_execution(&mut self) { if ParallelExecutionConfig::fetch_config(&self.data_store).is_some() { - let diem_root = Account::new_diem_root(); - let txn = diem_root + let aptos_root = Account::new_aptos_root(); + let txn = aptos_root .transaction() .write_set(encode_disable_parallel_execution()) .sequence_number( - self.read_account_resource_at_address(diem_root.address()) + self.read_account_resource_at_address(aptos_root.address()) .unwrap() .sequence_number(), ) @@ -559,7 +559,7 @@ impl FakeExecutor { ) { let write_set = { let mut gas_status = GasStatus::new_unmetered(); - let vm = MoveVM::new(diem_vm::natives::diem_natives()).unwrap(); + let vm = MoveVM::new(aptos_vm::natives::aptos_natives()).unwrap(); let remote_view = RemoteStorage::new(&self.data_store); let mut session = vm.new_session(&remote_view); session @@ -594,7 +594,7 @@ impl FakeExecutor { args: Vec>, ) -> Result { let mut gas_status = GasStatus::new_unmetered(); - let vm = MoveVM::new(diem_vm::natives::diem_natives()).unwrap(); + let vm = MoveVM::new(aptos_vm::natives::aptos_natives()).unwrap(); let remote_view = RemoteStorage::new(&self.data_store); let mut session = vm.new_session(&remote_view); session diff --git a/diem-move/e2e-tests/src/gas_costs.rs b/aptos-move/e2e-tests/src/gas_costs.rs similarity index 99% rename from diem-move/e2e-tests/src/gas_costs.rs rename to aptos-move/e2e-tests/src/gas_costs.rs index 840023affd4c5..070aa4b616d52 100644 --- a/diem-move/e2e-tests/src/gas_costs.rs +++ b/aptos-move/e2e-tests/src/gas_costs.rs @@ -8,8 +8,8 @@ use crate::{ common_transactions::{create_account_txn, peer_to_peer_txn, rotate_key_txn}, executor::FakeExecutor, }; -use diem_crypto::{ed25519::Ed25519PrivateKey, PrivateKey, Uniform}; -use diem_types::{ +use aptos_crypto::{ed25519::Ed25519PrivateKey, PrivateKey, Uniform}; +use aptos_types::{ account_config, transaction::{authenticator::AuthenticationKey, SignedTransaction}, }; diff --git a/diem-move/e2e-tests/src/golden_outputs.rs b/aptos-move/e2e-tests/src/golden_outputs.rs similarity index 100% rename from diem-move/e2e-tests/src/golden_outputs.rs rename to aptos-move/e2e-tests/src/golden_outputs.rs diff --git a/diem-move/e2e-tests/src/lib.rs b/aptos-move/e2e-tests/src/lib.rs similarity index 96% rename from diem-move/e2e-tests/src/lib.rs rename to aptos-move/e2e-tests/src/lib.rs index eaa1934954b85..fd6be66483b48 100644 --- a/diem-move/e2e-tests/src/lib.rs +++ b/aptos-move/e2e-tests/src/lib.rs @@ -7,7 +7,7 @@ //! //! This crate contains helpers for executing tests against the Diem VM. -use diem_types::{transaction::TransactionStatus, vm_status::KeptVMStatus}; +use aptos_types::{transaction::TransactionStatus, vm_status::KeptVMStatus}; pub mod account; pub mod account_universe; diff --git a/diem-move/e2e-tests/src/on_chain_configs.rs b/aptos-move/e2e-tests/src/on_chain_configs.rs similarity index 87% rename from diem-move/e2e-tests/src/on_chain_configs.rs rename to aptos-move/e2e-tests/src/on_chain_configs.rs index 354480a0c06a8..cb3fa75bc89a8 100644 --- a/diem-move/e2e-tests/src/on_chain_configs.rs +++ b/aptos-move/e2e-tests/src/on_chain_configs.rs @@ -2,15 +2,15 @@ // SPDX-License-Identifier: Apache-2.0 use crate::{account::Account, executor::FakeExecutor}; -use diem_framework_releases::legacy::transaction_scripts::LegacyStdlibScript; -use diem_types::{ +use aptos_types::{ on_chain_config::DiemVersion, transaction::{Script, TransactionArgument}, }; -use diem_vm::DiemVM; +use aptos_vm::DiemVM; +use diem_framework_releases::legacy::transaction_scripts::LegacyStdlibScript; pub fn set_diem_version(executor: &mut FakeExecutor, version: DiemVersion) { - let account = Account::new_genesis_account(diem_types::on_chain_config::config_address()); + let account = Account::new_genesis_account(aptos_types::on_chain_config::config_address()); let txn = account .transaction() .script(Script::new( diff --git a/diem-move/e2e-tests/src/proptest_types.rs b/aptos-move/e2e-tests/src/proptest_types.rs similarity index 100% rename from diem-move/e2e-tests/src/proptest_types.rs rename to aptos-move/e2e-tests/src/proptest_types.rs diff --git a/diem-move/e2e-tests/src/utils.rs b/aptos-move/e2e-tests/src/utils.rs similarity index 92% rename from diem-move/e2e-tests/src/utils.rs rename to aptos-move/e2e-tests/src/utils.rs index 1dac08359f44e..ca29211f120a9 100644 --- a/diem-move/e2e-tests/src/utils.rs +++ b/aptos-move/e2e-tests/src/utils.rs @@ -2,12 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 #![forbid(unsafe_code)] -use crate::{ - account::Account, - compile, - executor::FakeExecutor, -}; -use diem_transaction_builder::stdlib as transaction_builder; +use crate::{account::Account, compile, executor::FakeExecutor}; +use aptos_transaction_builder::stdlib as transaction_builder; use move_binary_format::file_format::CompiledModule; use transaction_builder::*; @@ -41,7 +37,7 @@ pub fn close_module_publishing( pub fn start_with_released_df() -> (FakeExecutor, Account, Account, Account) { let executor = FakeExecutor::from_fresh_genesis(); let mut dd_account = Account::new_testing_dd(); - let mut dr_account = Account::new_diem_root(); + let mut dr_account = Account::new_aptos_root(); let mut tc_account = Account::new_blessed_tc(); let (private_key, public_key) = vm_genesis::GENESIS_KEYPAIR.clone(); diff --git a/diem-move/e2e-tests/src/versioning.rs b/aptos-move/e2e-tests/src/versioning.rs similarity index 97% rename from diem-move/e2e-tests/src/versioning.rs rename to aptos-move/e2e-tests/src/versioning.rs index 2bb19e9be2de7..ca6a02f6d93a9 100644 --- a/diem-move/e2e-tests/src/versioning.rs +++ b/aptos-move/e2e-tests/src/versioning.rs @@ -3,7 +3,7 @@ #![forbid(unsafe_code)] use crate::{account::Account, executor::FakeExecutor, utils}; -use diem_types::on_chain_config::DIEM_MAX_KNOWN_VERSION; +use aptos_types::on_chain_config::DIEM_MAX_KNOWN_VERSION; /// The current version numbers that e2e tests should be run against. pub const CURRENT_RELEASE_VERSIONS: std::ops::RangeInclusive = diff --git a/diem-move/e2e-testsuite/Cargo.toml b/aptos-move/e2e-testsuite/Cargo.toml similarity index 66% rename from diem-move/e2e-testsuite/Cargo.toml rename to aptos-move/e2e-testsuite/Cargo.toml index eab63015e37a3..ec0b6a8d9588e 100644 --- a/diem-move/e2e-testsuite/Cargo.toml +++ b/aptos-move/e2e-testsuite/Cargo.toml @@ -26,19 +26,19 @@ read-write-set = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223 ## Diem-Move dependencies language-e2e-tests = { path = "../e2e-tests" } -diem-keygen = { path = "../diem-keygen" } -diem-vm = { path = "../diem-vm" } +aptos-keygen = { path = "../aptos-keygen" } +aptos-vm = { path = "../aptos-vm" } diem-framework-releases = { path = "../diem-framework/DPN/releases" } -diem-parallel-executor = { path = "../parallel-executor" } -diem-writeset-generator = { path = "../writeset-transaction-generator"} +aptos-parallel-executor = { path = "../parallel-executor" } +aptos-writeset-generator = { path = "../writeset-transaction-generator"} ## Other Diem dependencies -diem-crypto = { path = "../../crates/diem-crypto", features = ["fuzzing"] } -diem-types = { path = "../../types", features = ["fuzzing"] } -diem-transaction-builder = { path = "../../sdk/transaction-builder"} -diem-logger = { path = "../../crates/diem-logger" } -diem-state-view = { path = "../../storage/state-view" } -diem-workspace-hack = { version = "0.1", path = "../../crates/diem-workspace-hack" } +aptos-crypto = { path = "../../crates/aptos-crypto", features = ["fuzzing"] } +aptos-types = { path = "../../types", features = ["fuzzing"] } +aptos-transaction-builder = { path = "../../sdk/transaction-builder"} +aptos-logger = { path = "../../crates/aptos-logger" } +aptos-state-view = { path = "../../storage/state-view" } +aptos-workspace-hack = { version = "0.1", path = "../../crates/aptos-workspace-hack" } [features] -default = ["diem-transaction-builder/fuzzing"] +default = ["aptos-transaction-builder/fuzzing"] diff --git a/aptos-move/e2e-testsuite/proptest-regressions/tests/account_universe/bad_transaction.txt b/aptos-move/e2e-testsuite/proptest-regressions/tests/account_universe/bad_transaction.txt new file mode 100644 index 0000000000000..5f337ec34cad3 --- /dev/null +++ b/aptos-move/e2e-testsuite/proptest-regressions/tests/account_universe/bad_transaction.txt @@ -0,0 +1,9 @@ +# Seeds for failure cases proptest has generated in the past. It is +# automatically read and these particular cases re-run before any +# novel cases are generated. +# +# It is recommended to check this file in to source control so that +# everyone who runs the test benefits from these saved cases. +cc 99a4ec0427e18cd42ca99adebe3e973b5282afc8c851d8cac25c7891f7d6c1f9 # shrinks to universe = AccountUniverseGen { accounts: [AccountData { account: Account { addr: 62044E49817E7EDC2AAAB1500BDA710F, privkey: , pubkey: Ed25519PublicKey(9ba10872560649cc7468f1a2017170f645e9adf54820dca49a1bcfd3ae9d98ff) }, withdrawal_capability: Some(WithdrawCapability { account_address: 62044E49817E7EDC2AAAB1500BDA710F }), key_rotation_capability: Some(KeyRotationCapability { account_address: 62044E49817E7EDC2AAAB1500BDA710F }), sequence_number: 0, sent_events: EventHandle { count: 0, key: EventKey(000000000000000062044e49817e7edc2aaab1500bda710f) }, received_events: EventHandle { count: 0, key: EventKey(010000000000000062044e49817e7edc2aaab1500bda710f) }, balances: {Identifier("XUS"): Balance { coin: 20000000 }}, account_role: AccountRole { self_address: 62044E49817E7EDC2AAAB1500BDA710F, account_specifier: ParentVASP } }, AccountData { account: Account { addr: 597117451EADF2D17FEA4AB49D38625A, privkey: , pubkey: Ed25519PublicKey(ada1d470d164e00c9eb172571165d9949e03bb6f63c418ce85f29600ed11ed1d) }, withdrawal_capability: Some(WithdrawCapability { account_address: 597117451EADF2D17FEA4AB49D38625A }), key_rotation_capability: Some(KeyRotationCapability { account_address: 597117451EADF2D17FEA4AB49D38625A }), sequence_number: 1674793780, sent_events: EventHandle { count: 0, key: EventKey(e8254da800000000597117451eadf2d17fea4ab49d38625a) }, received_events: EventHandle { count: 0, key: EventKey(a4e390ad00000000597117451eadf2d17fea4ab49d38625a) }, balances: {Identifier("XUS"): Balance { coin: 112384094 }}, account_role: AccountRole { self_address: 597117451EADF2D17FEA4AB49D38625A, account_specifier: ParentVASP } }], pick_style: Unlimited }, txns = [SequenceNumberMismatchGen { sender: Index(Index(17863442350540007391)), seq: 9321 }, SequenceNumberMismatchGen { sender: Index(Index(3111701791907186619)), seq: 8062 }] +cc 50c30c57c8389a4e9383841423068c2c6f55ef573dabfc88b6d280ff7c09b882 # shrinks to universe = AccountUniverseGen { accounts: [AccountData { account: Account { addr: 79E6D982329AF620D1F96BD995D4C9CB, privkey: , pubkey: Ed25519PublicKey(9ff479171722eba2212f7365b654571518b738564a276a1f2d0fd659ad2af7a2) }, withdrawal_capability: Some(WithdrawCapability { account_address: 79E6D982329AF620D1F96BD995D4C9CB }), key_rotation_capability: Some(KeyRotationCapability { account_address: 79E6D982329AF620D1F96BD995D4C9CB }), sequence_number: 0, sent_events: EventHandle { count: 0, key: EventKey(000000000000000079e6d982329af620d1f96bd995d4c9cb) }, received_events: EventHandle { count: 0, key: EventKey(110000000000000079e6d982329af620d1f96bd995d4c9cb) }, balances: {Identifier("XUS"): Balance { coin: 20000000 }}, account_role: AccountRole { self_address: 79E6D982329AF620D1F96BD995D4C9CB, account_specifier: ParentVASP } }, AccountData { account: Account { addr: ECD88F48694296859646CB84148C08F9, privkey: , pubkey: Ed25519PublicKey(054d86c249196dcf55b625ff9fa6878b1023daea54f73c355bf7974c94bbdf7c) }, withdrawal_capability: Some(WithdrawCapability { account_address: ECD88F48694296859646CB84148C08F9 }), key_rotation_capability: Some(KeyRotationCapability { account_address: ECD88F48694296859646CB84148C08F9 }), sequence_number: 4052990651, sent_events: EventHandle { count: 0, key: EventKey(2ba4382300000000ecd88f48694296859646cb84148c08f9) }, received_events: EventHandle { count: 0, key: EventKey(1dac078600000000ecd88f48694296859646cb84148c08f9) }, balances: {Identifier("XUS"): Balance { coin: 57409332 }}, account_role: AccountRole { self_address: ECD88F48694296859646CB84148C08F9, account_specifier: ParentVASP } }], pick_style: Unlimited }, txns = [InsufficientBalanceGen { sender: Index(Index(9755040189082335046)), gas_unit_price: 4769 }, InsufficientBalanceGen { sender: Index(Index(13261961634302724086)), gas_unit_price: 2033 }, InsufficientBalanceGen { sender: Index(Index(9196751089495734521)), gas_unit_price: 6258 }, InsufficientBalanceGen { sender: Index(Index(2850184824417252010)), gas_unit_price: 6706 }, InsufficientBalanceGen { sender: Index(Index(11288603876873910340)), gas_unit_price: 5386 }, InsufficientBalanceGen { sender: Index(Index(7486720264033571028)), gas_unit_price: 5195 }, InsufficientBalanceGen { sender: Index(Index(18135332291406936522)), gas_unit_price: 2980 }, InsufficientBalanceGen { sender: Index(Index(387071532410248291)), gas_unit_price: 2863 }, InsufficientBalanceGen { sender: Index(Index(17798924730800220908)), gas_unit_price: 9494 }, InsufficientBalanceGen { sender: Index(Index(15955349337396335372)), gas_unit_price: 6489 }, InsufficientBalanceGen { sender: Index(Index(3951536269230419980)), gas_unit_price: 7607 }, InsufficientBalanceGen { sender: Index(Index(12674223642910221060)), gas_unit_price: 6867 }, InsufficientBalanceGen { sender: Index(Index(18430894262955774304)), gas_unit_price: 4655 }, InsufficientBalanceGen { sender: Index(Index(4984541119823725287)), gas_unit_price: 2908 }, InsufficientBalanceGen { sender: Index(Index(10269002469959061830)), gas_unit_price: 3218 }] +cc 0cfe11ae65bf161f62d152d665415180c67469ec9e70abbcaf97758a85087fc7 # shrinks to universe = AccountUniverseGen { accounts: [AccountData { account: Account { addr: 0330EC908CE59E0EAC3AC473E4468277, privkey: , pubkey: Ed25519PublicKey(0e59f02fe853d0e67a17b450652639b71042007d85885b294b3c29c666678484) }, withdrawal_capability: Some(WithdrawCapability { account_address: 0330EC908CE59E0EAC3AC473E4468277 }), key_rotation_capability: Some(KeyRotationCapability { account_address: 0330EC908CE59E0EAC3AC473E4468277 }), sequence_number: 0, sent_events: EventHandle { count: 0, key: EventKey(00000000000000000330ec908ce59e0eac3ac473e4468277) }, received_events: EventHandle { count: 0, key: EventKey(53000000000000000330ec908ce59e0eac3ac473e4468277) }, balances: {Identifier("XUS"): Balance { coin: 20000000 }}, account_role: AccountRole { self_address: 0330EC908CE59E0EAC3AC473E4468277, account_specifier: ParentVASP } }, AccountData { account: Account { addr: B2F22526827A0875A605E7A838EA013C, privkey: , pubkey: Ed25519PublicKey(0a695995714693b027ce6cc3097bd6a468a2d52caa4f37ce9c2369c62505c536) }, withdrawal_capability: Some(WithdrawCapability { account_address: B2F22526827A0875A605E7A838EA013C }), key_rotation_capability: Some(KeyRotationCapability { account_address: B2F22526827A0875A605E7A838EA013C }), sequence_number: 3480816025, sent_events: EventHandle { count: 0, key: EventKey(fc46fc3200000000b2f22526827a0875a605e7a838ea013c) }, received_events: EventHandle { count: 0, key: EventKey(5518c2a200000000b2f22526827a0875a605e7a838ea013c) }, balances: {Identifier("XUS"): Balance { coin: 41304775 }}, account_role: AccountRole { self_address: B2F22526827A0875A605E7A838EA013C, account_specifier: ParentVASP } }], pick_style: Unlimited }, txns = [InvalidAuthkeyGen { sender: Index(Index(1107910762444614722)), new_keypair: 20ddead9651c04039d458f5550a3b8e5f64400aec8e35b17d6c5cc882546d7fca320f45c43416866567c2326fe01ee13a1866b5fe5cfd539e4507021e02031e5005d }] diff --git a/aptos-move/e2e-testsuite/proptest-regressions/tests/account_universe/mod.txt b/aptos-move/e2e-testsuite/proptest-regressions/tests/account_universe/mod.txt new file mode 100644 index 0000000000000..2ded61f130af7 --- /dev/null +++ b/aptos-move/e2e-testsuite/proptest-regressions/tests/account_universe/mod.txt @@ -0,0 +1,9 @@ +# Seeds for failure cases proptest has generated in the past. It is +# automatically read and these particular cases re-run before any +# novel cases are generated. +# +# It is recommended to check this file in to source control so that +# everyone who runs the test benefits from these saved cases. +cc b955f8093c0cb31a25e84600810fd6b95909d9c1b461f8237433933c4bd80a4a # shrinks to universe = AccountUniverseGen { accounts: [AccountData { account: Account { addr: 73D3EC6234ECEBBECE96831ECE5BB9AD, privkey: , pubkey: Ed25519PublicKey(9c6a95f2589daccca56df3385161be6ddd5d3c739b8539780dbab791bff9b43e) }, withdrawal_capability: Some(WithdrawCapability { account_address: 73D3EC6234ECEBBECE96831ECE5BB9AD }), key_rotation_capability: Some(KeyRotationCapability { account_address: 73D3EC6234ECEBBECE96831ECE5BB9AD }), sequence_number: 0, sent_events: EventHandle { count: 0, key: EventKey(000000000000000073d3ec6234ecebbece96831ece5bb9ad) }, received_events: EventHandle { count: 0, key: EventKey(000000000000000073d3ec6234ecebbece96831ece5bb9ad) }, balances: {Identifier("XUS"): Balance { coin: 0 }}, account_role: AccountRole { self_address: 73D3EC6234ECEBBECE96831ECE5BB9AD, account_specifier: ParentVASP } }, AccountData { account: Account { addr: 19C235207FC815A1877385D82349B6B7, privkey: , pubkey: Ed25519PublicKey(aaa6993cc288ab6d6540736532e7c4dba5617bc913ab0ba46df6120aa1ae3a6d) }, withdrawal_capability: Some(WithdrawCapability { account_address: 19C235207FC815A1877385D82349B6B7 }), key_rotation_capability: Some(KeyRotationCapability { account_address: 19C235207FC815A1877385D82349B6B7 }), sequence_number: 1691960826, sent_events: EventHandle { count: 0, key: EventKey(bb81f9bf0000000019c235207fc815a1877385d82349b6b7) }, received_events: EventHandle { count: 0, key: EventKey(6602d0920000000019c235207fc815a1877385d82349b6b7) }, balances: {Identifier("XUS"): Balance { coin: 54 }}, account_role: AccountRole { self_address: 19C235207FC815A1877385D82349B6B7, account_specifier: ParentVASP } }], pick_style: Unlimited }, pairs = [AccountPairGen { pair: [Index(Index(5326306273627537797)), Index(Index(2757425836770296303))], reverse: false }, AccountPairGen { pair: [Index(Index(6302594369024258412)), Index(Index(735883090360561238))], reverse: true }, AccountPairGen { pair: [Index(Index(5518229272290449395)), Index(Index(14223967329983846176))], reverse: true }, AccountPairGen { pair: [Index(Index(12586102862723530680)), Index(Index(4848329409060000509))], reverse: true }, AccountPairGen { pair: [Index(Index(14165560399299716014)), Index(Index(15066007567787064241))], reverse: false }, AccountPairGen { pair: [Index(Index(2049921113635881708)), Index(Index(5143541746564324020))], reverse: false }, AccountPairGen { pair: [Index(Index(17969144060984843947)), Index(Index(13342507324667729863))], reverse: false }, AccountPairGen { pair: [Index(Index(4784372654187372323)), Index(Index(5017232154808613232))], reverse: false }, AccountPairGen { pair: [Index(Index(11006746237969314144)), Index(Index(8936366324985757924))], reverse: false }, AccountPairGen { pair: [Index(Index(12109913315700331096)), Index(Index(6632365235064101919))], reverse: false }, AccountPairGen { pair: [Index(Index(10207740472482406975)), Index(Index(11570244548298570197))], reverse: false }, AccountPairGen { pair: [Index(Index(14537587086052206059)), Index(Index(9520240004836415087))], reverse: false }, AccountPairGen { pair: [Index(Index(2341888233917259330)), Index(Index(7760558615461799836))], reverse: true }, AccountPairGen { pair: [Index(Index(13955038486426497285)), Index(Index(2278683524707936074))], reverse: true }, AccountPairGen { pair: [Index(Index(147037733828656272)), Index(Index(16158988401629944847))], reverse: true }, AccountPairGen { pair: [Index(Index(3527692584876936714)), Index(Index(11893911504234069801))], reverse: false }, AccountPairGen { pair: [Index(Index(17243569463857552909)), Index(Index(17337201726293822711))], reverse: false }, AccountPairGen { pair: [Index(Index(8634469927362470029)), Index(Index(14449217512083695753))], reverse: true }, AccountPairGen { pair: [Index(Index(4607400243350502295)), Index(Index(877474021259501155))], reverse: true }, AccountPairGen { pair: [Index(Index(11015402082774067478)), Index(Index(3297852144567368915))], reverse: false }, AccountPairGen { pair: [Index(Index(10423259720490337527)), Index(Index(5545164650336454663))], reverse: false }, AccountPairGen { pair: [Index(Index(2005406202644876689)), Index(Index(7037332457945089930))], reverse: false }, AccountPairGen { pair: [Index(Index(8014970174019743613)), Index(Index(11788691700287788931))], reverse: true }, AccountPairGen { pair: [Index(Index(17277313057487950345)), Index(Index(5793102177955282121))], reverse: true }, AccountPairGen { pair: [Index(Index(8300851179242454944)), Index(Index(1621317025023540679))], reverse: true }, AccountPairGen { pair: [Index(Index(2375716455351411821)), Index(Index(1345734524200711996))], reverse: true }, AccountPairGen { pair: [Index(Index(1560255707257762949)), Index(Index(14294355905006830782))], reverse: true }, AccountPairGen { pair: [Index(Index(9155396573815608717)), Index(Index(17732991212344331258))], reverse: true }, AccountPairGen { pair: [Index(Index(1542698261812848455)), Index(Index(4921389280868363380))], reverse: false }, AccountPairGen { pair: [Index(Index(827183104566216973)), Index(Index(8428313711492759590))], reverse: false }, AccountPairGen { pair: [Index(Index(8892109309554405064)), Index(Index(10222083062470193569))], reverse: true }, AccountPairGen { pair: [Index(Index(11558142035383138318)), Index(Index(8907117641664086388))], reverse: false }, AccountPairGen { pair: [Index(Index(556226791089647910)), Index(Index(9643156165317851874))], reverse: false }, AccountPairGen { pair: [Index(Index(566600609856738529)), Index(Index(17139677306868527635))], reverse: false }] +cc 98d776e864df056c402384b94b0da20affcb9dc679f2cad64c658160792b7933 # shrinks to universe = AccountUniverseGen { accounts: [AccountData { account: Account { addr: FA0C9650A256017CF53E6EAA46D54AF3, privkey: , pubkey: Ed25519PublicKey(5564762e3e8f2ac10284b1cba4543d21c54bb41d5c152b2da7c24894f7eecbaa) }, withdrawal_capability: Some(WithdrawCapability { account_address: FA0C9650A256017CF53E6EAA46D54AF3 }), key_rotation_capability: Some(KeyRotationCapability { account_address: FA0C9650A256017CF53E6EAA46D54AF3 }), sequence_number: 0, sent_events: EventHandle { count: 0, key: EventKey(0000000000000000fa0c9650a256017cf53e6eaa46d54af3) }, received_events: EventHandle { count: 0, key: EventKey(0000000000000000fa0c9650a256017cf53e6eaa46d54af3) }, balances: {Identifier("XUS"): Balance { coin: 0 }}, account_role: AccountRole { self_address: FA0C9650A256017CF53E6EAA46D54AF3, account_specifier: ParentVASP } }, AccountData { account: Account { addr: E1A33516C8BC4D1A5E15ADFA1FF39EB7, privkey: , pubkey: Ed25519PublicKey(9d968aa9179b9434986f1020de8a0351496536c697aee71120fdf92945a38152) }, withdrawal_capability: Some(WithdrawCapability { account_address: E1A33516C8BC4D1A5E15ADFA1FF39EB7 }), key_rotation_capability: Some(KeyRotationCapability { account_address: E1A33516C8BC4D1A5E15ADFA1FF39EB7 }), sequence_number: 2925825439, sent_events: EventHandle { count: 0, key: EventKey(07cbced800000000e1a33516c8bc4d1a5e15adfa1ff39eb7) }, received_events: EventHandle { count: 0, key: EventKey(93e5bc9a00000000e1a33516c8bc4d1a5e15adfa1ff39eb7) }, balances: {Identifier("XUS"): Balance { coin: 2097166 }}, account_role: AccountRole { self_address: E1A33516C8BC4D1A5E15ADFA1FF39EB7, account_specifier: ParentVASP } }], pick_style: Unlimited }, transactions = [P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(11320325785889692014)), Index(Index(18260481743869095704))], reverse: false }, amount: 997400 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(18114762399272415339)), Index(Index(13647297404793923612))], reverse: true }, amount: 56663 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(2365754595210608594)), Index(Index(4837802052606135934))], reverse: false }, amount: 288683 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(4689075120758019572)), Index(Index(15671212616697165474))], reverse: true }, amount: 163068 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(2575144742644436404)), Index(Index(14941084409229626297))], reverse: true }, amount: 153261 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(6069993063829728240)), Index(Index(13722874056286851524))], reverse: false }, amount: 817006 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(7829488292677612832)), Index(Index(17717508795912409917))], reverse: true }, amount: 143528 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(5420315322856583252)), Index(Index(9797554600989629884))], reverse: false }, amount: 68731 }, RotateKeyGen { sender: Index(Index(310652137086238394)), new_keypair: 204510b67e6c2c389df6a8b824e811701443a0532ea20ebd627d6a1f013a0689e4204c2205b9c9783f1bc512e90d093698d17a17f09708d8568b43a253a390179987 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(10375963124654079204)), Index(Index(8034835585171864340))], reverse: false }, amount: 431839 }, SequenceNumberMismatchGen { sender: Index(Index(15517097927166853591)), seq: 1155 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(11163803033784314285)), Index(Index(11894717644378629578))], reverse: false }, amount: 646378 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(17325612559902518052)), Index(Index(12448305684405886940))], reverse: true }, amount: 450109 }, SequenceNumberMismatchGen { sender: Index(Index(12327373741183122494)), seq: 5343 }, SequenceNumberMismatchGen { sender: Index(Index(17028644992201559438)), seq: 2996 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(6705807773697209449)), Index(Index(15330159849442830496))], reverse: true }, amount: 347173 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(5782857073902926220)), Index(Index(10748345464403648586))], reverse: false }, amount: 456905 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(7009424404418542064)), Index(Index(9456645029757399820))], reverse: true }, amount: 580838 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(13627969271431885704)), Index(Index(16363396190240790969))], reverse: false }, amount: 547853 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(6337681370603808431)), Index(Index(5572352497789171135))], reverse: true }, amount: 609532 }, InsufficientBalanceGen { sender: Index(Index(7609032472289202779)), gas_unit_price: 16148 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(3366219880044765958)), Index(Index(3740459382341983171))], reverse: false }, amount: 906901 }, InsufficientBalanceGen { sender: Index(Index(3070748904057866118)), gas_unit_price: 18838 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(8457849863996795653)), Index(Index(13653738725556180154))], reverse: true }, amount: 994298 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(15341448313082602710)), Index(Index(12582822431381370348))], reverse: true }, amount: 692693 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(13478158889626424270)), Index(Index(6202253457183976108))], reverse: false }, amount: 122123 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(15336389506161554107)), Index(Index(15039878677847900849))], reverse: false }, amount: 534709 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(3289248578370961243)), Index(Index(4423231267188515568))], reverse: false }, amount: 90516 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(11116820380698088185)), Index(Index(7807758584342911393))], reverse: true }, amount: 953427 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(15730517349998809500)), Index(Index(2501278955257384950))], reverse: true }, amount: 475516 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(3166283832253901413)), Index(Index(7333687859612791081))], reverse: true }, amount: 126366 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(602773149019494053)), Index(Index(1044964613759245234))], reverse: false }, amount: 439512 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(14802236212410552139)), Index(Index(10224123826466522648))], reverse: true }, amount: 167625 }, InvalidAuthkeyGen { sender: Index(Index(1851767349493425927)), new_keypair: 20e14dbaaa3a3ea8f8ba042db4454c1448bbe553ead9698b295de60b544f653f122083879b67ad986e83f7e30e7ae6e68cbbc2c84ad3430f37bfeb8519586a8449c9 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(803396419485700059)), Index(Index(10237427847572030711))], reverse: true }, amount: 705339 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(3717302551008357751)), Index(Index(4783756774490691942))], reverse: true }, amount: 532846 }, InsufficientBalanceGen { sender: Index(Index(4070205301160992702)), gas_unit_price: 12128 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(7634002029626466917)), Index(Index(7366266064844936390))], reverse: false }, amount: 324817 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(3907900128039798745)), Index(Index(7547150690445765354))], reverse: true }, amount: 47692 }] +cc a3036a52f77ef51140e3b44806be137ddd79b4da81b53e3e0101deec6aaba278 # shrinks to mut universe = AccountUniverseGen { accounts: [AccountData { account: Account { addr: 465202466DB02C335D1737D00C0318DA, privkey: , pubkey: Ed25519PublicKey(bb4e30012b18a749b0027f3d8f0e2800ba2b5f7468857909b0fc3f4302dbe9f2) }, withdrawal_capability: Some(WithdrawCapability { account_address: 465202466DB02C335D1737D00C0318DA }), key_rotation_capability: Some(KeyRotationCapability { account_address: 465202466DB02C335D1737D00C0318DA }), sequence_number: 0, sent_events: EventHandle { count: 0, key: EventKey(0000000000000000465202466db02c335d1737d00c0318da) }, received_events: EventHandle { count: 0, key: EventKey(0000000000000000465202466db02c335d1737d00c0318da) }, balances: {Identifier("XUS"): Balance { coin: 0 }}, account_role: AccountRole { self_address: 465202466DB02C335D1737D00C0318DA, account_specifier: ParentVASP } }, AccountData { account: Account { addr: E7B05566E3B6C625421703CC6B578FCE, privkey: , pubkey: Ed25519PublicKey(e6a8b01a83b3cfcd703b71f00e78af6f3a701094c0f76e1c05fc84c11ae250d0) }, withdrawal_capability: Some(WithdrawCapability { account_address: E7B05566E3B6C625421703CC6B578FCE }), key_rotation_capability: Some(KeyRotationCapability { account_address: E7B05566E3B6C625421703CC6B578FCE }), sequence_number: 3778282294, sent_events: EventHandle { count: 0, key: EventKey(aeb34ec100000000e7b05566e3b6c625421703cc6b578fce) }, received_events: EventHandle { count: 0, key: EventKey(14e1d09f00000000e7b05566e3b6c625421703cc6b578fce) }, balances: {Identifier("XUS"): Balance { coin: 8486310 }}, account_role: AccountRole { self_address: E7B05566E3B6C625421703CC6B578FCE, account_specifier: ParentVASP } }, AccountData { account: Account { addr: 3AFAEECD8F50B4B850489062F825CA42, privkey: , pubkey: Ed25519PublicKey(7fe3f9bcdcce82bc5114da2444bf425e19c763d5b4ef21c329bea8108173f435) }, withdrawal_capability: Some(WithdrawCapability { account_address: 3AFAEECD8F50B4B850489062F825CA42 }), key_rotation_capability: Some(KeyRotationCapability { account_address: 3AFAEECD8F50B4B850489062F825CA42 }), sequence_number: 1225885594, sent_events: EventHandle { count: 0, key: EventKey(308fbcb6000000003afaeecd8f50b4b850489062f825ca42) }, received_events: EventHandle { count: 0, key: EventKey(a339f1a0000000003afaeecd8f50b4b850489062f825ca42) }, balances: {Identifier("XUS"): Balance { coin: 317674 }}, account_role: AccountRole { self_address: 3AFAEECD8F50B4B850489062F825CA42, account_specifier: ParentVASP } }, AccountData { account: Account { addr: 084E24A514BDD276125A7D3BC3AA1BCE, privkey: , pubkey: Ed25519PublicKey(73f50b58c84d9a93c3006e9a840fd10a16384a7d9126e27f7199b8771afc5caa) }, withdrawal_capability: Some(WithdrawCapability { account_address: 084E24A514BDD276125A7D3BC3AA1BCE }), key_rotation_capability: Some(KeyRotationCapability { account_address: 084E24A514BDD276125A7D3BC3AA1BCE }), sequence_number: 7933087, sent_events: EventHandle { count: 0, key: EventKey(2da1510000000000084e24a514bdd276125a7d3bc3aa1bce) }, received_events: EventHandle { count: 0, key: EventKey(250a273c00000000084e24a514bdd276125a7d3bc3aa1bce) }, balances: {Identifier("XUS"): Balance { coin: 5726819 }}, account_role: AccountRole { self_address: 084E24A514BDD276125A7D3BC3AA1BCE, account_specifier: ParentVASP } }], pick_style: Unlimited }, mut transactions = [P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(10237666780540876489)), Index(Index(13402659189188897083))], reverse: false }, amount: 404380 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(6405134641983892152)), Index(Index(87310074521274505))], reverse: false }, amount: 634633 }, InvalidAuthkeyGen { sender: Index(Index(7529176756162054172)), new_keypair: 203f88046a69982bd659aa3316359533e3ff5eab883aff43213f2fe80be219243d201318c8f390309c8a1950fb4e6042c54fbfd2e18a9d84b868d48f4a5dc0780afe }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(12711627597421372937)), Index(Index(18303309835090992284))], reverse: false }, amount: 174365 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(9161657003621512370)), Index(Index(7902015133836398278))], reverse: false }, amount: 397042 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(252393502036183023)), Index(Index(11888225120542868040))], reverse: true }, amount: 132271 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(6039407160746902236)), Index(Index(6297193644181114771))], reverse: false }, amount: 384051 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(11908017645777752472)), Index(Index(9008666375553179633))], reverse: false }, amount: 800 }, InvalidAuthkeyGen { sender: Index(Index(12544785795298602910)), new_keypair: 20d94140abe76bda5aa24974e868a6b276cd02993364bcafe9a2a71afb1d16bbff20c1e5a6510c79742198f97d1c5020e7cf6d57475325dd827ad7318825508866e4 }, RotateKeyGen { sender: Index(Index(13862788059407903280)), new_keypair: 20527dad25474928e9a96d25bafa2450ca0c32ac36eca9975eefac0d7beec7f6a020ceb7bae5ea7b6b0108ae709bdb1a4e6a30450068c7ed184fb0e3f2c476e3ce45 }, RotateKeyGen { sender: Index(Index(16707807368195276078)), new_keypair: 209313b934c9c821eb71444d9f2c71d4225ff5d0c5289a81709333ddf3c7c07d5020e0535bf719775d266668df3f5dda8a8024d014edd8750e56712f8a2e75507e14 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(12213722649947424482)), Index(Index(9879788934795736462))], reverse: true }, amount: 772967 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(5477265771858464150)), Index(Index(3612999496594653398))], reverse: false }, amount: 559740 }, RotateKeyGen { sender: Index(Index(16760033913567403425)), new_keypair: 207c2119dd2d96aab0b817911dbb5123019f5db2f85724c8eeecc5eb32d55b864020f9b7520ea53ee72fd0a2d2cfa3ca8b9697464395e174f4a7d764032f3a4d36cb }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(12001918569145547850)), Index(Index(12195441173779490344))], reverse: false }, amount: 118112 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(18390140557981883083)), Index(Index(6735594815631236640))], reverse: false }, amount: 532385 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(12245670339412810438)), Index(Index(860850162277632678))], reverse: false }, amount: 711183 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(17617378298202852191)), Index(Index(6035082072356606196))], reverse: false }, amount: 379585 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(10271808763035683210)), Index(Index(11055147387851978749))], reverse: false }, amount: 875351 }, InsufficientBalanceGen { sender: Index(Index(12877449870104514237)), gas_unit_price: 15632 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(10196201308227353410)), Index(Index(5018456092385780618))], reverse: false }, amount: 46759 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(1084269061119742628)), Index(Index(11188581494781668715))], reverse: true }, amount: 237998 }, SequenceNumberMismatchGen { sender: Index(Index(12370652316049742560)), seq: 3243 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(5338724238903656253)), Index(Index(12390015151440049370))], reverse: false }, amount: 475610 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(3911312343301760341)), Index(Index(4922573195981253881))], reverse: false }, amount: 852398 }, RotateKeyGen { sender: Index(Index(9036093953832852142)), new_keypair: 201f7170fc0673cacd3ff78ba69fe05d8aa0977e62f82fc0835eb22dc6746e7308204eaf6c3f5427b16817d9b3287a2610e15b26f46aa563d85d6e9b7f7e3f13655d }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(5369439816990942089)), Index(Index(8157332847876337238))], reverse: true }, amount: 907118 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(2305022167053323347)), Index(Index(13999037506514290371))], reverse: false }, amount: 462471 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(4946834205370800393)), Index(Index(8412064118820087487))], reverse: true }, amount: 820522 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(6423608508539645753)), Index(Index(9073502167803089473))], reverse: false }, amount: 317453 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(18384178944721629777)), Index(Index(1958119490335253406))], reverse: false }, amount: 657569 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(12050018131148464490)), Index(Index(7631662238074696858))], reverse: true }, amount: 267893 }] diff --git a/aptos-move/e2e-testsuite/proptest-regressions/tests/account_universe/peer_to_peer.txt b/aptos-move/e2e-testsuite/proptest-regressions/tests/account_universe/peer_to_peer.txt new file mode 100644 index 0000000000000..6271f3b4261f3 --- /dev/null +++ b/aptos-move/e2e-testsuite/proptest-regressions/tests/account_universe/peer_to_peer.txt @@ -0,0 +1,8 @@ +# Seeds for failure cases proptest has generated in the past. It is +# automatically read and these particular cases re-run before any +# novel cases are generated. +# +# It is recommended to check this file in to source control so that +# everyone who runs the test benefits from these saved cases. +cc 179b8f9a2cfdb0c4f288ab1de49072374a8112d038c7d9cb8842a5daefd81240 # shrinks to universe = AccountUniverseGen { accounts: [AccountData { account: Account { addr: 61DC5DA7F5E27E2B61D209BB29CE815A, privkey: , pubkey: Ed25519PublicKey(d6bc23c8a879edae3366a5d9200814feac3a62b78466f0a0d5c0c8e4281dfae1) }, withdrawal_capability: Some(WithdrawCapability { account_address: 61DC5DA7F5E27E2B61D209BB29CE815A }), key_rotation_capability: Some(KeyRotationCapability { account_address: 61DC5DA7F5E27E2B61D209BB29CE815A }), sequence_number: 0, sent_events: EventHandle { count: 0, key: EventKey(000000000000000061dc5da7f5e27e2b61d209bb29ce815a) }, received_events: EventHandle { count: 0, key: EventKey(000000000000000061dc5da7f5e27e2b61d209bb29ce815a) }, balances: {Identifier("XUS"): Balance { coin: 1000000 }}, account_role: AccountRole { self_address: 61DC5DA7F5E27E2B61D209BB29CE815A, account_specifier: ParentVASP } }, AccountData { account: Account { addr: 6BC1111EEBA525345317CD12DAB97F38, privkey: , pubkey: Ed25519PublicKey(11a5aa006f60513a73a1361e2fe065340dd501d532713a754db91d1fcbd94a1f) }, withdrawal_capability: Some(WithdrawCapability { account_address: 6BC1111EEBA525345317CD12DAB97F38 }), key_rotation_capability: Some(KeyRotationCapability { account_address: 6BC1111EEBA525345317CD12DAB97F38 }), sequence_number: 452084075, sent_events: EventHandle { count: 0, key: EventKey(2c8d91df000000006bc1111eeba525345317cd12dab97f38) }, received_events: EventHandle { count: 0, key: EventKey(d02cb384000000006bc1111eeba525345317cd12dab97f38) }, balances: {Identifier("XUS"): Balance { coin: 1006851 }}, account_role: AccountRole { self_address: 6BC1111EEBA525345317CD12DAB97F38, account_specifier: ParentVASP } }], pick_style: Unlimited }, transfers = [P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(7011129072068079040)), Index(Index(2919235851508422435))], reverse: false }, amount: 8852 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(11783895405760646758)), Index(Index(14685998316226809661))], reverse: false }, amount: 1961 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(13530681429600502962)), Index(Index(15494277424971346159))], reverse: false }, amount: 9376 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(14622790315841629073)), Index(Index(12438509125932465869))], reverse: true }, amount: 3090 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(5906132866227302488)), Index(Index(2542290134434273265))], reverse: false }, amount: 6448 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(16621530177901065839)), Index(Index(5355608255731064935))], reverse: false }, amount: 5435 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(10214598255217582041)), Index(Index(9143281976689462280))], reverse: true }, amount: 2829 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(9534789982523984343)), Index(Index(17966306356262467941))], reverse: false }, amount: 9978 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(8548910171347466094)), Index(Index(37847196098540876))], reverse: false }, amount: 7531 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(17790144961429287912)), Index(Index(16139656263613953267))], reverse: false }, amount: 6910 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(1515610120755063493)), Index(Index(10632654687863015153))], reverse: true }, amount: 8820 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(14985863326392451397)), Index(Index(10892593194895570422))], reverse: false }, amount: 6645 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(15638174454715415530)), Index(Index(6907373731879523469))], reverse: true }, amount: 9601 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(13142082665654757870)), Index(Index(3997674914693082167))], reverse: true }, amount: 9467 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(7146967016610645893)), Index(Index(733205266249447167))], reverse: false }, amount: 902 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(11333312475764777482)), Index(Index(5567240314991694788))], reverse: true }, amount: 3138 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(11436275641792869501)), Index(Index(3577833295589939454))], reverse: true }, amount: 9651 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(17625981464707437549)), Index(Index(4713867743170104603))], reverse: false }, amount: 8491 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(16858187624681910247)), Index(Index(2284976259209566790))], reverse: false }, amount: 4307 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(16951613228178088241)), Index(Index(6766508310633451869))], reverse: true }, amount: 4728 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(11472636225898954178)), Index(Index(12394500722676044740))], reverse: true }, amount: 4961 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(4025801835086859438)), Index(Index(9577057951681655586))], reverse: false }, amount: 5774 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(16592348031442976016)), Index(Index(11266096962589550738))], reverse: false }, amount: 620 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(14879722135713935914)), Index(Index(18059614294758231060))], reverse: false }, amount: 9164 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(17769920530535045444)), Index(Index(14399133229888634133))], reverse: true }, amount: 4335 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(6312053544781983310)), Index(Index(9172318106852368244))], reverse: true }, amount: 2096 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(3866320626006922587)), Index(Index(11658253448481129942))], reverse: false }, amount: 5616 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(6576418594541049636)), Index(Index(16234909185673563679))], reverse: true }, amount: 3000 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(2528665827587489386)), Index(Index(5478298535650324471))], reverse: false }, amount: 1911 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(11751678481495699639)), Index(Index(12934923004833125172))], reverse: true }, amount: 4527 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(5597274581846715720)), Index(Index(11120037029040162062))], reverse: true }, amount: 1812 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(2576958703799678201)), Index(Index(8225575729566307631))], reverse: false }, amount: 5410 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(17809831715881942159)), Index(Index(8228806635214229234))], reverse: true }, amount: 8835 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(13176571111778583179)), Index(Index(6451166722197457752))], reverse: false }, amount: 1746 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(4732204808415081786)), Index(Index(756068205604076762))], reverse: true }, amount: 2982 }] +cc f71e9551ad19f8b2a682e89efdd471db1d3164e54074e1df4c92ed3c880d1aaf # shrinks to universe = AccountUniverseGen { accounts: [AccountData { account: Account { addr: F284CA99638434A1233A523DC036DCAF, privkey: , pubkey: Ed25519PublicKey(6c18abe3e4d40b86043c2d185214a63067814f70ca19055764c91582e554af6f) }, withdrawal_capability: Some(WithdrawCapability { account_address: F284CA99638434A1233A523DC036DCAF }), key_rotation_capability: Some(KeyRotationCapability { account_address: F284CA99638434A1233A523DC036DCAF }), sequence_number: 0, sent_events: EventHandle { count: 0, key: EventKey(0000000000000000f284ca99638434a1233a523dc036dcaf) }, received_events: EventHandle { count: 0, key: EventKey(0000000000000000f284ca99638434a1233a523dc036dcaf) }, balances: {Identifier("XUS"): Balance { coin: 20000000 }}, account_role: AccountRole { self_address: F284CA99638434A1233A523DC036DCAF, account_specifier: ParentVASP } }, AccountData { account: Account { addr: 35434EF7F76172FA23B4FA5E95845DB0, privkey: , pubkey: Ed25519PublicKey(765f8ebb5e997a1ee30bd63648d66f976a230d59403853f9d0a5e7e68a7eb532) }, withdrawal_capability: Some(WithdrawCapability { account_address: 35434EF7F76172FA23B4FA5E95845DB0 }), key_rotation_capability: Some(KeyRotationCapability { account_address: 35434EF7F76172FA23B4FA5E95845DB0 }), sequence_number: 205133471, sent_events: EventHandle { count: 0, key: EventKey(c2019e380000000035434ef7f76172fa23b4fa5e95845db0) }, received_events: EventHandle { count: 0, key: EventKey(31b63c390000000035434ef7f76172fa23b4fa5e95845db0) }, balances: {Identifier("XUS"): Balance { coin: 65812033 }}, account_role: AccountRole { self_address: 35434EF7F76172FA23B4FA5E95845DB0, account_specifier: ParentVASP } }], pick_style: Unlimited }, transfers = [P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(4434111942458577450)), Index(Index(14412429769461609703))], reverse: false }, amount: 8422 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(12787952021586684851)), Index(Index(13274380300144138046))], reverse: true }, amount: 2783 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(5815233215692892982)), Index(Index(7284945912049174756))], reverse: false }, amount: 987 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(14872243111967583454)), Index(Index(17837928207766024282))], reverse: true }, amount: 4191 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(7904842946623129184)), Index(Index(9113064959849280909))], reverse: true }, amount: 7017 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(286527519088525259)), Index(Index(9874896124290867190))], reverse: true }, amount: 4175 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(11046527009199490871)), Index(Index(7787909483902190883))], reverse: false }, amount: 8297 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(13859817176830151404)), Index(Index(4141459802652513310))], reverse: true }, amount: 7533 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(5607431144333109179)), Index(Index(9421668570557984852))], reverse: false }, amount: 9110 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(16952724883513326541)), Index(Index(11433446815732419682))], reverse: true }, amount: 3619 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(12122361682183107192)), Index(Index(14731856458943051693))], reverse: false }, amount: 3059 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(529236876439459720)), Index(Index(14384937741942461241))], reverse: false }, amount: 3886 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(16336272702917957861)), Index(Index(2975015633256083477))], reverse: false }, amount: 7570 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(8257001126253144535)), Index(Index(17392794115448016066))], reverse: false }, amount: 6452 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(12445622540443102880)), Index(Index(8006557858030774568))], reverse: true }, amount: 7207 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(4405010311368611238)), Index(Index(15368740601237752434))], reverse: false }, amount: 6748 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(14206213570964705990)), Index(Index(6102558695416318561))], reverse: false }, amount: 298 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(2476479263182182821)), Index(Index(8140089188790332917))], reverse: false }, amount: 2783 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(56235508178772502)), Index(Index(13109211410704570442))], reverse: false }, amount: 6480 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(2688477937902801070)), Index(Index(15220607860745297651))], reverse: true }, amount: 9073 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(15414952916945844896)), Index(Index(15604993631671969337))], reverse: true }, amount: 3831 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(17745895254433950717)), Index(Index(5048714953993364237))], reverse: true }, amount: 4298 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(18401319382234461107)), Index(Index(11114695185559522283))], reverse: false }, amount: 8835 }, P2PTransferGen { sender_receiver: AccountPairGen { pair: [Index(Index(3894995565846956893)), Index(Index(1237191461814728253))], reverse: false }, amount: 4098 }] diff --git a/aptos-move/e2e-testsuite/proptest-regressions/tests/account_universe/rotate_key.txt b/aptos-move/e2e-testsuite/proptest-regressions/tests/account_universe/rotate_key.txt new file mode 100644 index 0000000000000..d436278e77580 --- /dev/null +++ b/aptos-move/e2e-testsuite/proptest-regressions/tests/account_universe/rotate_key.txt @@ -0,0 +1,9 @@ +# Seeds for failure cases proptest has generated in the past. It is +# automatically read and these particular cases re-run before any +# novel cases are generated. +# +# It is recommended to check this file in to source control so that +# everyone who runs the test benefits from these saved cases. +cc 7a781ebcf9b4ec397d0d25c91a3896499dbfbe6747824fb3f3699d596e153872 # shrinks to universe = AccountUniverseGen { accounts: [AccountData { account: Account { addr: 00A5FFEFFA3C93B42B979876192B6F94, privkey: , pubkey: Ed25519PublicKey(218223fd86895a214d171fc50bd3cffff830ec9fef5324a6fbe1e69bc918515a) }, withdrawal_capability: Some(WithdrawCapability { account_address: 00A5FFEFFA3C93B42B979876192B6F94 }), key_rotation_capability: Some(KeyRotationCapability { account_address: 00A5FFEFFA3C93B42B979876192B6F94 }), sequence_number: 0, sent_events: EventHandle { count: 0, key: EventKey(000000000000000000a5ffeffa3c93b42b979876192b6f94) }, received_events: EventHandle { count: 0, key: EventKey(3c0000000000000000a5ffeffa3c93b42b979876192b6f94) }, balances: {Identifier("XUS"): Balance { coin: 1000000 }}, account_role: AccountRole { self_address: 00A5FFEFFA3C93B42B979876192B6F94, account_specifier: ParentVASP } }], pick_style: Unlimited }, key_rotations = [] +cc db8fd11452a54f42d83fdf282dae8ed2081c0c42d9accb3900b367dbb9253da9 # shrinks to universe = AccountUniverseGen { accounts: [AccountData { account: Account { addr: 2EB92DEC961B64BA980A60F77FC59ED3, privkey: , pubkey: Ed25519PublicKey(08c8e0d361c830a5fecdd743745a8691d9926256a3dc0a0df3fc3f34acd8b78e) }, withdrawal_capability: Some(WithdrawCapability { account_address: 2EB92DEC961B64BA980A60F77FC59ED3 }), key_rotation_capability: Some(KeyRotationCapability { account_address: 2EB92DEC961B64BA980A60F77FC59ED3 }), sequence_number: 0, sent_events: EventHandle { count: 0, key: EventKey(00000000000000002eb92dec961b64ba980a60f77fc59ed3) }, received_events: EventHandle { count: 0, key: EventKey(00000000000000002eb92dec961b64ba980a60f77fc59ed3) }, balances: {Identifier("XUS"): Balance { coin: 20000000 }}, account_role: AccountRole { self_address: 2EB92DEC961B64BA980A60F77FC59ED3, account_specifier: ParentVASP } }], pick_style: Unlimited }, key_rotations = [RotateKeyGen { sender: Index(Index(3494581131890414401)), new_keypair: 20aec83f685041a182989f04add2d517ba7ff3436099d20daf213ff3a117f13b1920c4555eb9c7f9e2be4f644dd0e0e4093d39ceb04ee36bad8f0fe310de1dfae2bc }, RotateKeyGen { sender: Index(Index(17516490252582997660)), new_keypair: 203d92310f5e32182bb2a0d6da8480bf2c56ed6f09a4ec04c85e179b0ffbd2770d20a380f7f3ff88cb4ff89c8b06a098e6b5d7ddecc4291f541a80ac3aa30bb4307d }] +cc 28374ef939efe9d4a499deb1639285d4941d298f3cf8dbb4b39c877c3b188d6b # shrinks to universe = AccountUniverseGen { accounts: [AccountData { account: Account { addr: 9FED32A0E3AC1D4C6792AE99B88D8604, privkey: , pubkey: Ed25519PublicKey(c8c8eca5297a1730ac4c6480f9ee2dc59b2ca98124ad54f83e76f4e77874232c) }, withdrawal_capability: Some(WithdrawCapability { account_address: 9FED32A0E3AC1D4C6792AE99B88D8604 }), key_rotation_capability: Some(KeyRotationCapability { account_address: 9FED32A0E3AC1D4C6792AE99B88D8604 }), sequence_number: 0, sent_events: EventHandle { count: 0, key: EventKey(00000000000000009fed32a0e3ac1d4c6792ae99b88d8604) }, received_events: EventHandle { count: 0, key: EventKey(00000000000000009fed32a0e3ac1d4c6792ae99b88d8604) }, balances: {Identifier("XUS"): Balance { coin: 0 }}, account_role: AccountRole { self_address: 9FED32A0E3AC1D4C6792AE99B88D8604, account_specifier: ParentVASP } }], pick_style: Unlimited }, key_rotations = [RotateKeyGen { sender: Index(Index(14127962489212019781)), new_keypair: 20afeeb08f571342bf7eafa8954a07601ba286d8ee0fecaeaf48f26d4988ebfca7203cfd2a756505e5f623093af3742c318063ed67adbd5f3bfeccb89d353dcaf35b }, RotateKeyGen { sender: Index(Index(7057962565811353031)), new_keypair: 206c89cdc56f452536623d2d375967ef438f06fd8b5d03c22f581cfc498c7452cf20b1b3f700f45d6d9bdd3b5f9ba75b9c915d549e990bd3d0012c6366e6ed0792bf }, RotateKeyGen { sender: Index(Index(6866561723052441475)), new_keypair: 20bbf4f8d884457f744f315d09603d3d879237f39f9e07f8e1250d2b398c023511201aa4debbbe46533c950f1d7b456b6468ba40f7aae1e1dbcba7e44fe758baecdf }, RotateKeyGen { sender: Index(Index(6494521858930138368)), new_keypair: 208096a6d78fe111d7a0e2ff32fffea2fa0d96354edb85fce7d2f39c460ba158f620d67628f165c1b1414fd2151261468aef5303cf54939b417829bcc26a8815f68c }, RotateKeyGen { sender: Index(Index(8474555723608280640)), new_keypair: 2005a49f5f706a57ca510c4cc402b70761ff8620fd581183fa8f6d95c6d35b33e020f235c8bfa61b3e7d3e6dd63bde286e75e2c259ae6d749ad83e2c9ece70f94384 }, RotateKeyGen { sender: Index(Index(2406373940270023408)), new_keypair: 206464349fc6eb1b5c61aef9e4cc9e704afa43280ff43032dde567be592bb47ad6200e63c20e47a59d6bec169dca6fb39d777ae17eef1a6ba5be16c287469259d474 }, RotateKeyGen { sender: Index(Index(5921114318058740777)), new_keypair: 200f383a210677c3ceafcad34b71154abf405bc961fad156e4004bf328f61f702b20302c832fe7ab7ed1fa1e2e549abbb18f88e022ae7436add2d0c1dc63a9a97655 }, RotateKeyGen { sender: Index(Index(4290246289505788886)), new_keypair: 209ffaf11636f61f14b02623931a079f1d9cbe130462e85edc4d5ec60672a5073820f05e640bdc297fa4e1ec36bc9d63407048708bced273d19eb8c5a2a23ad14581 }, RotateKeyGen { sender: Index(Index(15411831190188357415)), new_keypair: 20d3aeb1186319d5ce35f7418b8ea8e8cb1d2455855e303aeaa089b0ed9343943e2090f3a18d8fde6fe6cff3fe955244b03c287140926edf45fd39afa97e8221d8d4 }, RotateKeyGen { sender: Index(Index(11386663509276657810)), new_keypair: 20ff2ce0b27f2fbc9f65f4ba6818068715cd53ee7d06d1495facbbd64f83c65b0920228153bc8d0332f101469f97f46e398dbbd043cbfdabddcea275bec178e0cab2 }, RotateKeyGen { sender: Index(Index(14204522243099780784)), new_keypair: 208dad2780fb22b854263e7474fc1fc89a83363072d11cd4ad49d2f39959aa86b3208acd1f62b309c165833bd2460a33a1aa4a4a65decd240222c4507629010f5df2 }, RotateKeyGen { sender: Index(Index(6404161371932744695)), new_keypair: 20cc0c7a1fa9a51a91c9fc4292e565bf11c102124ccef2f40412d9df553d672c4b2045c0de03824740f12a38c08c4a68acd5299c7ef2b58085837b9de6e967c314e3 }, RotateKeyGen { sender: Index(Index(17913613032933373984)), new_keypair: 20ddfba3c35db82691d0252ba0b7b2e4b1d6dac9878631fdc5069796d8f33a9d64206984ef523da27439341fc911594a64e130aa98a46266af17a3edf25c7580b052 }, RotateKeyGen { sender: Index(Index(3041026973348308942)), new_keypair: 20b01ffcc9e6e197ad068cdaec5b4ddb7bdb1cb144b32342078f3e3a03c653fd9b207e6b3f279b95474c6976473a4414daa95789962b1f0fa50779b91cb0094b23dd }, RotateKeyGen { sender: Index(Index(2171485767896784472)), new_keypair: 20893d5416dba7f9270b35a70541f5fd107deea3f968dbc4d39f6aa9efa6738aad20bcd0b343988f40500391b52d55f5a2ca51149da16937f5e74b5e37770f207ccb }, RotateKeyGen { sender: Index(Index(7299803571296441502)), new_keypair: 20baa04e67cdc61a3d70c8b33098a2876cc2c69f802eb59edb8b00de884a514c4e20f2d50757544d93f0df0288c006d49148988030bd4e5b153e0cb9b6a4393dff69 }, RotateKeyGen { sender: Index(Index(13354116328709413105)), new_keypair: 208798dd4c457a2cb985755b50c09c79874d91403f90038678b1c92c1bb99fc5a020d611ea88901add1780f6e0eddcf30ac4f7ce327e8e6cec825bd02a42754ad01a }, RotateKeyGen { sender: Index(Index(8620698074513689953)), new_keypair: 20963a88c99999e0a12e53baa0e1310b1dad2faa099fb9236813620521cf5b377720f6f9c0f4bf094988a9046d16745e8a57bd1384760268d6431c2dd226f79cb057 }, RotateKeyGen { sender: Index(Index(4723375612302901269)), new_keypair: 20cdd073f92ac645817e279ab42c42f6ac66e6019a21d597d1215ac82d6fb1d9cc2067259993843027b7db9d7ebba5c2ca285ce6b881c356010a48713372eb9658a2 }, RotateKeyGen { sender: Index(Index(8072130768874583152)), new_keypair: 2027b9fd2d20a610a1b0b00c528c1fc3a83f003eabbb5b696da4ce8c323ecfce2e20170fc9c3186542b01f83062da5e382ec819cf21bcc6c69e51462862a505c7fe1 }, RotateKeyGen { sender: Index(Index(13548549551833887164)), new_keypair: 200a790e8b90641204c179f489db13d24f2570a7f1d07ff5dda8551e92cb59119820a5a90909b4eb6a58805b0267805015e3042869724db876266998466e423c2604 }] diff --git a/diem-move/e2e-testsuite/src/lib.rs b/aptos-move/e2e-testsuite/src/lib.rs similarity index 100% rename from diem-move/e2e-testsuite/src/lib.rs rename to aptos-move/e2e-testsuite/src/lib.rs diff --git a/diem-move/e2e-testsuite/src/tests/account_limits.rs b/aptos-move/e2e-testsuite/src/tests/account_limits.rs similarity index 99% rename from diem-move/e2e-testsuite/src/tests/account_limits.rs rename to aptos-move/e2e-testsuite/src/tests/account_limits.rs index 4e44e4c0d95e1..61b11207831d0 100644 --- a/diem-move/e2e-testsuite/src/tests/account_limits.rs +++ b/aptos-move/e2e-testsuite/src/tests/account_limits.rs @@ -3,8 +3,8 @@ #![forbid(unsafe_code)] -use diem_transaction_builder::stdlib::*; -use diem_types::{ +use aptos_transaction_builder::stdlib::*; +use aptos_types::{ account_address::AccountAddress, account_config, transaction::{Script, TransactionArgument, TransactionOutput, WriteSetPayload}, @@ -155,7 +155,7 @@ fn account_limits() { let vasp_b = executor.create_raw_account(); let vasp_a_child = executor.create_raw_account(); let vasp_b_child = executor.create_raw_account(); - let diem_root = Account::new_diem_root(); + let aptos_root = Account::new_aptos_root(); let blessed = Account::new_blessed_tc(); let dd = Account::new_testing_dd(); let dr_sequence_number = 0; @@ -229,7 +229,7 @@ fn account_limits() { ); executor.execute_and_apply( - diem_root + aptos_root .transaction() .write_set(encode_add_account_limits_admin_script(*vasp_a.address())) .sequence_number(dr_sequence_number) @@ -237,7 +237,7 @@ fn account_limits() { ); executor.execute_and_apply( - diem_root + aptos_root .transaction() .write_set(encode_add_account_limits_admin_script(*vasp_b.address())) .sequence_number(dr_sequence_number.checked_add(1).unwrap()) diff --git a/diem-move/e2e-testsuite/src/tests/account_universe/bad_transaction.rs b/aptos-move/e2e-testsuite/src/tests/account_universe/bad_transaction.rs similarity index 100% rename from diem-move/e2e-testsuite/src/tests/account_universe/bad_transaction.rs rename to aptos-move/e2e-testsuite/src/tests/account_universe/bad_transaction.rs diff --git a/diem-move/e2e-testsuite/src/tests/account_universe/create_account.rs b/aptos-move/e2e-testsuite/src/tests/account_universe/create_account.rs similarity index 100% rename from diem-move/e2e-testsuite/src/tests/account_universe/create_account.rs rename to aptos-move/e2e-testsuite/src/tests/account_universe/create_account.rs diff --git a/diem-move/e2e-testsuite/src/tests/account_universe/mod.rs b/aptos-move/e2e-testsuite/src/tests/account_universe/mod.rs similarity index 100% rename from diem-move/e2e-testsuite/src/tests/account_universe/mod.rs rename to aptos-move/e2e-testsuite/src/tests/account_universe/mod.rs diff --git a/diem-move/e2e-testsuite/src/tests/account_universe/peer_to_peer.rs b/aptos-move/e2e-testsuite/src/tests/account_universe/peer_to_peer.rs similarity index 100% rename from diem-move/e2e-testsuite/src/tests/account_universe/peer_to_peer.rs rename to aptos-move/e2e-testsuite/src/tests/account_universe/peer_to_peer.rs diff --git a/diem-move/e2e-testsuite/src/tests/account_universe/rotate_key.rs b/aptos-move/e2e-testsuite/src/tests/account_universe/rotate_key.rs similarity index 100% rename from diem-move/e2e-testsuite/src/tests/account_universe/rotate_key.rs rename to aptos-move/e2e-testsuite/src/tests/account_universe/rotate_key.rs diff --git a/diem-move/e2e-testsuite/src/tests/admin_script.rs b/aptos-move/e2e-testsuite/src/tests/admin_script.rs similarity index 93% rename from diem-move/e2e-testsuite/src/tests/admin_script.rs rename to aptos-move/e2e-testsuite/src/tests/admin_script.rs index 4667c3d69473e..cd79a5d853fb7 100644 --- a/diem-move/e2e-testsuite/src/tests/admin_script.rs +++ b/aptos-move/e2e-testsuite/src/tests/admin_script.rs @@ -3,13 +3,13 @@ use language_e2e_tests::{account::Account, current_function_name, executor::FakeExecutor}; -use diem_crypto::{ed25519::Ed25519PrivateKey, PrivateKey, Uniform}; -use diem_types::{ +use aptos_crypto::{ed25519::Ed25519PrivateKey, PrivateKey, Uniform}; +use aptos_types::{ transaction::{authenticator::AuthenticationKey, Script, TransactionArgument}, vm_status::StatusCode, }; -use diem_types::transaction::WriteSetPayload; +use aptos_types::transaction::WriteSetPayload; use move_ir_compiler::Compiler; #[test] @@ -43,7 +43,7 @@ label b0: }; compiler.into_script_blob(code).expect("Failed to compile") }; - let account = Account::new_diem_root(); + let account = Account::new_aptos_root(); let txn = account .transaction() .write_set(WriteSetPayload::Script { @@ -60,7 +60,7 @@ label b0: let output = executor.execute_and_apply(txn); // The transaction should not trigger a reconfiguration. - let new_epoch_event_key = diem_types::on_chain_config::new_epoch_event_key(); + let new_epoch_event_key = aptos_types::on_chain_config::new_epoch_event_key(); assert!(!output .events() .iter() @@ -106,7 +106,7 @@ label b0: }; compiler.into_script_blob(code).expect("Failed to compile") }; - let account = Account::new_diem_root(); + let account = Account::new_aptos_root(); let txn = account .transaction() .write_set(WriteSetPayload::Script { @@ -123,7 +123,7 @@ label b0: let output = executor.execute_and_apply(txn); // The transaction should trigger a reconfiguration. - let new_epoch_event_key = diem_types::on_chain_config::new_epoch_event_key(); + let new_epoch_event_key = aptos_types::on_chain_config::new_epoch_event_key(); assert!(output .events() .iter() @@ -167,7 +167,7 @@ label b0: }; compiler.into_script_blob(code).expect("Failed to compile") }; - let account = Account::new_diem_root(); + let account = Account::new_aptos_root(); let txn = account .transaction() .write_set(WriteSetPayload::Script { diff --git a/diem-move/e2e-testsuite/src/tests/create_account.rs b/aptos-move/e2e-testsuite/src/tests/create_account.rs similarity index 94% rename from diem-move/e2e-testsuite/src/tests/create_account.rs rename to aptos-move/e2e-testsuite/src/tests/create_account.rs index 9b9990c570e7e..1f410fd0f165c 100644 --- a/diem-move/e2e-testsuite/src/tests/create_account.rs +++ b/aptos-move/e2e-testsuite/src/tests/create_account.rs @@ -1,7 +1,7 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_types::{account_config, transaction::TransactionStatus, vm_status::KeptVMStatus}; +use aptos_types::{account_config, transaction::TransactionStatus, vm_status::KeptVMStatus}; use language_e2e_tests::{ account::{self, Account}, common_transactions::create_account_txn, diff --git a/diem-move/e2e-testsuite/src/tests/crsn.rs b/aptos-move/e2e-testsuite/src/tests/crsn.rs similarity index 98% rename from diem-move/e2e-testsuite/src/tests/crsn.rs rename to aptos-move/e2e-testsuite/src/tests/crsn.rs index 3c173738c26a6..b1f4a954218db 100644 --- a/diem-move/e2e-testsuite/src/tests/crsn.rs +++ b/aptos-move/e2e-testsuite/src/tests/crsn.rs @@ -1,7 +1,7 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_transaction_builder::stdlib; -use diem_types::{account_config, vm_status::StatusCode}; +use aptos_transaction_builder::stdlib; +use aptos_types::{account_config, vm_status::StatusCode}; use language_e2e_tests::{ account::Account, compile::compile_script, current_function_name, executor::FakeExecutor, }; @@ -10,7 +10,7 @@ use language_e2e_tests::{ const K: u64 = 10; fn init(executor: &mut FakeExecutor) { - let dr = Account::new_diem_root(); + let dr = Account::new_aptos_root(); let program = r#" import 0x1.CRSN; main(account: signer) { diff --git a/diem-move/e2e-testsuite/src/tests/data_store.rs b/aptos-move/e2e-testsuite/src/tests/data_store.rs similarity index 99% rename from diem-move/e2e-testsuite/src/tests/data_store.rs rename to aptos-move/e2e-testsuite/src/tests/data_store.rs index 556cc8e45cc8c..841fd86cab918 100644 --- a/diem-move/e2e-testsuite/src/tests/data_store.rs +++ b/aptos-move/e2e-testsuite/src/tests/data_store.rs @@ -1,7 +1,7 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_types::{ +use aptos_types::{ transaction::{Module, SignedTransaction, Transaction, TransactionStatus}, vm_status::KeptVMStatus, }; diff --git a/diem-move/e2e-testsuite/src/tests/emergency_admin_script.rs b/aptos-move/e2e-testsuite/src/tests/emergency_admin_script.rs similarity index 92% rename from diem-move/e2e-testsuite/src/tests/emergency_admin_script.rs rename to aptos-move/e2e-testsuite/src/tests/emergency_admin_script.rs index c7e2896eb0c02..ce6cde61f6767 100644 --- a/diem-move/e2e-testsuite/src/tests/emergency_admin_script.rs +++ b/aptos-move/e2e-testsuite/src/tests/emergency_admin_script.rs @@ -1,14 +1,14 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_transaction_builder::stdlib::*; -use diem_types::{ - account_config::diem_root_address, +use aptos_transaction_builder::stdlib::*; +use aptos_types::{ + account_config::aptos_root_address, on_chain_config::{new_epoch_event_key, DIEM_MAX_KNOWN_VERSION}, transaction::{Transaction, TransactionStatus}, vm_status::KeptVMStatus, }; -use diem_writeset_generator::{ +use aptos_writeset_generator::{ encode_custom_script, encode_halt_network_payload, encode_remove_validators_payload, }; use language_e2e_tests::{ @@ -25,14 +25,14 @@ use serde_json::json; fn validator_batch_remove() { test_with_different_versions! {CURRENT_RELEASE_VERSIONS, |test_env| { let mut executor = test_env.executor; - let diem_root_account = test_env.dr_account; + let aptos_root_account = test_env.dr_account; let validator_account_0 = executor.create_raw_account(); let validator_account_1 = executor.create_raw_account(); let operator_account = executor.create_raw_account(); // Add validator_0 executor.execute_and_apply( - diem_root_account + aptos_root_account .transaction() .script(encode_create_validator_account_script( 0, @@ -45,7 +45,7 @@ fn validator_batch_remove() { ); // Add operator executor.execute_and_apply( - diem_root_account + aptos_root_account .transaction() .script(encode_create_validator_operator_account_script( 0, @@ -89,9 +89,9 @@ fn validator_batch_remove() { .sign(), ); - // diem_root adds validator + // aptos_root adds validator executor.execute_and_apply( - diem_root_account + aptos_root_account .transaction() .script(encode_add_validator_and_reconfigure_script( 2, @@ -105,7 +105,7 @@ fn validator_batch_remove() { // Add validator_1 executor.new_block(); executor.execute_and_apply( - diem_root_account + aptos_root_account .transaction() .script(encode_create_validator_account_script( 0, @@ -148,9 +148,9 @@ fn validator_batch_remove() { .sign(), ); - // diem_root adds validator + // aptos_root adds validator executor.execute_and_apply( - diem_root_account + aptos_root_account .transaction() .script(encode_add_validator_and_reconfigure_script( 3, @@ -169,7 +169,7 @@ fn validator_batch_remove() { let txn2 = Transaction::GenesisTransaction(encode_custom_script( "remove_validators.move", &json!({ "addresses": [validator_account_0.address().to_string(), validator_account_1.address().to_string()]}), - Some(diem_root_address()), + Some(aptos_root_address()), )); assert_eq!(txn1, txn2); @@ -198,7 +198,7 @@ fn validator_batch_remove() { "remove_validator", vec![], serialize_values(&vec![ - MoveValue::Signer(*diem_root_account.address()), + MoveValue::Signer(*aptos_root_account.address()), MoveValue::Address(*validator_account_0.address()) ]), ) @@ -209,7 +209,7 @@ fn validator_batch_remove() { "remove_validator", vec![], serialize_values(&vec![ - MoveValue::Signer(*diem_root_account.address()), + MoveValue::Signer(*aptos_root_account.address()), MoveValue::Address(*validator_account_1.address()) ]), ) @@ -224,7 +224,7 @@ fn halt_network() { // `DiemTransactionPublishingOption::halt_all_transactions` is not available in version 1. test_with_different_versions! {2..=DIEM_MAX_KNOWN_VERSION.major, |test_env| { let mut executor = test_env.executor; - let diem_root_account = test_env.dr_account; + let aptos_root_account = test_env.dr_account; let sender = executor.create_raw_account_data(1_000_000, 10); let receiver = executor.create_raw_account_data(100_000, 10); executor.add_account_data(&sender); @@ -253,10 +253,10 @@ fn halt_network() { &TransactionStatus::Discard(StatusCode::UNKNOWN_SCRIPT) ); - let auth_key = diem_root_account.auth_key(); + let auth_key = aptos_root_account.auth_key(); // DiemRoot can still send transaction executor.execute_and_apply( - diem_root_account + aptos_root_account .transaction() .script(encode_rotate_authentication_key_script(auth_key)) .sequence_number(test_env.dr_sequence_number) diff --git a/diem-move/e2e-testsuite/src/tests/execution_strategies.rs b/aptos-move/e2e-testsuite/src/tests/execution_strategies.rs similarity index 96% rename from diem-move/e2e-testsuite/src/tests/execution_strategies.rs rename to aptos-move/e2e-testsuite/src/tests/execution_strategies.rs index 7e2df3bd54824..1b86dd43f155b 100644 --- a/diem-move/e2e-testsuite/src/tests/execution_strategies.rs +++ b/aptos-move/e2e-testsuite/src/tests/execution_strategies.rs @@ -1,7 +1,7 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_types::{account_config, transaction::SignedTransaction, vm_status::VMStatus}; +use aptos_types::{account_config, transaction::SignedTransaction, vm_status::VMStatus}; use language_e2e_tests::{ account::Account, common_transactions::create_account_txn, @@ -19,9 +19,9 @@ use language_e2e_tests::{ fn txn(seq_num: u64) -> SignedTransaction { let account = Account::new(); - let diem_root = Account::new_diem_root(); + let aptos_root = Account::new_aptos_root(); create_account_txn( - &diem_root, + &aptos_root, &account, seq_num + 1, 0, diff --git a/diem-move/e2e-testsuite/src/tests/experimental.rs b/aptos-move/e2e-testsuite/src/tests/experimental.rs similarity index 91% rename from diem-move/e2e-testsuite/src/tests/experimental.rs rename to aptos-move/e2e-testsuite/src/tests/experimental.rs index d437c8ccf523f..817c905ab6284 100644 --- a/diem-move/e2e-testsuite/src/tests/experimental.rs +++ b/aptos-move/e2e-testsuite/src/tests/experimental.rs @@ -1,8 +1,8 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_transaction_builder::experimental_stdlib::encode_create_account_script_function; -use diem_types::vm_status::StatusCode; +use aptos_transaction_builder::experimental_stdlib::encode_create_account_script_function; +use aptos_types::vm_status::StatusCode; use language_e2e_tests::{account::Account, current_function_name, executor::FakeExecutor}; // Make sure we can start the experimental genesis @@ -18,7 +18,7 @@ fn experimental_genesis_execute_txn_successful() { executor.set_golden_file(current_function_name!()); let new_account = executor.create_raw_account(); let new_new_account = executor.create_raw_account(); - let dr_account = Account::new_diem_root(); + let dr_account = Account::new_aptos_root(); let txn = dr_account .transaction() .payload(encode_create_account_script_function( diff --git a/diem-move/e2e-testsuite/src/tests/failed_transaction_tests.rs b/aptos-move/e2e-testsuite/src/tests/failed_transaction_tests.rs similarity index 91% rename from diem-move/e2e-testsuite/src/tests/failed_transaction_tests.rs rename to aptos-move/e2e-testsuite/src/tests/failed_transaction_tests.rs index f11ddedefab42..001be5961b7bc 100644 --- a/diem-move/e2e-testsuite/src/tests/failed_transaction_tests.rs +++ b/aptos-move/e2e-testsuite/src/tests/failed_transaction_tests.rs @@ -1,9 +1,9 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_state_view::StateView; -use diem_types::vm_status::{KeptVMStatus, StatusCode, VMStatus}; -use diem_vm::{ +use aptos_state_view::StateView; +use aptos_types::vm_status::{KeptVMStatus, StatusCode, VMStatus}; +use aptos_vm::{ data_cache::StateViewCache, logging::AdapterLogSchema, transaction_metadata::TransactionMetadata, DiemVM, }; @@ -22,7 +22,7 @@ fn failed_transaction_cleanup_test() { executor.add_account_data(&sender); let log_context = AdapterLogSchema::new(executor.get_state_view().id(), 0); - let diem_vm = DiemVM::new(executor.get_state_view()); + let aptos_vm = DiemVM::new(executor.get_state_view()); let data_cache = StateViewCache::new(executor.get_state_view()); let txn_data = TransactionMetadata { @@ -37,7 +37,7 @@ fn failed_transaction_cleanup_test() { let mut gas_status = GasStatus::new(&gas_schedule, GasUnits::new(10_000)); // TYPE_MISMATCH should be kept and charged. - let out1 = diem_vm.failed_transaction_cleanup( + let out1 = aptos_vm.failed_transaction_cleanup( VMStatus::Error(StatusCode::TYPE_MISMATCH), &mut gas_status, &txn_data, @@ -55,7 +55,7 @@ fn failed_transaction_cleanup_test() { ); // Invariant violations should be discarded and not charged. - let out2 = diem_vm.failed_transaction_cleanup( + let out2 = aptos_vm.failed_transaction_cleanup( VMStatus::Error(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR), &mut gas_status, &txn_data, diff --git a/diem-move/e2e-testsuite/src/tests/genesis.rs b/aptos-move/e2e-testsuite/src/tests/genesis.rs similarity index 94% rename from diem-move/e2e-testsuite/src/tests/genesis.rs rename to aptos-move/e2e-testsuite/src/tests/genesis.rs index 685b62fa9f310..d494427821f7b 100644 --- a/diem-move/e2e-testsuite/src/tests/genesis.rs +++ b/aptos-move/e2e-testsuite/src/tests/genesis.rs @@ -1,7 +1,7 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_types::transaction::{Transaction, TransactionStatus, WriteSetPayload}; +use aptos_types::transaction::{Transaction, TransactionStatus, WriteSetPayload}; use language_e2e_tests::{ common_transactions::peer_to_peer_txn, data_store::GENESIS_CHANGE_SET, executor::FakeExecutor, }; diff --git a/diem-move/e2e-testsuite/src/tests/genesis_initializations.rs b/aptos-move/e2e-testsuite/src/tests/genesis_initializations.rs similarity index 72% rename from diem-move/e2e-testsuite/src/tests/genesis_initializations.rs rename to aptos-move/e2e-testsuite/src/tests/genesis_initializations.rs index 4aacb2ed43560..f789e0986d12c 100644 --- a/diem-move/e2e-testsuite/src/tests/genesis_initializations.rs +++ b/aptos-move/e2e-testsuite/src/tests/genesis_initializations.rs @@ -1,7 +1,7 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_types::account_config; +use aptos_types::account_config; use language_e2e_tests::executor::FakeExecutor; use move_core_types::{ account_address::AccountAddress, @@ -9,7 +9,7 @@ use move_core_types::{ }; #[test] -fn test_diem_initialize() { +fn test_aptos_initialize() { let mut executor = FakeExecutor::stdlib_only_genesis(); // DR doesn't have role yet, so role check will fail @@ -17,9 +17,9 @@ fn test_diem_initialize() { "Diem", "initialize", vec![], - serialize_values(&vec![ - MoveValue::Signer(account_config::diem_root_address()), - ]), + serialize_values(&vec![MoveValue::Signer( + account_config::aptos_root_address(), + )]), ); assert_eq!(output.unwrap_err().move_abort_code(), Some(5)); @@ -28,9 +28,9 @@ fn test_diem_initialize() { "Roles", "grant_diem_root_role", vec![], - serialize_values(&vec![ - MoveValue::Signer(account_config::diem_root_address()), - ]), + serialize_values(&vec![MoveValue::Signer( + account_config::aptos_root_address(), + )]), ); // Now initialize, it should all succeed. @@ -38,9 +38,9 @@ fn test_diem_initialize() { "Diem", "initialize", vec![], - serialize_values(&vec![ - MoveValue::Signer(account_config::diem_root_address()), - ]), + serialize_values(&vec![MoveValue::Signer( + account_config::aptos_root_address(), + )]), ); // Second time you try though you'll get an already published error with EMODIFY_CAPABILITY @@ -49,16 +49,16 @@ fn test_diem_initialize() { "Diem", "initialize", vec![], - serialize_values(&vec![ - MoveValue::Signer(account_config::diem_root_address()), - ]), + serialize_values(&vec![MoveValue::Signer( + account_config::aptos_root_address(), + )]), ); assert_eq!(output.unwrap_err().move_abort_code(), Some(262)); } #[test] -fn test_diem_initialize_tc_account() { +fn test_aptos_initialize_tc_account() { let mut executor = FakeExecutor::stdlib_only_genesis(); // DR doesn't have role yet, so role check will fail @@ -66,9 +66,9 @@ fn test_diem_initialize_tc_account() { "Diem", "initialize", vec![], - serialize_values(&vec![ - MoveValue::Signer(account_config::diem_root_address()), - ]), + serialize_values(&vec![MoveValue::Signer( + account_config::aptos_root_address(), + )]), ); assert_eq!(output.unwrap_err().move_abort_code(), Some(5)); @@ -77,9 +77,9 @@ fn test_diem_initialize_tc_account() { "Roles", "grant_diem_root_role", vec![], - serialize_values(&vec![ - MoveValue::Signer(account_config::diem_root_address()), - ]), + serialize_values(&vec![MoveValue::Signer( + account_config::aptos_root_address(), + )]), ); // Grant the TC role @@ -89,7 +89,7 @@ fn test_diem_initialize_tc_account() { vec![], serialize_values(&vec![ MoveValue::Signer(account_config::treasury_compliance_account_address()), - MoveValue::Signer(account_config::diem_root_address()), + MoveValue::Signer(account_config::aptos_root_address()), ]), ); @@ -110,9 +110,9 @@ fn test_diem_initialize_tc_account() { "Diem", "initialize", vec![], - serialize_values(&vec![ - MoveValue::Signer(account_config::diem_root_address()), - ]), + serialize_values(&vec![MoveValue::Signer( + account_config::aptos_root_address(), + )]), ); // Second time you try though you'll get an already published error with EMODIFY_CAPABILITY @@ -147,18 +147,18 @@ fn test_diem_timestamp_time_has_started() { "DiemTimestamp", "set_time_has_started", vec![], - serialize_values(&vec![ - MoveValue::Signer(account_config::diem_root_address()), - ]), + serialize_values(&vec![MoveValue::Signer( + account_config::aptos_root_address(), + )]), ); let output = executor.try_exec( "DiemTimestamp", "set_time_has_started", vec![], - serialize_values(&vec![ - MoveValue::Signer(account_config::diem_root_address()), - ]), + serialize_values(&vec![MoveValue::Signer( + account_config::aptos_root_address(), + )]), ); assert_eq!(output.unwrap_err().move_abort_code(), Some(1)); @@ -172,18 +172,18 @@ fn test_diem_block_double_init() { "DiemBlock", "initialize_block_metadata", vec![], - serialize_values(&vec![ - MoveValue::Signer(account_config::diem_root_address()), - ]), + serialize_values(&vec![MoveValue::Signer( + account_config::aptos_root_address(), + )]), ); let output = executor.try_exec( "DiemBlock", "initialize_block_metadata", vec![], - serialize_values(&vec![ - MoveValue::Signer(account_config::diem_root_address()), - ]), + serialize_values(&vec![MoveValue::Signer( + account_config::aptos_root_address(), + )]), ); assert_eq!(output.unwrap_err().move_abort_code(), Some(6)); diff --git a/diem-move/e2e-testsuite/src/tests/mint.rs b/aptos-move/e2e-testsuite/src/tests/mint.rs similarity index 99% rename from diem-move/e2e-testsuite/src/tests/mint.rs rename to aptos-move/e2e-testsuite/src/tests/mint.rs index 9c8b34d69f280..63d3ff41ef784 100644 --- a/diem-move/e2e-testsuite/src/tests/mint.rs +++ b/aptos-move/e2e-testsuite/src/tests/mint.rs @@ -1,8 +1,8 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_transaction_builder::stdlib::*; -use diem_types::{ +use aptos_transaction_builder::stdlib::*; +use aptos_types::{ account_config, transaction::TransactionStatus, vm_status::{known_locations, KeptVMStatus}, diff --git a/diem-move/e2e-testsuite/src/tests/mod.rs b/aptos-move/e2e-testsuite/src/tests/mod.rs similarity index 100% rename from diem-move/e2e-testsuite/src/tests/mod.rs rename to aptos-move/e2e-testsuite/src/tests/mod.rs diff --git a/diem-move/e2e-testsuite/src/tests/module_publishing.rs b/aptos-move/e2e-testsuite/src/tests/module_publishing.rs similarity index 99% rename from diem-move/e2e-testsuite/src/tests/module_publishing.rs rename to aptos-move/e2e-testsuite/src/tests/module_publishing.rs index bd3f00cb37d2f..dce77a8a11205 100644 --- a/diem-move/e2e-testsuite/src/tests/module_publishing.rs +++ b/aptos-move/e2e-testsuite/src/tests/module_publishing.rs @@ -1,7 +1,7 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_types::{ +use aptos_types::{ account_config::{self}, on_chain_config::VMPublishingOption, transaction::TransactionStatus, @@ -306,7 +306,7 @@ pub fn test_publishing_no_modules_non_allowlist_script_proper_sender() { executor.set_golden_file(current_function_name!()); // create a transaction trying to publish a new module. - let sender = Account::new_diem_root(); + let sender = Account::new_aptos_root(); let program = String::from( " @@ -335,7 +335,7 @@ pub fn test_publishing_no_modules_proper_sender() { executor.set_golden_file(current_function_name!()); // create a transaction trying to publish a new module. - let sender = Account::new_diem_root(); + let sender = Account::new_aptos_root(); let program = String::from( " diff --git a/diem-move/e2e-testsuite/src/tests/multi_agent.rs b/aptos-move/e2e-testsuite/src/tests/multi_agent.rs similarity index 99% rename from diem-move/e2e-testsuite/src/tests/multi_agent.rs rename to aptos-move/e2e-testsuite/src/tests/multi_agent.rs index 30d1ddf3842a6..b4fdb7d38bff7 100644 --- a/diem-move/e2e-testsuite/src/tests/multi_agent.rs +++ b/aptos-move/e2e-testsuite/src/tests/multi_agent.rs @@ -3,8 +3,8 @@ //! Tests for multi-agent transactions. -use diem_transaction_builder::stdlib::*; -use diem_types::{ +use aptos_transaction_builder::stdlib::*; +use aptos_types::{ account_config, test_helpers::transaction_test_helpers, transaction::TransactionStatus, vm_status::KeptVMStatus, }; diff --git a/diem-move/e2e-testsuite/src/tests/on_chain_configs.rs b/aptos-move/e2e-testsuite/src/tests/on_chain_configs.rs similarity index 98% rename from diem-move/e2e-testsuite/src/tests/on_chain_configs.rs rename to aptos-move/e2e-testsuite/src/tests/on_chain_configs.rs index 9c52432ab3a26..b22aa2c7bec4e 100644 --- a/diem-move/e2e-testsuite/src/tests/on_chain_configs.rs +++ b/aptos-move/e2e-testsuite/src/tests/on_chain_configs.rs @@ -1,15 +1,15 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_framework_releases::legacy::transaction_scripts::LegacyStdlibScript; -use diem_transaction_builder::stdlib::encode_update_dual_attestation_limit_script; -use diem_types::{ +use aptos_transaction_builder::stdlib::encode_update_dual_attestation_limit_script; +use aptos_types::{ account_config::CORE_CODE_ADDRESS, on_chain_config::DiemVersion, transaction::{Script, ScriptFunction, TransactionArgument, TransactionStatus}, vm_status::{KeptVMStatus, StatusCode}, }; -use diem_vm::DiemVM; +use aptos_vm::DiemVM; +use diem_framework_releases::legacy::transaction_scripts::LegacyStdlibScript; use language_e2e_tests::{ account::{self, Account}, assert_prologue_parity, @@ -148,7 +148,7 @@ fn update_script_allow_list() { // create a FakeExecutor with a genesis from file let mut executor = FakeExecutor::allowlist_genesis(); executor.set_golden_file(current_function_name!()); - let dr = Account::new_diem_root(); + let dr = Account::new_aptos_root(); // create and publish a sender with 5_000_000 coins and a receiver with 0 coins let sender = executor.create_raw_account_data(5_000_000, 10); executor.add_account_data(&sender); diff --git a/diem-move/e2e-testsuite/src/tests/parallel_execution.rs b/aptos-move/e2e-testsuite/src/tests/parallel_execution.rs similarity index 93% rename from diem-move/e2e-testsuite/src/tests/parallel_execution.rs rename to aptos-move/e2e-testsuite/src/tests/parallel_execution.rs index 23867789e45aa..7daf872d544ce 100644 --- a/diem-move/e2e-testsuite/src/tests/parallel_execution.rs +++ b/aptos-move/e2e-testsuite/src/tests/parallel_execution.rs @@ -2,10 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 use crate::tests::peer_to_peer::{check_and_apply_transfer_output, create_cyclic_transfers}; -use diem_crypto::{ed25519::Ed25519PrivateKey, HashValue, PrivateKey, Uniform}; -use diem_framework_releases::current_modules; -use diem_parallel_executor::errors::Error; -use diem_types::{ +use aptos_crypto::{ed25519::Ed25519PrivateKey, HashValue, PrivateKey, Uniform}; +use aptos_parallel_executor::errors::Error; +use aptos_types::{ block_metadata::BlockMetadata, on_chain_config::{OnChainConfig, ParallelExecutionConfig, ValidatorSet}, transaction::{ @@ -14,8 +13,9 @@ use diem_types::{ }, vm_status::{KeptVMStatus, StatusCode}, }; -use diem_vm::{parallel_executor::ParallelDiemVM, read_write_set_analysis::add_on_functions_list}; -use diem_writeset_generator::encode_initialize_parallel_execution; +use aptos_vm::{parallel_executor::ParallelDiemVM, read_write_set_analysis::add_on_functions_list}; +use aptos_writeset_generator::encode_initialize_parallel_execution; +use diem_framework_releases::current_modules; use language_e2e_tests::{account, common_transactions::rotate_key_txn, executor::FakeExecutor}; use move_ir_compiler::Compiler; use read_write_set::analyze; @@ -196,13 +196,13 @@ fn parallel_execution_genesis() { fn parallel_config_sequential_check() { let mut executor = FakeExecutor::from_fresh_genesis(); - let diem_root = account::Account::new_diem_root(); + let aptos_root = account::Account::new_aptos_root(); let seq_num = executor - .read_account_resource_at_address(diem_root.address()) + .read_account_resource_at_address(aptos_root.address()) .unwrap() .sequence_number(); - let txn = diem_root + let txn = aptos_root .transaction() .write_set(encode_initialize_parallel_execution()) .sequence_number(seq_num) @@ -251,9 +251,9 @@ fn parallel_execution_with_bad_config() { // insert a block prologue transaction let (txns_info, transfer_txns) = create_cyclic_transfers(&executor, &accounts, transfer_amount); - let diem_root = account::Account::new_diem_root(); + let aptos_root = account::Account::new_aptos_root(); let seq_num = executor - .read_account_resource_at_address(diem_root.address()) + .read_account_resource_at_address(aptos_root.address()) .unwrap() .sequence_number(); @@ -276,7 +276,7 @@ label b0: compiler.into_script_blob(code).expect("Failed to compile") }; - let txn = diem_root + let txn = aptos_root .transaction() .write_set(WriteSetPayload::Script { script: Script::new( @@ -284,7 +284,7 @@ label b0: vec![], vec![TransactionArgument::U8Vector(vec![])], ), - execute_as: *diem_root.address(), + execute_as: *aptos_root.address(), }) .sequence_number(seq_num) .sign(); diff --git a/diem-move/e2e-testsuite/src/tests/peer_to_peer.rs b/aptos-move/e2e-testsuite/src/tests/peer_to_peer.rs similarity index 99% rename from diem-move/e2e-testsuite/src/tests/peer_to_peer.rs rename to aptos-move/e2e-testsuite/src/tests/peer_to_peer.rs index 560d4e5a4bc21..05029b2f015e8 100644 --- a/diem-move/e2e-testsuite/src/tests/peer_to_peer.rs +++ b/aptos-move/e2e-testsuite/src/tests/peer_to_peer.rs @@ -1,7 +1,7 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_types::{ +use aptos_types::{ account_config::{ReceivedPaymentEvent, SentPaymentEvent}, transaction::{SignedTransaction, TransactionOutput, TransactionStatus}, vm_status::{known_locations, KeptVMStatus}, @@ -17,7 +17,7 @@ use std::{convert::TryFrom, time::Instant}; #[test] fn single_peer_to_peer_with_event() { - ::diem_logger::Logger::init_for_testing(); + ::aptos_logger::Logger::init_for_testing(); test_with_different_versions! {CURRENT_RELEASE_VERSIONS, |test_env| { let mut executor = test_env.executor; // create and publish a sender with 1_000_000 coins and a receiver with 100_000 coins @@ -77,7 +77,7 @@ fn single_peer_to_peer_with_event() { // new scripts take an owned signer // #[test] // fn single_peer_to_peer_with_padding() { -// ::diem_logger::Logger::init_for_testing(); +// ::aptos_logger::Logger::init_for_testing(); // // create a FakeExecutor with a genesis from file // let mut executor = // FakeExecutor::from_genesis_with_options(VMPublishingOption::custom_scripts()); diff --git a/diem-move/e2e-testsuite/src/tests/rotate_key.rs b/aptos-move/e2e-testsuite/src/tests/rotate_key.rs similarity index 98% rename from diem-move/e2e-testsuite/src/tests/rotate_key.rs rename to aptos-move/e2e-testsuite/src/tests/rotate_key.rs index d52e9e94924de..32d728b26d661 100644 --- a/diem-move/e2e-testsuite/src/tests/rotate_key.rs +++ b/aptos-move/e2e-testsuite/src/tests/rotate_key.rs @@ -1,13 +1,13 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_crypto::{ +use aptos_crypto::{ ed25519::Ed25519PrivateKey, multi_ed25519::{MultiEd25519PublicKey, MultiEd25519Signature}, PrivateKey, SigningKey, Uniform, }; -use diem_keygen::KeyGen; -use diem_types::{ +use aptos_keygen::KeyGen; +use aptos_types::{ transaction::{authenticator::AuthenticationKey, SignedTransaction, TransactionStatus}, vm_status::{KeptVMStatus, StatusCode}, }; diff --git a/diem-move/e2e-testsuite/src/tests/scripts.rs b/aptos-move/e2e-testsuite/src/tests/scripts.rs similarity index 99% rename from diem-move/e2e-testsuite/src/tests/scripts.rs rename to aptos-move/e2e-testsuite/src/tests/scripts.rs index 102c8da98fdb3..6769498ac0cfa 100644 --- a/diem-move/e2e-testsuite/src/tests/scripts.rs +++ b/aptos-move/e2e-testsuite/src/tests/scripts.rs @@ -1,7 +1,7 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_types::{ +use aptos_types::{ account_address::AccountAddress, account_config, on_chain_config::VMPublishingOption, diff --git a/diem-move/e2e-testsuite/src/tests/transaction_builder.rs b/aptos-move/e2e-testsuite/src/tests/transaction_builder.rs similarity index 99% rename from diem-move/e2e-testsuite/src/tests/transaction_builder.rs rename to aptos-move/e2e-testsuite/src/tests/transaction_builder.rs index 557a4fa821287..0df7ac7e952ce 100644 --- a/diem-move/e2e-testsuite/src/tests/transaction_builder.rs +++ b/aptos-move/e2e-testsuite/src/tests/transaction_builder.rs @@ -8,10 +8,10 @@ #![forbid(unsafe_code)] -use diem_crypto::{ed25519::Ed25519PrivateKey, traits::SigningKey, PrivateKey, Uniform}; -use diem_keygen::KeyGen; -use diem_transaction_builder::stdlib::*; -use diem_types::{ +use aptos_crypto::{ed25519::Ed25519PrivateKey, traits::SigningKey, PrivateKey, Uniform}; +use aptos_keygen::KeyGen; +use aptos_transaction_builder::stdlib::*; +use aptos_types::{ account_address::AccountAddress, account_config, transaction::{ @@ -1173,7 +1173,7 @@ fn add_child_currencies() { let vasp_b_child1 = executor.create_raw_account(); let vasp_b_child2 = executor.create_raw_account(); let blessed = Account::new_blessed_tc(); - let dr_account = Account::new_diem_root(); + let dr_account = Account::new_aptos_root(); let tc_sequence_number = 0; currencies::add_currency_to_system(&mut executor, "COIN", &dr_account, 0); diff --git a/diem-move/e2e-testsuite/src/tests/transaction_fees.rs b/aptos-move/e2e-testsuite/src/tests/transaction_fees.rs similarity index 96% rename from diem-move/e2e-testsuite/src/tests/transaction_fees.rs rename to aptos-move/e2e-testsuite/src/tests/transaction_fees.rs index ce0866609ec0a..cf9b7506a4624 100644 --- a/diem-move/e2e-testsuite/src/tests/transaction_fees.rs +++ b/aptos-move/e2e-testsuite/src/tests/transaction_fees.rs @@ -1,14 +1,14 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_crypto::{ed25519::Ed25519PrivateKey, PrivateKey, Uniform}; -use diem_framework_releases::legacy::transaction_scripts::LegacyStdlibScript; -use diem_transaction_builder::stdlib::*; -use diem_types::{ +use aptos_crypto::{ed25519::Ed25519PrivateKey, PrivateKey, Uniform}; +use aptos_transaction_builder::stdlib::*; +use aptos_types::{ account_config::{self, BurnEvent, XUS_NAME}, transaction::{authenticator::AuthenticationKey, Script, TransactionArgument}, vm_status::KeptVMStatus, }; +use diem_framework_releases::legacy::transaction_scripts::LegacyStdlibScript; use language_e2e_tests::{test_with_different_versions, versioning::CURRENT_RELEASE_VERSIONS}; use move_core_types::{ identifier::Identifier, diff --git a/diem-move/e2e-testsuite/src/tests/transaction_fuzzer.rs b/aptos-move/e2e-testsuite/src/tests/transaction_fuzzer.rs similarity index 93% rename from diem-move/e2e-testsuite/src/tests/transaction_fuzzer.rs rename to aptos-move/e2e-testsuite/src/tests/transaction_fuzzer.rs index fc23653afdc38..bf72d3d28a8a7 100644 --- a/diem-move/e2e-testsuite/src/tests/transaction_fuzzer.rs +++ b/aptos-move/e2e-testsuite/src/tests/transaction_fuzzer.rs @@ -1,9 +1,9 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 +use aptos_transaction_builder::stdlib::{encode_create_parent_vasp_account_script, ScriptCall}; +use aptos_types::account_config; use diem_framework_releases::legacy::transaction_scripts::LegacyStdlibScript; -use diem_transaction_builder::stdlib::{encode_create_parent_vasp_account_script, ScriptCall}; -use diem_types::account_config; use language_e2e_tests::{ account::{self, Account}, executor::FakeExecutor, @@ -19,7 +19,7 @@ proptest! { ) { let executor = FakeExecutor::from_genesis_file(); let accounts = vec![ - (Account::new_diem_root(), 0), + (Account::new_aptos_root(), 0), (Account::new_blessed_tc(), 0), ]; let num_accounts = accounts.len(); @@ -43,13 +43,13 @@ proptest! { ) { let mut executor = FakeExecutor::from_genesis_file(); let mut accounts = vec![]; - let diem_root = Account::new_diem_root(); + let aptos_root = Account::new_aptos_root(); let coins = vec![account::xus_currency_code()]; // Create a number of accounts for i in 0..10 { let account = executor.create_raw_account(); executor.execute_and_apply( - diem_root + aptos_root .transaction() .script(encode_create_parent_vasp_account_script( account_config::type_tag_for_currency_code(coins[i % coins.len()].clone()), diff --git a/diem-move/e2e-testsuite/src/tests/validator_set_management.rs b/aptos-move/e2e-testsuite/src/tests/validator_set_management.rs similarity index 96% rename from diem-move/e2e-testsuite/src/tests/validator_set_management.rs rename to aptos-move/e2e-testsuite/src/tests/validator_set_management.rs index 033598986452a..ec96a938dfebd 100644 --- a/diem-move/e2e-testsuite/src/tests/validator_set_management.rs +++ b/aptos-move/e2e-testsuite/src/tests/validator_set_management.rs @@ -1,8 +1,8 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_transaction_builder::stdlib::*; -use diem_types::{ +use aptos_transaction_builder::stdlib::*; +use aptos_types::{ on_chain_config::{new_epoch_event_key, VMPublishingOption}, transaction::{TransactionOutput, TransactionStatus, WriteSetPayload}, vm_status::KeptVMStatus, @@ -21,14 +21,14 @@ fn assert_aborted_with(output: TransactionOutput, error_code: u64) { fn try_add_validator( executor: &mut FakeExecutor, - diem_root_account: &Account, + aptos_root_account: &Account, dr_seqno: u64, ) -> TransactionOutput { let validator_account = executor.create_raw_account(); let operator_account = executor.create_raw_account(); executor.execute_and_apply( - diem_root_account + aptos_root_account .transaction() .script(encode_create_validator_account_script( 0, @@ -40,7 +40,7 @@ fn try_add_validator( .sign(), ); executor.execute_and_apply( - diem_root_account + aptos_root_account .transaction() .script(encode_create_validator_operator_account_script( 0, @@ -83,7 +83,7 @@ fn try_add_validator( ); executor.execute_transaction( - diem_root_account + aptos_root_account .transaction() .script(encode_add_validator_and_reconfigure_script( 2, @@ -125,7 +125,7 @@ fn validator_add_max_number() { executor.set_golden_file(current_function_name!()); - let output = try_add_validator(&mut executor, &Account::new_diem_root(), 0); + let output = try_add_validator(&mut executor, &Account::new_aptos_root(), 0); assert_aborted_with(output, 1800); } @@ -134,12 +134,12 @@ fn validator_add_max_number() { fn validator_rotate_key_and_reconfigure() { test_with_different_versions! {CURRENT_RELEASE_VERSIONS, |test_env| { let mut executor = test_env.executor; - let diem_root_account = test_env.dr_account; + let aptos_root_account = test_env.dr_account; let validator_account = executor.create_raw_account(); let validator_operator = executor.create_raw_account(); executor.execute_and_apply( - diem_root_account + aptos_root_account .transaction() .script(encode_create_validator_account_script( 0, @@ -152,7 +152,7 @@ fn validator_rotate_key_and_reconfigure() { ); executor.execute_and_apply( - diem_root_account + aptos_root_account .transaction() .script(encode_create_validator_operator_account_script( 0, @@ -200,7 +200,7 @@ fn validator_rotate_key_and_reconfigure() { ); let output = executor.execute_and_apply( - diem_root_account + aptos_root_account .transaction() .script(encode_add_validator_and_reconfigure_script( 2, @@ -256,14 +256,14 @@ fn validator_rotate_key_and_reconfigure() { fn validator_set_operator_set_key_reconfigure() { test_with_different_versions! {CURRENT_RELEASE_VERSIONS, |test_env| { let mut executor = test_env.executor; - let diem_root_account = test_env.dr_account; + let aptos_root_account = test_env.dr_account; let validator_account = executor.create_raw_account(); let operator_account_0 = executor.create_raw_account(); let operator_account_1 = executor.create_raw_account(); // Create operator 0 let output = executor.execute_and_apply( - diem_root_account + aptos_root_account .transaction() .script(encode_create_validator_operator_account_script( 0, @@ -282,7 +282,7 @@ fn validator_set_operator_set_key_reconfigure() { // Create operator 1 let output = executor.execute_and_apply( - diem_root_account + aptos_root_account .transaction() .script(encode_create_validator_operator_account_script( 0, @@ -301,7 +301,7 @@ fn validator_set_operator_set_key_reconfigure() { // Create validator 0 let output = executor.execute_and_apply( - diem_root_account + aptos_root_account .transaction() .script(encode_create_validator_account_script( 0, @@ -324,7 +324,7 @@ fn validator_set_operator_set_key_reconfigure() { b"operator_1".to_vec(), *operator_account_1.address(), ); - let txn = diem_root_account + let txn = aptos_root_account .transaction() .write_set(WriteSetPayload::Script { script: admin_script, @@ -380,7 +380,7 @@ fn validator_set_operator_set_key_reconfigure() { ); let output = executor.execute_and_apply( - diem_root_account + aptos_root_account .transaction() .script(encode_add_validator_and_reconfigure_script( 3, diff --git a/diem-move/e2e-testsuite/src/tests/vasps.rs b/aptos-move/e2e-testsuite/src/tests/vasps.rs similarity index 97% rename from diem-move/e2e-testsuite/src/tests/vasps.rs rename to aptos-move/e2e-testsuite/src/tests/vasps.rs index f4210cbbfbac2..fd26b323b1583 100644 --- a/diem-move/e2e-testsuite/src/tests/vasps.rs +++ b/aptos-move/e2e-testsuite/src/tests/vasps.rs @@ -3,9 +3,9 @@ #![forbid(unsafe_code)] -use diem_crypto::{ed25519::Ed25519PrivateKey, PrivateKey, Uniform}; -use diem_transaction_builder::stdlib::*; -use diem_types::{ +use aptos_crypto::{ed25519::Ed25519PrivateKey, PrivateKey, Uniform}; +use aptos_transaction_builder::stdlib::*; +use aptos_types::{ account_config, transaction::{authenticator::AuthenticationKey, TransactionStatus}, vm_status::KeptVMStatus, diff --git a/diem-move/e2e-testsuite/src/tests/verify_txn.rs b/aptos-move/e2e-testsuite/src/tests/verify_txn.rs similarity index 99% rename from diem-move/e2e-testsuite/src/tests/verify_txn.rs rename to aptos-move/e2e-testsuite/src/tests/verify_txn.rs index 1b74a6ec0c37c..771d8634e8ba6 100644 --- a/diem-move/e2e-testsuite/src/tests/verify_txn.rs +++ b/aptos-move/e2e-testsuite/src/tests/verify_txn.rs @@ -1,17 +1,16 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_crypto::{ +use aptos_crypto::{ ed25519::{Ed25519PrivateKey, Ed25519PublicKey}, multi_ed25519::{MultiEd25519PrivateKey, MultiEd25519PublicKey}, PrivateKey, SigningKey, Uniform, }; -use diem_framework_releases::legacy::transaction_scripts::LegacyStdlibScript; -use diem_keygen::KeyGen; -use diem_transaction_builder::{ +use aptos_keygen::KeyGen; +use aptos_transaction_builder::{ stdlib as transaction_builder, stdlib::encode_peer_to_peer_with_metadata_script, }; -use diem_types::{ +use aptos_types::{ account_address::AccountAddress, account_config, chain_id::ChainId, @@ -24,6 +23,7 @@ use diem_types::{ }, vm_status::{KeptVMStatus, StatusCode}, }; +use diem_framework_releases::legacy::transaction_scripts::LegacyStdlibScript; use language_e2e_tests::{ account::Account, assert_prologue_disparity, assert_prologue_parity, @@ -772,7 +772,7 @@ pub fn test_arbitrary_script_execution() { } #[test] -pub fn test_publish_from_diem_root() { +pub fn test_publish_from_aptos_root() { // create a FakeExecutor with a genesis from file let mut executor = FakeExecutor::from_genesis_with_options(VMPublishingOption::custom_scripts()); @@ -975,14 +975,14 @@ fn verify_max_sequence_number() { } #[test] -pub fn test_no_publishing_diem_root_sender() { +pub fn test_no_publishing_aptos_root_sender() { // create a FakeExecutor with a genesis from file let mut executor = FakeExecutor::from_genesis_with_options(VMPublishingOption::custom_scripts()); executor.set_golden_file(current_function_name!()); // create a transaction trying to publish a new module. - let sender = Account::new_diem_root(); + let sender = Account::new_aptos_root(); let module = String::from( " @@ -1254,7 +1254,7 @@ fn test_module_dependency_fails_verification() { executor.add_account_data(&sender); let good_module = { let (_, serialized_module) = good_module_uses_bad(*sender.address(), bad_module); - diem_types::transaction::Module::new(serialized_module) + aptos_types::transaction::Module::new(serialized_module) }; let txn = sender @@ -1414,7 +1414,7 @@ fn test_module_transitive_dependency_fails_verification() { let compiler = Compiler { deps: vec![&good_module], }; - diem_types::transaction::Module::new( + aptos_types::transaction::Module::new( compiler .into_module_blob(module_code.as_str()) .expect("Module compilation failed"), @@ -1538,7 +1538,7 @@ pub fn publish_and_register_new_currency() { executor.set_golden_file(current_function_name!()); // create a transaction trying to publish a new module. - let sender = Account::new_diem_root(); + let sender = Account::new_aptos_root(); let tc_account = Account::new_blessed_tc(); let module = r#" diff --git a/diem-move/e2e-testsuite/src/tests/write_set.rs b/aptos-move/e2e-testsuite/src/tests/write_set.rs similarity index 97% rename from diem-move/e2e-testsuite/src/tests/write_set.rs rename to aptos-move/e2e-testsuite/src/tests/write_set.rs index 80babb255c734..484ad181a7d51 100644 --- a/diem-move/e2e-testsuite/src/tests/write_set.rs +++ b/aptos-move/e2e-testsuite/src/tests/write_set.rs @@ -1,8 +1,8 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_crypto::{ed25519::Ed25519PrivateKey, PrivateKey, Uniform}; -use diem_types::{ +use aptos_crypto::{ed25519::Ed25519PrivateKey, PrivateKey, Uniform}; +use aptos_types::{ access_path::AccessPath, account_config::{xus_tag, CORE_CODE_ADDRESS}, chain_id::{ChainId, NamedChain}, @@ -88,7 +88,7 @@ fn verify_and_execute_writeset() { executor.apply_write_set(output.write_set()); - let updated_diem_root_account = executor + let updated_aptos_root_account = executor .read_account_resource(&genesis_account) .expect("sender must exist"); let updated_sender = executor @@ -98,7 +98,7 @@ fn verify_and_execute_writeset() { .read_balance_resource(new_account_data.account(), account::xus_currency_code()) .expect("sender balance must exist"); - assert_eq!(test_env.dr_sequence_number.checked_add(1).unwrap(), updated_diem_root_account.sequence_number()); + assert_eq!(test_env.dr_sequence_number.checked_add(1).unwrap(), updated_aptos_root_account.sequence_number()); assert_eq!(0, updated_sender_balance.coin()); assert_eq!(10, updated_sender.sequence_number()); @@ -326,7 +326,7 @@ fn transfer_and_execute_writeset() { executor.apply_write_set(output.write_set()); - let updated_diem_root_account = executor + let updated_aptos_root_account = executor .read_account_resource(&genesis_account) .expect("sender must exist"); let updated_sender = executor @@ -336,7 +336,7 @@ fn transfer_and_execute_writeset() { .read_balance_resource(new_account_data.account(), account::xus_currency_code()) .expect("sender balance must exist"); - assert_eq!(test_env.dr_sequence_number.checked_add(1).unwrap(), updated_diem_root_account.sequence_number()); + assert_eq!(test_env.dr_sequence_number.checked_add(1).unwrap(), updated_aptos_root_account.sequence_number()); assert_eq!(0, updated_sender_balance.coin()); assert_eq!(10, updated_sender.sequence_number()); diff --git a/diem-move/e2e-testsuite/src/tests/writeset_builder.rs b/aptos-move/e2e-testsuite/src/tests/writeset_builder.rs similarity index 94% rename from diem-move/e2e-testsuite/src/tests/writeset_builder.rs rename to aptos-move/e2e-testsuite/src/tests/writeset_builder.rs index 7bc9290d41c0f..6ccb29b0b4485 100644 --- a/diem-move/e2e-testsuite/src/tests/writeset_builder.rs +++ b/aptos-move/e2e-testsuite/src/tests/writeset_builder.rs @@ -1,14 +1,14 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_types::{ +use aptos_types::{ access_path::AccessPath, on_chain_config::DiemVersion, transaction::{ChangeSet, Script, TransactionStatus, WriteSetPayload}, vm_status::KeptVMStatus, write_set::WriteOp, }; -use diem_vm::DiemVM; -use diem_writeset_generator::build_changeset; +use aptos_vm::DiemVM; +use aptos_writeset_generator::build_changeset; use language_e2e_tests::{ account::Account, compile::compile_module, current_function_name, executor::FakeExecutor, }; @@ -20,7 +20,7 @@ fn build_upgrade_writeset() { executor.set_golden_file(current_function_name!()); // create a transaction trying to publish a new module. - let genesis_account = Account::new_diem_root(); + let genesis_account = Account::new_aptos_root(); let program = String::from( " diff --git a/diem-move/genesis-viewer/Cargo.toml b/aptos-move/genesis-viewer/Cargo.toml similarity index 73% rename from diem-move/genesis-viewer/Cargo.toml rename to aptos-move/genesis-viewer/Cargo.toml index 80bc36c4c1022..833d57e4c3815 100644 --- a/diem-move/genesis-viewer/Cargo.toml +++ b/aptos-move/genesis-viewer/Cargo.toml @@ -11,13 +11,13 @@ edition = "2018" [dependencies] bcs = "0.1.2" -diem-types = { path = "../../types" } -diem-workspace-hack = { path = "../../crates/diem-workspace-hack" } +aptos-types = { path = "../../types" } +aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" } move-binary-format = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } move-core-types = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } -diem-resource-viewer = { path = "../diem-resource-viewer"} +aptos-resource-viewer = { path = "../aptos-resource-viewer"} vm-genesis = { path = "../vm-genesis" } -diem-framework-releases = { path = "../../diem-move/diem-framework/DPN/releases" } +diem-framework-releases = { path = "../../aptos-move/diem-framework/DPN/releases" } move-vm-test-utils = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } structopt = "0.3.21" diff --git a/diem-move/genesis-viewer/src/main.rs b/aptos-move/genesis-viewer/src/main.rs similarity index 99% rename from diem-move/genesis-viewer/src/main.rs rename to aptos-move/genesis-viewer/src/main.rs index 4b378e0962e40..33cad5589699b 100644 --- a/diem-move/genesis-viewer/src/main.rs +++ b/aptos-move/genesis-viewer/src/main.rs @@ -1,8 +1,8 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_resource_viewer::DiemValueAnnotator; -use diem_types::{ +use aptos_resource_viewer::DiemValueAnnotator; +use aptos_types::{ access_path::AccessPath, account_address::AccountAddress, contract_event::ContractEvent, diff --git a/diem-move/mvhashmap/Cargo.toml b/aptos-move/mvhashmap/Cargo.toml similarity index 87% rename from diem-move/mvhashmap/Cargo.toml rename to aptos-move/mvhashmap/Cargo.toml index 0ea2a022efc5f..70cfa2d4d50d0 100644 --- a/diem-move/mvhashmap/Cargo.toml +++ b/aptos-move/mvhashmap/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" once_cell = "1.7.2" rayon = "1.5.0" num_cpus = "1.13.0" -diem-workspace-hack = { path = "../../crates/diem-workspace-hack" } +aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" } [dev-dependencies] proptest = "1.0.0" diff --git a/diem-move/mvhashmap/src/lib.rs b/aptos-move/mvhashmap/src/lib.rs similarity index 100% rename from diem-move/mvhashmap/src/lib.rs rename to aptos-move/mvhashmap/src/lib.rs diff --git a/diem-move/mvhashmap/src/unit_tests/mod.rs b/aptos-move/mvhashmap/src/unit_tests/mod.rs similarity index 100% rename from diem-move/mvhashmap/src/unit_tests/mod.rs rename to aptos-move/mvhashmap/src/unit_tests/mod.rs diff --git a/diem-move/mvhashmap/src/unit_tests/proptest_types.rs b/aptos-move/mvhashmap/src/unit_tests/proptest_types.rs similarity index 100% rename from diem-move/mvhashmap/src/unit_tests/proptest_types.rs rename to aptos-move/mvhashmap/src/unit_tests/proptest_types.rs diff --git a/diem-move/parallel-executor/Cargo.toml b/aptos-move/parallel-executor/Cargo.toml similarity index 90% rename from diem-move/parallel-executor/Cargo.toml rename to aptos-move/parallel-executor/Cargo.toml index 1c6fca400023e..39e942214552c 100644 --- a/diem-move/parallel-executor/Cargo.toml +++ b/aptos-move/parallel-executor/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "diem-parallel-executor" +name = "aptos-parallel-executor" version = "0.1.0" authors = ["Diem Association "] description = "Diem parallel transaction executor library" @@ -13,7 +13,7 @@ edition = "2018" [dependencies] mvhashmap = { path = "../mvhashmap" } -diem-workspace-hack = { path = "../../crates/diem-workspace-hack" } +aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" } anyhow = "1.0.52" crossbeam-queue = "0.3.1" diff --git a/diem-move/parallel-executor/benches/scheduler_benches.rs b/aptos-move/parallel-executor/benches/scheduler_benches.rs similarity index 89% rename from diem-move/parallel-executor/benches/scheduler_benches.rs rename to aptos-move/parallel-executor/benches/scheduler_benches.rs index fd2569dbf7624..06e33c1185c5e 100644 --- a/diem-move/parallel-executor/benches/scheduler_benches.rs +++ b/aptos-move/parallel-executor/benches/scheduler_benches.rs @@ -3,7 +3,7 @@ use criterion::{criterion_group, criterion_main, Criterion}; // Run this bencher via `cargo bench --features fuzzing`. -use diem_parallel_executor::proptest_types::bencher::Bencher; +use aptos_parallel_executor::proptest_types::bencher::Bencher; use proptest::prelude::*; // diff --git a/diem-move/parallel-executor/src/errors.rs b/aptos-move/parallel-executor/src/errors.rs similarity index 100% rename from diem-move/parallel-executor/src/errors.rs rename to aptos-move/parallel-executor/src/errors.rs diff --git a/diem-move/parallel-executor/src/executor.rs b/aptos-move/parallel-executor/src/executor.rs similarity index 100% rename from diem-move/parallel-executor/src/executor.rs rename to aptos-move/parallel-executor/src/executor.rs diff --git a/diem-move/parallel-executor/src/lib.rs b/aptos-move/parallel-executor/src/lib.rs similarity index 100% rename from diem-move/parallel-executor/src/lib.rs rename to aptos-move/parallel-executor/src/lib.rs diff --git a/diem-move/parallel-executor/src/outcome_array.rs b/aptos-move/parallel-executor/src/outcome_array.rs similarity index 100% rename from diem-move/parallel-executor/src/outcome_array.rs rename to aptos-move/parallel-executor/src/outcome_array.rs diff --git a/diem-move/parallel-executor/src/proptest_types/bencher.rs b/aptos-move/parallel-executor/src/proptest_types/bencher.rs similarity index 100% rename from diem-move/parallel-executor/src/proptest_types/bencher.rs rename to aptos-move/parallel-executor/src/proptest_types/bencher.rs diff --git a/diem-move/parallel-executor/src/proptest_types/mod.rs b/aptos-move/parallel-executor/src/proptest_types/mod.rs similarity index 100% rename from diem-move/parallel-executor/src/proptest_types/mod.rs rename to aptos-move/parallel-executor/src/proptest_types/mod.rs diff --git a/diem-move/parallel-executor/src/proptest_types/tests.rs b/aptos-move/parallel-executor/src/proptest_types/tests.rs similarity index 100% rename from diem-move/parallel-executor/src/proptest_types/tests.rs rename to aptos-move/parallel-executor/src/proptest_types/tests.rs diff --git a/diem-move/parallel-executor/src/proptest_types/types.rs b/aptos-move/parallel-executor/src/proptest_types/types.rs similarity index 100% rename from diem-move/parallel-executor/src/proptest_types/types.rs rename to aptos-move/parallel-executor/src/proptest_types/types.rs diff --git a/diem-move/parallel-executor/src/scheduler.rs b/aptos-move/parallel-executor/src/scheduler.rs similarity index 100% rename from diem-move/parallel-executor/src/scheduler.rs rename to aptos-move/parallel-executor/src/scheduler.rs diff --git a/diem-move/parallel-executor/src/task.rs b/aptos-move/parallel-executor/src/task.rs similarity index 100% rename from diem-move/parallel-executor/src/task.rs rename to aptos-move/parallel-executor/src/task.rs diff --git a/diem-move/parallel-executor/src/unit_tests/mod.rs b/aptos-move/parallel-executor/src/unit_tests/mod.rs similarity index 100% rename from diem-move/parallel-executor/src/unit_tests/mod.rs rename to aptos-move/parallel-executor/src/unit_tests/mod.rs diff --git a/diem-move/transaction-builder-generator/Cargo.toml b/aptos-move/transaction-builder-generator/Cargo.toml similarity index 87% rename from diem-move/transaction-builder-generator/Cargo.toml rename to aptos-move/transaction-builder-generator/Cargo.toml index 85a759519afa9..d7791597121be 100644 --- a/diem-move/transaction-builder-generator/Cargo.toml +++ b/aptos-move/transaction-builder-generator/Cargo.toml @@ -17,8 +17,8 @@ structopt = "0.3.21" textwrap = "0.13.4" serde_yaml = "0.8.17" -diem-types = { path = "../../types" } -diem-workspace-hack = { path = "../../crates/diem-workspace-hack" } +aptos-types = { path = "../../types" } +aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" } move-core-types = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } serde-reflection = "0.3.5" serde-generate = "0.20.6" diff --git a/diem-move/transaction-builder-generator/README.md b/aptos-move/transaction-builder-generator/README.md similarity index 73% rename from diem-move/transaction-builder-generator/README.md rename to aptos-move/transaction-builder-generator/README.md index 686c79e90137f..e012758188ceb 100644 --- a/diem-move/transaction-builder-generator/README.md +++ b/aptos-move/transaction-builder-generator/README.md @@ -54,44 +54,44 @@ You may browse command line options with `target/debug/generate-transaction-buil NOTE: until the Diem version flag is set to greater than `2` the path used for generating transaction builders should be -`diem-move/diem-framework/legacy/transaction_scripts/abi`. You can query +`aptos-move/diem-framework/legacy/transaction_scripts/abi`. You can query this version number by submitting a `get_metadata` request to the JSON-RPC endpoint. ### Python -To install Python3 modules `serde`, `bcs`, `diem_types`, and `diem_framework` into a target directory `$DEST`, run: +To install Python3 modules `serde`, `bcs`, `aptos_types`, and `diem_framework` into a target directory `$DEST`, run: ```bash target/debug/generate-transaction-builders \ --language python3 \ --module-name diem_framework \ - --with-diem-types "testsuite/generate-format/tests/staged/diem.yaml" \ + --with-aptos-types "testsuite/generate-format/tests/staged/diem.yaml" \ --target-source-dir "$DEST" \ - --with-custom-diem-code diem-move/transaction-builder-generator/examples/python3/custom_diem_code/*.py -- \ - "diem-move/diem-framework/DPN/releases/legacy" \ - "diem-move/diem-framework/DPN/releases/artifacts/current" + --with-custom-aptos-code aptos-move/transaction-builder-generator/examples/python3/custom_aptos_code/*.py -- \ + "aptos-move/diem-framework/DPN/releases/legacy" \ + "aptos-move/diem-framework/DPN/releases/artifacts/current" ``` Next, you may copy and execute the [Python demo file](examples/python3/stdlib_demo.py) with: ```bash -cp diem-move/transaction-builder-generator/examples/python3/stdlib_demo.py "$DEST" +cp aptos-move/transaction-builder-generator/examples/python3/stdlib_demo.py "$DEST" PYTHONPATH="$PYTHONPATH:$DEST" python3 "$DEST/stdlib_demo.py" ``` ### C++ -To install C++ files `serde.hpp`, `bcs.hpp`, `diem_types.hpp`, `diem_framework.hpp`, `diem_framework.cpp` into a target directory `$DEST`, run: +To install C++ files `serde.hpp`, `bcs.hpp`, `aptos_types.hpp`, `diem_framework.hpp`, `diem_framework.cpp` into a target directory `$DEST`, run: ```bash target/debug/generate-transaction-builders \ --language cpp \ --module-name diem_framework \ - --with-diem-types "testsuite/generate-format/tests/staged/diem.yaml" \ + --with-aptos-types "testsuite/generate-format/tests/staged/diem.yaml" \ --target-source-dir "$DEST" \ - "diem-move/diem-framework/DPN/releases/legacy" \ - "diem-move/diem-framework/DPN/releases/artifacts/current" + "aptos-move/diem-framework/DPN/releases/legacy" \ + "aptos-move/diem-framework/DPN/releases/artifacts/current" ``` Next, you may copy and execute the [C++ demo file](examples/cpp/stdlib_demo.cpp) with: ```bash -cp diem-move/transaction-builder-generator/examples/cpp/stdlib_demo.cpp "$DEST" +cp aptos-move/transaction-builder-generator/examples/cpp/stdlib_demo.cpp "$DEST" clang++ --std=c++17 -I "$DEST" "$DEST/diem_framework.cpp" "$DEST/stdlib_demo.cpp" -o "$DEST/stdlib_demo" "$DEST/stdlib_demo" ``` @@ -103,15 +103,15 @@ To install Java source packages `com.novi.serde`, `com.novi.bcs`, `com.diem.type target/debug/generate-transaction-builders \ --language java \ --module-name com.diem.stdlib \ - --with-diem-types "testsuite/generate-format/tests/staged/diem.yaml" \ + --with-aptos-types "testsuite/generate-format/tests/staged/diem.yaml" \ --target-source-dir "$DEST" \ - --with-custom-diem-code diem-move/transaction-builder-generator/examples/java/custom_diem_code/*.java -- \ - "diem-move/diem-framework/DPN/releases/legacy" \ - "diem-move/diem-framework/DPN/releases/artifacts/current" + --with-custom-aptos-code aptos-move/transaction-builder-generator/examples/java/custom_aptos_code/*.java -- \ + "aptos-move/diem-framework/DPN/releases/legacy" \ + "aptos-move/diem-framework/DPN/releases/artifacts/current" ``` Next, you may copy and execute the [Java demo file](examples/java/StdlibDemo.java) with: ```bash -cp diem-move/transaction-builder-generator/examples/java/StdlibDemo.java "$DEST" +cp aptos-move/transaction-builder-generator/examples/java/StdlibDemo.java "$DEST" (find "$DEST" -name "*.java" | xargs javac -cp "$DEST") java -enableassertions -cp "$DEST" StdlibDemo ``` @@ -124,30 +124,30 @@ To generate the Go "packages" `testing/diemtypes`, and `testing/diemstdlib` into target/debug/generate-transaction-builders \ --language go \ --module-name diemstdlib \ - --diem-package-name testing \ - --with-diem-types "testsuite/generate-format/tests/staged/diem.yaml" \ + --aptos-package-name testing \ + --with-aptos-types "testsuite/generate-format/tests/staged/diem.yaml" \ --target-source-dir "$DEST" \ - "diem-move/diem-framework/DPN/releases/legacy" \ - "diem-move/diem-framework/DPN/releases/artifacts/current" + "aptos-move/diem-framework/DPN/releases/legacy" \ + "aptos-move/diem-framework/DPN/releases/artifacts/current" ``` Next, you may copy and execute the [Go demo file](examples/golang/stdlib_demo.go) as follows: (Note that `$DEST` must be an absolute path) ```bash -cp diem-move/transaction-builder-generator/examples/golang/stdlib_demo.go "$DEST" +cp aptos-move/transaction-builder-generator/examples/golang/stdlib_demo.go "$DEST" (cd "$DEST" && go mod init testing && go mod edit -replace testing="$DEST" && go run stdlib_demo.go) ``` ### Rust (experimental) -To install dependency-free Rust crates `diem-types` and `diem-framework` into a target directory `$DEST`, run: +To install dependency-free Rust crates `aptos-types` and `diem-framework` into a target directory `$DEST`, run: ```bash target/debug/generate-transaction-builders \ --language rust \ --module-name diem-framework \ - --with-diem-types "testsuite/generate-format/tests/staged/diem.yaml" \ + --with-aptos-types "testsuite/generate-format/tests/staged/diem.yaml" \ --target-source-dir "$DEST" \ - "diem-move/diem-framework/DPN/releases/legacy" \ - "diem-move/diem-framework/DPN/releases/artifacts/current" + "aptos-move/diem-framework/DPN/releases/legacy" \ + "aptos-move/diem-framework/DPN/releases/artifacts/current" ``` Next, you may copy and execute the [Rust demo file](examples/rust/stdlib_demo.rs). (See [unit test](tests/generation.rs) for details.) @@ -159,10 +159,10 @@ To generate the TypeScript "module" `diemStdlib` and its submodules into a targe target/debug/generate-transaction-builders \ --language typescript \ --module-name diemStdlib \ - --with-diem-types "testsuite/generate-format/tests/staged/diem.yaml" \ + --with-aptos-types "testsuite/generate-format/tests/staged/diem.yaml" \ --target-source-dir "$DEST" \ - "diem-move/diem-framework/DPN/releases/legacy" \ - "diem-move/diem-framework/DPN/releases/artifacts/current" + "aptos-move/diem-framework/DPN/releases/legacy" \ + "aptos-move/diem-framework/DPN/releases/artifacts/current" ``` ### C# @@ -172,16 +172,16 @@ To install C# source `Serde`, `Bcs`, `Diem.Types`, and `Diem.Stdlib` into a targ target/debug/generate-transaction-builders \ --language csharp \ --module-name Diem.Stdlib \ - --with-diem-types "testsuite/generate-format/tests/staged/diem.yaml" \ + --with-aptos-types "testsuite/generate-format/tests/staged/diem.yaml" \ --target-source-dir "$DEST" \ - --with-custom-diem-code diem-move/transaction-builder-generator/examples/csharp/custom_diem_code/*.cs -- \ - "diem-move/diem-framework/DPN/releases/legacy" \ - "diem-move/diem-framework/DPN/releases/artifacts/current" + --with-custom-aptos-code aptos-move/transaction-builder-generator/examples/csharp/custom_aptos_code/*.cs -- \ + "aptos-move/diem-framework/DPN/releases/legacy" \ + "aptos-move/diem-framework/DPN/releases/artifacts/current" ``` Next, you may copy and execute the [C# demo file](examples/csharp/StdlibDemo.cs) with: ```bash mkdir "$DEST"/Demo -cp diem-move/transaction-builder-generator/examples/csharp/StdlibDemo.cs "$DEST/Demo" +cp aptos-move/transaction-builder-generator/examples/csharp/StdlibDemo.cs "$DEST/Demo" cd "$DEST/Diem/Stdlib" dotnet new classlib -n Diem.Stdlib -o . dotnet add Diem.Stdlib.csproj reference ../Types/Diem.Types.csproj @@ -204,7 +204,7 @@ To install Swift source `Serde`, `Bcs`, `DiemTypes`, and `DiemStdlib` into a tar target/debug/generate-transaction-builders \ --language swift \ --module-name DiemStdlib \ - --with-diem-types "testsuite/generate-format/tests/staged/diem.yaml" \ + --with-aptos-types "testsuite/generate-format/tests/staged/diem.yaml" \ --target-source-dir "$DEST" \ "language/diem-framework/DPN/releases/legacy" \ "language/diem-framework/DPN/releases/artifacts/current" diff --git a/diem-move/transaction-builder-generator/examples/cpp/stdlib_demo.cpp b/aptos-move/transaction-builder-generator/examples/cpp/stdlib_demo.cpp similarity index 96% rename from diem-move/transaction-builder-generator/examples/cpp/stdlib_demo.cpp rename to aptos-move/transaction-builder-generator/examples/cpp/stdlib_demo.cpp index 19d218709c91e..04bd8a19df7f9 100644 --- a/diem-move/transaction-builder-generator/examples/cpp/stdlib_demo.cpp +++ b/aptos-move/transaction-builder-generator/examples/cpp/stdlib_demo.cpp @@ -2,11 +2,11 @@ // SPDX-License-Identifier: Apache-2.0 #include "diem_framework.hpp" -#include "diem_types.hpp" +#include "aptos_types.hpp" #include using namespace diem_framework; -using namespace diem_types; +using namespace aptos_types; void demo_p2p_script() { auto token = TypeTag{TypeTag::Struct{StructTag{ diff --git a/diem-move/transaction-builder-generator/examples/csharp/StdlibDemo.cs b/aptos-move/transaction-builder-generator/examples/csharp/StdlibDemo.cs similarity index 100% rename from diem-move/transaction-builder-generator/examples/csharp/StdlibDemo.cs rename to aptos-move/transaction-builder-generator/examples/csharp/StdlibDemo.cs diff --git a/diem-move/transaction-builder-generator/examples/csharp/custom_diem_code/AccountAddress.cs b/aptos-move/transaction-builder-generator/examples/csharp/custom_aptos_code/AccountAddress.cs similarity index 100% rename from diem-move/transaction-builder-generator/examples/csharp/custom_diem_code/AccountAddress.cs rename to aptos-move/transaction-builder-generator/examples/csharp/custom_aptos_code/AccountAddress.cs diff --git a/diem-move/transaction-builder-generator/examples/golang/stdlib_demo.go b/aptos-move/transaction-builder-generator/examples/golang/stdlib_demo.go similarity index 100% rename from diem-move/transaction-builder-generator/examples/golang/stdlib_demo.go rename to aptos-move/transaction-builder-generator/examples/golang/stdlib_demo.go diff --git a/diem-move/transaction-builder-generator/examples/java/StdlibDemo.java b/aptos-move/transaction-builder-generator/examples/java/StdlibDemo.java similarity index 100% rename from diem-move/transaction-builder-generator/examples/java/StdlibDemo.java rename to aptos-move/transaction-builder-generator/examples/java/StdlibDemo.java diff --git a/diem-move/transaction-builder-generator/examples/java/custom_diem_code/AccountAddress.java b/aptos-move/transaction-builder-generator/examples/java/custom_aptos_code/AccountAddress.java similarity index 100% rename from diem-move/transaction-builder-generator/examples/java/custom_diem_code/AccountAddress.java rename to aptos-move/transaction-builder-generator/examples/java/custom_aptos_code/AccountAddress.java diff --git a/diem-move/transaction-builder-generator/examples/python3/custom_diem_code/AccountAddress.py b/aptos-move/transaction-builder-generator/examples/python3/custom_aptos_code/AccountAddress.py similarity index 100% rename from diem-move/transaction-builder-generator/examples/python3/custom_diem_code/AccountAddress.py rename to aptos-move/transaction-builder-generator/examples/python3/custom_aptos_code/AccountAddress.py diff --git a/diem-move/transaction-builder-generator/examples/python3/stdlib_demo.py b/aptos-move/transaction-builder-generator/examples/python3/stdlib_demo.py similarity index 98% rename from diem-move/transaction-builder-generator/examples/python3/stdlib_demo.py rename to aptos-move/transaction-builder-generator/examples/python3/stdlib_demo.py index 87058ce667eec..46ed694df7dee 100644 --- a/diem-move/transaction-builder-generator/examples/python3/stdlib_demo.py +++ b/aptos-move/transaction-builder-generator/examples/python3/stdlib_demo.py @@ -3,7 +3,7 @@ # pyre-strict -import diem_types as diem +import aptos_types as diem import serde_types as st import diem_framework as stdlib diff --git a/diem-move/transaction-builder-generator/examples/rust/script_fun_demo.rs b/aptos-move/transaction-builder-generator/examples/rust/script_fun_demo.rs similarity index 95% rename from diem-move/transaction-builder-generator/examples/rust/script_fun_demo.rs rename to aptos-move/transaction-builder-generator/examples/rust/script_fun_demo.rs index b9dcd9099a9d7..02706858179a9 100644 --- a/diem-move/transaction-builder-generator/examples/rust/script_fun_demo.rs +++ b/aptos-move/transaction-builder-generator/examples/rust/script_fun_demo.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 use diem_framework::{encode_peer_to_peer_with_metadata_script_function, ScriptFunctionCall}; -use diem_types::{AccountAddress, Identifier, StructTag, TypeTag}; +use aptos_types::{AccountAddress, Identifier, StructTag, TypeTag}; use serde_bytes::ByteBuf as Bytes; fn demo_p2p_script_function() { diff --git a/diem-move/transaction-builder-generator/examples/rust/tx_script_demo.rs b/aptos-move/transaction-builder-generator/examples/rust/tx_script_demo.rs similarity index 95% rename from diem-move/transaction-builder-generator/examples/rust/tx_script_demo.rs rename to aptos-move/transaction-builder-generator/examples/rust/tx_script_demo.rs index 38b53637b6c69..c56a06a494f10 100644 --- a/diem-move/transaction-builder-generator/examples/rust/tx_script_demo.rs +++ b/aptos-move/transaction-builder-generator/examples/rust/tx_script_demo.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 use diem_framework::{encode_peer_to_peer_with_metadata_script, ScriptCall}; -use diem_types::{AccountAddress, Identifier, StructTag, TypeTag}; +use aptos_types::{AccountAddress, Identifier, StructTag, TypeTag}; use serde_bytes::ByteBuf as Bytes; fn demo_p2p_script() { diff --git a/diem-move/transaction-builder-generator/examples/swift/main.swift b/aptos-move/transaction-builder-generator/examples/swift/main.swift similarity index 100% rename from diem-move/transaction-builder-generator/examples/swift/main.swift rename to aptos-move/transaction-builder-generator/examples/swift/main.swift diff --git a/diem-move/transaction-builder-generator/examples/typescript/mod.ts b/aptos-move/transaction-builder-generator/examples/typescript/mod.ts similarity index 92% rename from diem-move/transaction-builder-generator/examples/typescript/mod.ts rename to aptos-move/transaction-builder-generator/examples/typescript/mod.ts index 3ef18fbc0fab4..8f113a9338556 100644 --- a/diem-move/transaction-builder-generator/examples/typescript/mod.ts +++ b/aptos-move/transaction-builder-generator/examples/typescript/mod.ts @@ -42,7 +42,7 @@ function demoPeerToPeerScript() { script.serialize(bcsSerializer); // add a trailing space so output has parity w legacy implementations: - // https://github.com/diem/diem/blob/main/diem-move/transaction-builder-generator/examples/rust/tx_script_demo.rs#L45 + // https://github.com/diem/diem/blob/main/aptos-move/transaction-builder-generator/examples/rust/tx_script_demo.rs#L45 console.log(bcsSerializer.getBytes().join(" ") + " "); } @@ -78,7 +78,7 @@ function demoPeerToPeerScriptFunction() { payload.serialize(bcsSerializer); // add a trailing space so output has parity w legacy implementations: - // https://github.com/diem/diem/blob/main/diem-move/transaction-builder-generator/examples/rust/tx_script_demo.rs#L45 + // https://github.com/diem/diem/blob/main/aptos-move/transaction-builder-generator/examples/rust/tx_script_demo.rs#L45 console.log(bcsSerializer.getBytes().join(" ") + " "); } diff --git a/diem-move/transaction-builder-generator/src/common.rs b/aptos-move/transaction-builder-generator/src/common.rs similarity index 96% rename from diem-move/transaction-builder-generator/src/common.rs rename to aptos-move/transaction-builder-generator/src/common.rs index edc379eaf22db..79c740bab0177 100644 --- a/diem-move/transaction-builder-generator/src/common.rs +++ b/aptos-move/transaction-builder-generator/src/common.rs @@ -1,7 +1,7 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_types::transaction::{ +use aptos_types::transaction::{ ArgumentABI, ScriptABI, ScriptFunctionABI, TransactionScriptABI, TypeArgumentABI, }; use heck::CamelCase; @@ -103,9 +103,9 @@ pub(crate) fn mangle_type(type_tag: &TypeTag) -> String { } } -pub(crate) fn get_external_definitions(diem_types: &str) -> serde_generate::ExternalDefinitions { +pub(crate) fn get_external_definitions(aptos_types: &str) -> serde_generate::ExternalDefinitions { let definitions = vec![( - diem_types, + aptos_types, vec![ "AccountAddress", "TypeTag", diff --git a/diem-move/transaction-builder-generator/src/cpp.rs b/aptos-move/transaction-builder-generator/src/cpp.rs similarity index 99% rename from diem-move/transaction-builder-generator/src/cpp.rs rename to aptos-move/transaction-builder-generator/src/cpp.rs index f6cd9d0d8ebce..a744609381433 100644 --- a/diem-move/transaction-builder-generator/src/cpp.rs +++ b/aptos-move/transaction-builder-generator/src/cpp.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 use crate::common; -use diem_types::transaction::{ +use aptos_types::transaction::{ ArgumentABI, ScriptABI, ScriptFunctionABI, TransactionScriptABI, TypeArgumentABI, }; use move_core_types::{ @@ -106,7 +106,7 @@ where self.out, r#"#pragma once -#include "diem_types.hpp" +#include "aptos_types.hpp" "# ) } @@ -116,7 +116,7 @@ where self.out, r#" using namespace serde; -using namespace diem_types; +using namespace aptos_types; "# ) } diff --git a/diem-move/transaction-builder-generator/src/csharp.rs b/aptos-move/transaction-builder-generator/src/csharp.rs similarity index 99% rename from diem-move/transaction-builder-generator/src/csharp.rs rename to aptos-move/transaction-builder-generator/src/csharp.rs index 83071677671e6..af8d2e59eb58b 100644 --- a/diem-move/transaction-builder-generator/src/csharp.rs +++ b/aptos-move/transaction-builder-generator/src/csharp.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 use crate::common; -use diem_types::transaction::{ +use aptos_types::transaction::{ ArgumentABI, ScriptABI, ScriptFunctionABI, TransactionScriptABI, TypeArgumentABI, }; use move_core_types::{ diff --git a/diem-move/transaction-builder-generator/src/generate.rs b/aptos-move/transaction-builder-generator/src/generate.rs similarity index 86% rename from diem-move/transaction-builder-generator/src/generate.rs rename to aptos-move/transaction-builder-generator/src/generate.rs index c5ea712cb739e..7152ef881eabd 100644 --- a/diem-move/transaction-builder-generator/src/generate.rs +++ b/aptos-move/transaction-builder-generator/src/generate.rs @@ -46,13 +46,13 @@ struct Options { /// Also install the diem types described by the given YAML file, along with the BCS runtime. #[structopt(long)] - with_diem_types: Option, + with_aptos_types: Option, /// Module name for the transaction builders installed in the `target_source_dir`. /// * Rust crates may contain a version number, e.g. "test:1.2.0". /// * In Java, this is expected to be a package name, e.g. "com.test" to create Java files in `com/test`. /// * In Go, this is expected to be of the format "go_module/path/go_package_name", - /// and `diem_types` is assumed to be in "go_module/path/diem_types". + /// and `aptos_types` is assumed to be in "go_module/path/aptos_types". #[structopt(long)] module_name: Option, @@ -60,19 +60,19 @@ struct Options { #[structopt(long)] serde_package_name: Option, - /// Optional version number for the `diem_types` module (useful in Rust). - /// If `--with-diem-types` is passed, this will be the version of the generated `diem_types` module. + /// Optional version number for the `aptos_types` module (useful in Rust). + /// If `--with-aptos-types` is passed, this will be the version of the generated `aptos_types` module. #[structopt(long, default_value = "0.1.0")] diem_version_number: String, - /// Optional package name (Python) or module path (Go) of the `diem_types` dependency. + /// Optional package name (Python) or module path (Go) of the `aptos_types` dependency. #[structopt(long)] - diem_package_name: Option, + aptos_package_name: Option, /// Read custom code for Diem containers from the given file paths. Containers will be matched with file stems. /// (e.g. `AddressAccount` <- `path/to/AddressAccount.py`) #[structopt(long)] - with_custom_diem_code: Vec, + with_custom_aptos_code: Vec, } fn main() { @@ -89,7 +89,7 @@ fn main() { Language::Python3 => buildgen::python3::output( &mut out, options.serde_package_name.clone(), - options.diem_package_name.clone(), + options.aptos_package_name.clone(), &abis, ) .unwrap(), @@ -106,7 +106,7 @@ fn main() { buildgen::golang::output( &mut out, options.serde_package_name.clone(), - options.diem_package_name.clone(), + options.aptos_package_name.clone(), options.module_name.as_deref().unwrap_or("main").to_string(), &abis, ) @@ -128,7 +128,7 @@ fn main() { }; // Diem types - if let Some(registry_file) = options.with_diem_types { + if let Some(registry_file) = options.with_aptos_types { let installer: Box>> = match options.language { Language::Python3 => Box::new(serdegen::python3::Installer::new( @@ -163,29 +163,29 @@ fn main() { if let Language::TypeScript = options.language { buildgen::typescript::replace_keywords(&mut registry); }; - let (diem_package_name, diem_package_path) = match options.language { + let (aptos_package_name, diem_package_path) = match options.language { Language::Rust => ( if options.diem_version_number == "0.1.0" { - "diem-types".to_string() + "aptos-types".to_string() } else { - format!("diem-types:{}", options.diem_version_number) + format!("aptos-types:{}", options.diem_version_number) }, - vec!["diem-types"], + vec!["aptos-types"], ), Language::Java => ("com.diem.types".to_string(), vec!["com", "diem", "types"]), Language::Csharp => ("Diem.Types".to_string(), vec!["Diem", "Types"]), Language::Go => ("diemtypes".to_string(), vec!["diemtypes"]), Language::TypeScript => ("diemTypes".to_string(), vec!["diemTypes"]), Language::Swift => ("DiemTypes".to_string(), vec!["DiemTypes"]), - _ => ("diem_types".to_string(), vec!["diem_types"]), + _ => ("aptos_types".to_string(), vec!["aptos_types"]), }; - let custom_diem_code = buildgen::read_custom_code_from_paths( + let custom_aptos_code = buildgen::read_custom_code_from_paths( &diem_package_path, - options.with_custom_diem_code.into_iter(), + options.with_custom_aptos_code.into_iter(), ); - let config = serdegen::CodeGeneratorConfig::new(diem_package_name) + let config = serdegen::CodeGeneratorConfig::new(aptos_package_name) .with_encodings(vec![serdegen::Encoding::Bcs]) - .with_custom_code(custom_diem_code); + .with_custom_code(custom_aptos_code); installer.install_module(&config, ®istry).unwrap(); } @@ -195,7 +195,7 @@ fn main() { Language::Python3 => Box::new(buildgen::python3::Installer::new( install_dir, options.serde_package_name, - options.diem_package_name, + options.aptos_package_name, )), Language::TypeScript => Box::new(buildgen::typescript::Installer::new(install_dir)), Language::Swift => Box::new(buildgen::swift::Installer::new(install_dir)), @@ -209,7 +209,7 @@ fn main() { Language::Go => Box::new(buildgen::golang::Installer::new( install_dir, options.serde_package_name, - options.diem_package_name, + options.aptos_package_name, )), }; diff --git a/diem-move/transaction-builder-generator/src/golang.rs b/aptos-move/transaction-builder-generator/src/golang.rs similarity index 99% rename from diem-move/transaction-builder-generator/src/golang.rs rename to aptos-move/transaction-builder-generator/src/golang.rs index a6c4927041dec..09cf8df53d204 100644 --- a/diem-move/transaction-builder-generator/src/golang.rs +++ b/aptos-move/transaction-builder-generator/src/golang.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 use crate::common; -use diem_types::transaction::{ +use aptos_types::transaction::{ ArgumentABI, ScriptABI, ScriptFunctionABI, TransactionScriptABI, TypeArgumentABI, }; use move_core_types::{ @@ -94,11 +94,12 @@ where T: Write, { fn output_script_call_enum_with_imports(&mut self, abis: &[ScriptABI]) -> Result<()> { - let diem_types_package = match &self.diem_module_path { + let aptos_types_package = match &self.diem_module_path { Some(path) => format!("{}/diemtypes", path), None => "diemtypes".into(), }; - let mut external_definitions = crate::common::get_external_definitions(&diem_types_package); + let mut external_definitions = + crate::common::get_external_definitions(&aptos_types_package); // We need BCS for argument encoding and decoding external_definitions.insert( "github.com/novifinancial/serde-reflection/serde-generate/runtime/golang/bcs" diff --git a/diem-move/transaction-builder-generator/src/java.rs b/aptos-move/transaction-builder-generator/src/java.rs similarity index 99% rename from diem-move/transaction-builder-generator/src/java.rs rename to aptos-move/transaction-builder-generator/src/java.rs index f48008877e13f..4b54d51a068f4 100644 --- a/diem-move/transaction-builder-generator/src/java.rs +++ b/aptos-move/transaction-builder-generator/src/java.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 use crate::common; -use diem_types::transaction::{ +use aptos_types::transaction::{ ArgumentABI, ScriptABI, ScriptFunctionABI, TransactionScriptABI, TypeArgumentABI, }; use move_core_types::{ diff --git a/diem-move/transaction-builder-generator/src/lib.rs b/aptos-move/transaction-builder-generator/src/lib.rs similarity index 98% rename from diem-move/transaction-builder-generator/src/lib.rs rename to aptos-move/transaction-builder-generator/src/lib.rs index 7d3a311d94722..d7927d390f3ab 100644 --- a/diem-move/transaction-builder-generator/src/lib.rs +++ b/aptos-move/transaction-builder-generator/src/lib.rs @@ -1,7 +1,7 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_types::transaction::ScriptABI; +use aptos_types::transaction::ScriptABI; use serde_generate::CustomCode; use std::{ffi::OsStr, fs, io::Read, path::Path}; diff --git a/diem-move/transaction-builder-generator/src/python3.rs b/aptos-move/transaction-builder-generator/src/python3.rs similarity index 96% rename from diem-move/transaction-builder-generator/src/python3.rs rename to aptos-move/transaction-builder-generator/src/python3.rs index 951d042c2f3a1..7a8626396ea9f 100644 --- a/diem-move/transaction-builder-generator/src/python3.rs +++ b/aptos-move/transaction-builder-generator/src/python3.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 use crate::common; -use diem_types::transaction::{ +use aptos_types::transaction::{ ArgumentABI, ScriptABI, ScriptFunctionABI, TransactionScriptABI, TypeArgumentABI, }; use heck::{CamelCase, ShoutySnakeCase}; @@ -25,13 +25,13 @@ use std::{ pub fn output( out: &mut dyn Write, serde_package_name: Option, - diem_package_name: Option, + aptos_package_name: Option, abis: &[ScriptABI], ) -> Result<()> { let mut emitter = PythonEmitter { out: IndentedWriter::new(out, IndentConfig::Space(4)), serde_package_name, - diem_package_name, + aptos_package_name, }; emitter.output_script_call_enum_with_imports(abis)?; emitter.output_additional_imports()?; @@ -68,7 +68,7 @@ struct PythonEmitter { /// Package where to find the serde module (if any). serde_package_name: Option, /// Package where to find the diem module (if any). - diem_package_name: Option, + aptos_package_name: Option, } impl PythonEmitter @@ -76,7 +76,7 @@ where T: Write, { fn output_additional_imports(&mut self) -> Result<()> { - let diem_pkg_root = match &self.diem_package_name { + let diem_pkg_root = match &self.aptos_package_name { None => "".into(), Some(package) => package.clone() + ".", }; @@ -84,7 +84,7 @@ where self.out, r#" from {}bcs import (deserialize as bcs_deserialize, serialize as bcs_serialize) -from {}diem_types import (Script, ScriptFunction, TransactionPayload, TransactionPayload__ScriptFunction, Identifier, ModuleId, TypeTag, AccountAddress, TransactionArgument, VecBytes, TransactionArgument__Bool, TransactionArgument__U8, TransactionArgument__U64, TransactionArgument__U128, TransactionArgument__Address, TransactionArgument__U8Vector)"#, +from {}aptos_types import (Script, ScriptFunction, TransactionPayload, TransactionPayload__ScriptFunction, Identifier, ModuleId, TypeTag, AccountAddress, TransactionArgument, VecBytes, TransactionArgument__Bool, TransactionArgument__U8, TransactionArgument__U64, TransactionArgument__U128, TransactionArgument__Address, TransactionArgument__U8Vector)"#, diem_pkg_root, diem_pkg_root ) } @@ -143,11 +143,11 @@ def decode_script_function_payload(payload: TransactionPayload) -> ScriptFunctio } fn output_script_call_enum_with_imports(&mut self, abis: &[ScriptABI]) -> Result<()> { - let diem_types_module = match &self.diem_package_name { - None => "diem_types".into(), - Some(package) => format!("{}.diem_types", package), + let aptos_types_module = match &self.aptos_package_name { + None => "aptos_types".into(), + Some(package) => format!("{}.aptos_types", package), }; - let external_definitions = crate::common::get_external_definitions(&diem_types_module); + let external_definitions = crate::common::get_external_definitions(&aptos_types_module); let (transaction_script_abis, script_fun_abis): (Vec<_>, Vec<_>) = abis .iter() .cloned() @@ -663,19 +663,19 @@ def decode_{}_argument(arg: TransactionArgument) -> {}: pub struct Installer { install_dir: PathBuf, serde_package_name: Option, - diem_package_name: Option, + aptos_package_name: Option, } impl Installer { pub fn new( install_dir: PathBuf, serde_package_name: Option, - diem_package_name: Option, + aptos_package_name: Option, ) -> Self { Installer { install_dir, serde_package_name, - diem_package_name, + aptos_package_name, } } @@ -698,7 +698,7 @@ impl crate::SourceInstaller for Installer { output( &mut file, self.serde_package_name.clone(), - self.diem_package_name.clone(), + self.aptos_package_name.clone(), abis, )?; Ok(()) diff --git a/diem-move/transaction-builder-generator/src/rust.rs b/aptos-move/transaction-builder-generator/src/rust.rs similarity index 98% rename from diem-move/transaction-builder-generator/src/rust.rs rename to aptos-move/transaction-builder-generator/src/rust.rs index 9564c684dedff..c1eb52adf6753 100644 --- a/diem-move/transaction-builder-generator/src/rust.rs +++ b/aptos-move/transaction-builder-generator/src/rust.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 use crate::common; -use diem_types::transaction::{ +use aptos_types::transaction::{ ArgumentABI, ScriptABI, ScriptFunctionABI, TransactionScriptABI, TypeArgumentABI, }; use move_core_types::{ @@ -222,7 +222,7 @@ impl ScriptFunctionCall { ), ("move_core_types", vec!["ident_str"]), ( - "diem_types::transaction", + "aptos_types::transaction", vec![ "Script", "TransactionArgument", @@ -231,11 +231,11 @@ impl ScriptFunctionCall { "VecBytes", ], ), - ("diem_types::account_address", vec!["AccountAddress"]), + ("aptos_types::account_address", vec!["AccountAddress"]), ] } else { vec![( - "diem_types", + "aptos_types", vec![ "AccountAddress", "TypeTag", @@ -881,14 +881,14 @@ fn decode_{}_argument(arg: TransactionArgument) -> Option<{}> {{ pub struct Installer { install_dir: PathBuf, - diem_types_version: String, + aptos_types_version: String, } impl Installer { - pub fn new(install_dir: PathBuf, diem_types_version: String) -> Self { + pub fn new(install_dir: PathBuf, aptos_types_version: String) -> Self { Installer { install_dir, - diem_types_version, + aptos_types_version, } } } @@ -923,9 +923,9 @@ edition = "2018" once_cell = "1.4.0" serde = {{ version = "1.0", features = ["derive"] }} serde_bytes = "0.11" -diem-types = {{ path = "../diem-types", version = "{}" }} +aptos-types = {{ path = "../aptos-types", version = "{}" }} "#, - name, version, self.diem_types_version, + name, version, self.aptos_types_version, )?; std::fs::create_dir(dir_path.join("src"))?; let source_path = dir_path.join("src/lib.rs"); diff --git a/diem-move/transaction-builder-generator/src/swift.rs b/aptos-move/transaction-builder-generator/src/swift.rs similarity index 99% rename from diem-move/transaction-builder-generator/src/swift.rs rename to aptos-move/transaction-builder-generator/src/swift.rs index 3898fab4886bf..634b17b7edaff 100644 --- a/diem-move/transaction-builder-generator/src/swift.rs +++ b/aptos-move/transaction-builder-generator/src/swift.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 use crate::common; -use diem_types::transaction::{ +use aptos_types::transaction::{ ArgumentABI, ScriptABI, ScriptFunctionABI, TransactionScriptABI, TypeArgumentABI, }; use move_core_types::{ diff --git a/diem-move/transaction-builder-generator/src/typescript.rs b/aptos-move/transaction-builder-generator/src/typescript.rs similarity index 99% rename from diem-move/transaction-builder-generator/src/typescript.rs rename to aptos-move/transaction-builder-generator/src/typescript.rs index cf64642ad45f7..1c6db095b3079 100644 --- a/diem-move/transaction-builder-generator/src/typescript.rs +++ b/aptos-move/transaction-builder-generator/src/typescript.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 use crate::common; -use diem_types::transaction::{ +use aptos_types::transaction::{ ArgumentABI, ScriptABI, ScriptFunctionABI, TransactionScriptABI, TypeArgumentABI, }; use move_core_types::{ diff --git a/diem-move/transaction-builder-generator/tests/cli.rs b/aptos-move/transaction-builder-generator/tests/cli.rs similarity index 100% rename from diem-move/transaction-builder-generator/tests/cli.rs rename to aptos-move/transaction-builder-generator/tests/cli.rs diff --git a/diem-move/transaction-builder-generator/tests/generation.rs b/aptos-move/transaction-builder-generator/tests/generation.rs similarity index 95% rename from diem-move/transaction-builder-generator/tests/generation.rs rename to aptos-move/transaction-builder-generator/tests/generation.rs index dc12a4dbdbdc2..95cc0c88ab9a8 100644 --- a/diem-move/transaction-builder-generator/tests/generation.rs +++ b/aptos-move/transaction-builder-generator/tests/generation.rs @@ -1,7 +1,7 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_types::transaction::ScriptABI; +use aptos_types::transaction::ScriptABI; use serde_generate as serdegen; use serde_generate::SourceInstaller as _; use serde_reflection::Registry; @@ -10,8 +10,8 @@ use tempfile::tempdir; use transaction_builder_generator as buildgen; use transaction_builder_generator::SourceInstaller as _; -fn get_diem_registry() -> Registry { - let path = "../../testsuite/generate-format/tests/staged/diem.yaml"; +fn get_aptos_registry() -> Registry { + let path = "../../testsuite/generate-format/tests/staged/aptos.yaml"; let content = std::fs::read_to_string(path).unwrap(); serde_yaml::from_str::(content.as_str()).unwrap() } @@ -59,7 +59,7 @@ fn test_typescript_replace_keywords() { #[test] #[ignore] fn test_that_typescript_generation_runs() { - let mut registry = get_diem_registry(); + let mut registry = get_aptos_registry(); // clean typescript keywords from codegen buildgen::typescript::replace_keywords(&mut registry); @@ -98,20 +98,20 @@ fn test_that_typescript_generation_runs() { #[test] #[ignore] fn test_that_python_code_parses_and_passes_pyre_check() { - let registry = get_diem_registry(); + let registry = get_aptos_registry(); let abis = get_stdlib_script_abis(); let dir = tempdir().unwrap(); let src_dir_path = dir.path().join("src"); let installer = serdegen::python3::Installer::new(src_dir_path.clone(), /* package */ None); - let paths = std::fs::read_dir("examples/python3/custom_diem_code") + let paths = std::fs::read_dir("examples/python3/custom_aptos_code") .unwrap() .map(|e| e.unwrap().path()); - let config = serdegen::CodeGeneratorConfig::new("diem_types".to_string()) + let config = serdegen::CodeGeneratorConfig::new("aptos_types".to_string()) .with_encodings(vec![serdegen::Encoding::Bcs]) .with_custom_code(buildgen::read_custom_code_from_paths( - &["diem_types"], + &["aptos_types"], paths, )); installer.install_module(&config, ®istry).unwrap(); @@ -179,11 +179,11 @@ fn test_that_python_code_parses_and_passes_pyre_check() { } fn test_rust(abis: &[ScriptABI], demo_file: &str, expected_output: &str) { - let registry = get_diem_registry(); + let registry = get_aptos_registry(); let dir = tempdir().unwrap(); let installer = serdegen::rust::Installer::new(dir.path().to_path_buf()); - let config = serdegen::CodeGeneratorConfig::new("diem-types".to_string()); + let config = serdegen::CodeGeneratorConfig::new("aptos-types".to_string()); installer.install_module(&config, ®istry).unwrap(); let stdlib_dir_path = dir.path().join("diem-framework"); @@ -198,7 +198,7 @@ version = "0.1.0" edition = "2018" [dependencies] -diem-types = {{ path = "../diem-types", version = "0.1.0" }} +aptos-types = {{ path = "../aptos-types", version = "0.1.0" }} serde_bytes = "0.11" serde = {{ version = "1.0.114", features = ["derive"] }} bcs = "0.1.1" @@ -260,11 +260,11 @@ fn test_that_rust_script_fun_code_compiles() { #[test] #[ignore] fn test_that_cpp_code_compiles_and_demo_runs() { - let registry = get_diem_registry(); + let registry = get_aptos_registry(); let abis = get_stdlib_script_abis(); let dir = tempdir().unwrap(); - let config = serdegen::CodeGeneratorConfig::new("diem_types".to_string()) + let config = serdegen::CodeGeneratorConfig::new("aptos_types".to_string()) .with_encodings(vec![serdegen::Encoding::Bcs]); let bcs_installer = serdegen::cpp::Installer::new(dir.path().to_path_buf()); bcs_installer.install_module(&config, ®istry).unwrap(); @@ -306,7 +306,7 @@ fn test_that_cpp_code_compiles_and_demo_runs() { #[test] #[ignore] fn test_that_swift_code_compiles_and_demo_runs() { - let registry = get_diem_registry(); + let registry = get_aptos_registry(); let abis = get_stdlib_script_abis(); let path = tempdir().unwrap().path().to_owned(); @@ -370,11 +370,11 @@ let package = Package( #[test] #[ignore] fn test_that_java_code_compiles_and_demo_runs() { - let registry = get_diem_registry(); + let registry = get_aptos_registry(); let abis = get_stdlib_script_abis(); let dir = tempdir().unwrap(); - let paths = std::fs::read_dir("examples/java/custom_diem_code") + let paths = std::fs::read_dir("examples/java/custom_aptos_code") .unwrap() .map(|e| e.unwrap().path()); let config = serdegen::CodeGeneratorConfig::new("com.diem.types".to_string()) @@ -447,7 +447,7 @@ fn test_that_java_code_compiles_and_demo_runs() { #[test] #[ignore] fn test_that_csharp_code_compiles_and_demo_runs() { - let registry = get_diem_registry(); + let registry = get_aptos_registry(); let abis = get_stdlib_script_abis(); // Special case this because of what the default tempdir is on a mac // It looks as if the path string might be too long for the dotnet runtime @@ -464,7 +464,7 @@ fn test_that_csharp_code_compiles_and_demo_runs() { } let dir = tempdir().unwrap(); - let paths = std::fs::read_dir("examples/csharp/custom_diem_code") + let paths = std::fs::read_dir("examples/csharp/custom_aptos_code") .unwrap() .map(|e| e.unwrap().path()); let config = serdegen::CodeGeneratorConfig::new("Diem.Types".to_string()) @@ -604,7 +604,7 @@ fn test_that_csharp_code_compiles_and_demo_runs() { #[test] #[ignore] fn test_that_golang_code_compiles_and_demo_runs() { - let registry = get_diem_registry(); + let registry = get_aptos_registry(); let abis = get_stdlib_script_abis(); let dir = tempdir().unwrap(); diff --git a/diem-move/transaction-builder-generator/tests/keyworded_registry.goldenfile.yaml b/aptos-move/transaction-builder-generator/tests/keyworded_registry.goldenfile.yaml similarity index 100% rename from diem-move/transaction-builder-generator/tests/keyworded_registry.goldenfile.yaml rename to aptos-move/transaction-builder-generator/tests/keyworded_registry.goldenfile.yaml diff --git a/diem-move/transaction-builder-generator/tests/keyworded_registry.yaml b/aptos-move/transaction-builder-generator/tests/keyworded_registry.yaml similarity index 100% rename from diem-move/transaction-builder-generator/tests/keyworded_registry.yaml rename to aptos-move/transaction-builder-generator/tests/keyworded_registry.yaml diff --git a/diem-move/transaction-replay/Cargo.toml b/aptos-move/transaction-replay/Cargo.toml similarity index 67% rename from diem-move/transaction-replay/Cargo.toml rename to aptos-move/transaction-replay/Cargo.toml index 45dda56502aa5..82cb239c458b8 100644 --- a/diem-move/transaction-replay/Cargo.toml +++ b/aptos-move/transaction-replay/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "diem-transaction-replay" +name = "aptos-transaction-replay" version = "0.1.0" authors = ["Diem Association "] description = "Replay transactions stored on chain" @@ -13,24 +13,24 @@ edition = "2018" anyhow = "1.0.52" structopt = "0.3.21" hex = "0.4.3" -diem-workspace-hack = { path = "../../crates/diem-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 = "../diem-vm" } +aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" } +aptos-types = { path = "../../types" } +aptos-state-view = { path = "../../storage/state-view" } +aptos-validator-interface = { path = "../aptos-validator-interface" } +aptosdb = { path = "../../storage/aptosdb" } +aptos-vm = { path = "../aptos-vm" } move-binary-format = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860"} move-cli = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } move-vm-types = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } move-core-types = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } move-vm-runtime = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } move-vm-test-utils = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } -diem-resource-viewer = { path = "../diem-resource-viewer" } -diem-framework = { path = "../../diem-move/diem-framework" } +aptos-resource-viewer = { path = "../aptos-resource-viewer" } +diem-framework = { path = "../../aptos-move/diem-framework" } move-compiler = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } bcs = "0.1.2" difference = "2.0.0" [dev-dependencies] vm-genesis = { path = "../vm-genesis" } -diem-framework-releases = { path = "../../diem-move/diem-framework/DPN/releases" } +diem-framework-releases = { path = "../../aptos-move/diem-framework/DPN/releases" } diff --git a/diem-move/transaction-replay/examples/account_exists.move b/aptos-move/transaction-replay/examples/account_exists.move similarity index 100% rename from diem-move/transaction-replay/examples/account_exists.move rename to aptos-move/transaction-replay/examples/account_exists.move diff --git a/diem-move/transaction-replay/examples/time_exceeds.move b/aptos-move/transaction-replay/examples/time_exceeds.move similarity index 100% rename from diem-move/transaction-replay/examples/time_exceeds.move rename to aptos-move/transaction-replay/examples/time_exceeds.move diff --git a/diem-move/transaction-replay/src/lib.rs b/aptos-move/transaction-replay/src/lib.rs similarity index 94% rename from diem-move/transaction-replay/src/lib.rs rename to aptos-move/transaction-replay/src/lib.rs index 3a9794dcb5a10..f4b50c404b606 100644 --- a/diem-move/transaction-replay/src/lib.rs +++ b/aptos-move/transaction-replay/src/lib.rs @@ -2,20 +2,20 @@ // SPDX-License-Identifier: Apache-2.0 use anyhow::{anyhow, bail, format_err, Result}; -use diem_resource_viewer::{AnnotatedAccountStateBlob, AnnotatedMoveStruct, DiemValueAnnotator}; -use diem_state_view::StateView; -use diem_types::{ +use aptos_resource_viewer::{AnnotatedAccountStateBlob, AnnotatedMoveStruct, DiemValueAnnotator}; +use aptos_state_view::StateView; +use aptos_types::{ access_path, account_address::AccountAddress, - account_config::diem_root_address, + account_config::aptos_root_address, account_state::AccountState, contract_event::{ContractEvent, EventWithProof}, event::EventKey, transaction::{ChangeSet, Transaction, TransactionOutput, Version, WriteSetPayload}, write_set::WriteOp, }; -use diem_validator_interface::{DBDebuggerInterface, DebuggerStateView, DiemValidatorInterface}; -use diem_vm::{ +use aptos_validator_interface::{DBDebuggerInterface, DebuggerStateView, DiemValidatorInterface}; +use aptos_vm::{ convert_changeset_and_events, data_cache::RemoteStorage, logging::AdapterLogSchema, DiemVM, VMExecutor, }; @@ -124,10 +124,10 @@ impl DiemDebugger { .ok_or_else(|| anyhow!("Can't run a write set transaction without genesis."))?; let state_view = DebuggerStateView::new(&*self.debugger, Some(base_version)); let vm = DiemVM::new(&state_view); - let cache = diem_vm::data_cache::StateViewCache::new(&state_view); + let cache = aptos_vm::data_cache::StateViewCache::new(&state_view); let sequence_number = match self .debugger - .get_account_state_by_version(diem_root_address(), base_version)? + .get_account_state_by_version(aptos_root_address(), base_version)? { Some(account) => account .get_account_resource()? @@ -135,9 +135,9 @@ impl DiemDebugger { .sequence_number(), None => bail!("Diem root account blob doesn't exist"), }; - let txn_data = diem_vm::transaction_metadata::TransactionMetadata { + let txn_data = aptos_vm::transaction_metadata::TransactionMetadata { sequence_number, - sender: diem_root_address(), + sender: aptos_root_address(), ..Default::default() }; @@ -319,7 +319,7 @@ impl DiemDebugger { where F: FnOnce(&mut Session>>) -> VMResult<()>, { - let move_vm = MoveVM::new(diem_vm::natives::diem_natives()).unwrap(); + let move_vm = MoveVM::new(aptos_vm::natives::aptos_natives()).unwrap(); let state_view = DebuggerStateView::new(&*self.debugger, version.checked_sub(1)); let state_view_storage = RemoteStorage::new(&state_view); let move_changes = override_changeset.unwrap_or_else(MoveChanges::new); @@ -352,7 +352,7 @@ impl DiemDebugger { predicate.clone(), vec![], vec![], - vec![diem_root_address(), sender], + vec![aptos_root_address(), sender], &mut gas_status, ) }) @@ -393,7 +393,7 @@ impl DiemDebugger { } fn is_reconfiguration(vm_output: &TransactionOutput) -> bool { - let new_epoch_event_key = diem_types::on_chain_config::new_epoch_event_key(); + let new_epoch_event_key = aptos_types::on_chain_config::new_epoch_event_key(); vm_output .events() .iter() diff --git a/diem-move/transaction-replay/src/main.rs b/aptos-move/transaction-replay/src/main.rs similarity index 97% rename from diem-move/transaction-replay/src/main.rs rename to aptos-move/transaction-replay/src/main.rs index c3fef68c9fe7b..fd9bc40341b45 100644 --- a/diem-move/transaction-replay/src/main.rs +++ b/aptos-move/transaction-replay/src/main.rs @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 use anyhow::{bail, Result}; -use diem_transaction_replay::DiemDebugger; -use diem_types::{ +use aptos_transaction_replay::DiemDebugger; +use aptos_types::{ account_address::AccountAddress, event::EventKey, transaction::{TransactionPayload, Version}, @@ -46,7 +46,7 @@ enum Command { /// Execute a writeset as if it is signed by the Diem Root and print the result. #[structopt(name = "replay-writeset")] ReplayWriteSetAtVersion { - /// Path to a serialized WriteSetPayload. Could be generated by the `diem-writeset-generator` tool. + /// Path to a serialized WriteSetPayload. Could be generated by the `aptos-writeset-generator` tool. #[structopt(parse(from_os_str))] write_set_blob_path: PathBuf, version: u64, @@ -58,7 +58,7 @@ enum Command { account: AccountAddress, version: Option, }, - /// Annotate the resources stored under `diem_root`, `treasury_compliance` and all validator addresses. + /// Annotate the resources stored under `aptos_root`, `treasury_compliance` and all validator addresses. #[structopt(name = "annotate-key-accounts")] AnnotateKeyAccounts { version: Version }, /// Annotate the events stored under `key` with range `start` to `start+limit`. diff --git a/diem-move/transaction-replay/src/unit_tests/bisection_tests.rs b/aptos-move/transaction-replay/src/unit_tests/bisection_tests.rs similarity index 99% rename from diem-move/transaction-replay/src/unit_tests/bisection_tests.rs rename to aptos-move/transaction-replay/src/unit_tests/bisection_tests.rs index cbba14f0e8901..7c7d5284ccf54 100644 --- a/diem-move/transaction-replay/src/unit_tests/bisection_tests.rs +++ b/aptos-move/transaction-replay/src/unit_tests/bisection_tests.rs @@ -3,7 +3,7 @@ use crate::{unit_tests::TestInterface, DiemDebugger}; use anyhow::bail; -use diem_types::{ +use aptos_types::{ account_address::AccountAddress, account_config::DiemAccountResource, event::{EventHandle, EventKey}, diff --git a/diem-move/transaction-replay/src/unit_tests/mod.rs b/aptos-move/transaction-replay/src/unit_tests/mod.rs similarity index 99% rename from diem-move/transaction-replay/src/unit_tests/mod.rs rename to aptos-move/transaction-replay/src/unit_tests/mod.rs index fee705dfd05c8..a0ae034e53ccd 100644 --- a/diem-move/transaction-replay/src/unit_tests/mod.rs +++ b/aptos-move/transaction-replay/src/unit_tests/mod.rs @@ -5,7 +5,7 @@ mod bisection_tests; use crate::DiemValidatorInterface; use anyhow::{bail, Result}; -use diem_types::{ +use aptos_types::{ account_address::AccountAddress, account_state::AccountState, account_state_blob::AccountStateBlob, diff --git a/diem-move/vm-genesis/Cargo.toml b/aptos-move/vm-genesis/Cargo.toml similarity index 65% rename from diem-move/vm-genesis/Cargo.toml rename to aptos-move/vm-genesis/Cargo.toml index a53040978494c..3b49d85de092c 100644 --- a/diem-move/vm-genesis/Cargo.toml +++ b/aptos-move/vm-genesis/Cargo.toml @@ -16,27 +16,27 @@ rand = "0.8.3" move-bytecode-verifier = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } bcs = "0.1.2" -diem-config = { path = "../../config" } -diem-crypto = { path = "../../crates/diem-crypto" } -diem-state-view = { path = "../../storage/state-view" } -diem-types = { path = "../../types" } -diem-workspace-hack = { path = "../../crates/diem-workspace-hack" } +aptos-config = { path = "../../config" } +aptos-crypto = { path = "../../crates/aptos-crypto" } +aptos-state-view = { path = "../../storage/state-view" } +aptos-types = { path = "../../types" } +aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" } move-bytecode-utils = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } move-core-types = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } move-vm-runtime = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860"} move-vm-types = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } -diem-framework = { path = "../../diem-move/diem-framework" } -diem-framework-releases = { path = "../../diem-move/diem-framework/DPN/releases" } -diem-transaction-builder = { path = "../../sdk/transaction-builder"} +diem-framework = { path = "../../aptos-move/diem-framework" } +diem-framework-releases = { path = "../../aptos-move/diem-framework/DPN/releases" } +aptos-transaction-builder = { path = "../../sdk/transaction-builder"} move-binary-format = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } -diem-vm = { path = "../diem-vm" } +aptos-vm = { path = "../aptos-vm" } read-write-set = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } [dev-dependencies] proptest = "1.0.0" proptest-derive = "0.3.0" -diem-proptest-helpers = { path = "../../crates/diem-proptest-helpers" } +aptos-proptest-helpers = { path = "../../crates/aptos-proptest-helpers" } [features] default = [] -fuzzing = ["diem-types/fuzzing", "move-vm-types/fuzzing"] +fuzzing = ["aptos-types/fuzzing", "move-vm-types/fuzzing"] diff --git a/diem-move/vm-genesis/src/genesis_context.rs b/aptos-move/vm-genesis/src/genesis_context.rs similarity index 92% rename from diem-move/vm-genesis/src/genesis_context.rs rename to aptos-move/vm-genesis/src/genesis_context.rs index e9644eeccdc9d..6e2b13780d2ae 100644 --- a/diem-move/vm-genesis/src/genesis_context.rs +++ b/aptos-move/vm-genesis/src/genesis_context.rs @@ -4,8 +4,8 @@ #![forbid(unsafe_code)] use anyhow::Result; -use diem_state_view::StateView; -use diem_types::access_path::AccessPath; +use aptos_state_view::StateView; +use aptos_types::access_path::AccessPath; use move_core_types::language_storage::ModuleId; use std::collections::HashMap; diff --git a/diem-move/vm-genesis/src/lib.rs b/aptos-move/vm-genesis/src/lib.rs similarity index 94% rename from diem-move/vm-genesis/src/lib.rs rename to aptos-move/vm-genesis/src/lib.rs index 975b2be21805a..b286a216d6cc4 100644 --- a/diem-move/vm-genesis/src/lib.rs +++ b/aptos-move/vm-genesis/src/lib.rs @@ -6,15 +6,12 @@ mod genesis_context; use crate::genesis_context::GenesisStateView; -use diem_crypto::{ +use aptos_crypto::{ ed25519::{Ed25519PrivateKey, Ed25519PublicKey}, PrivateKey, Uniform, }; -use diem_framework_releases::{ - current_module_blobs, legacy::transaction_scripts::LegacyStdlibScript, -}; -use diem_transaction_builder::stdlib as transaction_builder; -use diem_types::{ +use aptos_transaction_builder::stdlib as transaction_builder; +use aptos_types::{ account_config::{ self, events::{CreateAccountEvent, NewEpochEvent}, @@ -30,7 +27,10 @@ use diem_types::{ authenticator::AuthenticationKey, ChangeSet, ScriptFunction, Transaction, WriteSetPayload, }, }; -use diem_vm::{convert_changeset_and_events, data_cache::StateViewCache}; +use aptos_vm::{convert_changeset_and_events, data_cache::StateViewCache}; +use diem_framework_releases::{ + current_module_blobs, legacy::transaction_scripts::LegacyStdlibScript, +}; use move_binary_format::CompiledModule; use move_bytecode_utils::Modules; use move_core_types::{ @@ -58,7 +58,7 @@ pub static GENESIS_KEYPAIR: Lazy<(Ed25519PrivateKey, Ed25519PublicKey)> = Lazy:: }); pub fn encode_genesis_transaction( - diem_root_key: Ed25519PublicKey, + aptos_root_key: Ed25519PublicKey, treasury_compliance_key: Ed25519PublicKey, validators: &[Validator], stdlib_module_bytes: &[Vec], @@ -68,7 +68,7 @@ pub fn encode_genesis_transaction( enable_parallel_execution: bool, ) -> Transaction { Transaction::GenesisTransaction(WriteSetPayload::Direct(encode_genesis_change_set( - &diem_root_key, + &aptos_root_key, &treasury_compliance_key, validators, stdlib_module_bytes, @@ -81,7 +81,7 @@ pub fn encode_genesis_transaction( } pub fn encode_genesis_change_set( - diem_root_key: &Ed25519PublicKey, + aptos_root_key: &Ed25519PublicKey, treasury_compliance_key: &Ed25519PublicKey, validators: &[Validator], stdlib_module_bytes: &[Vec], @@ -104,12 +104,12 @@ pub fn encode_genesis_change_set( } let data_cache = StateViewCache::new(&state_view); - let move_vm = MoveVM::new(diem_vm::natives::diem_natives()).unwrap(); + let move_vm = MoveVM::new(aptos_vm::natives::aptos_natives()).unwrap(); let mut session = move_vm.new_session(&data_cache); create_and_initialize_main_accounts( &mut session, - diem_root_key, + aptos_root_key, treasury_compliance_key, vm_publishing_option, consensus_config, @@ -131,7 +131,7 @@ pub fn encode_genesis_change_set( let payload = bcs::to_bytes(&ReadWriteSetAnalysis::V1( read_write_set::analyze(&stdlib_modules) .expect("Failed to get ReadWriteSet for current Diem Framework") - .normalize_all_scripts(diem_vm::read_write_set_analysis::add_on_functions_list()) + .normalize_all_scripts(aptos_vm::read_write_set_analysis::add_on_functions_list()) .trim() .into_inner(), )) @@ -143,7 +143,7 @@ pub fn encode_genesis_change_set( "enable_parallel_execution_with_config", vec![], serialize_values(&vec![ - MoveValue::Signer(account_config::diem_root_address()), + MoveValue::Signer(account_config::aptos_root_address()), MoveValue::vector_u8(payload), ]), ) @@ -219,16 +219,16 @@ fn exec_script_function( /// Create and initialize Association and Core Code accounts. fn create_and_initialize_main_accounts( session: &mut Session>, - diem_root_key: &Ed25519PublicKey, + aptos_root_key: &Ed25519PublicKey, treasury_compliance_key: &Ed25519PublicKey, publishing_option: VMPublishingOption, consensus_config: OnChainConsensusConfig, chain_id: ChainId, ) { - let diem_root_auth_key = AuthenticationKey::ed25519(diem_root_key); + let aptos_root_auth_key = AuthenticationKey::ed25519(aptos_root_key); let treasury_compliance_auth_key = AuthenticationKey::ed25519(treasury_compliance_key); - let root_diem_root_address = account_config::diem_root_address(); + let root_aptos_root_address = account_config::aptos_root_address(); let tc_account_address = account_config::treasury_compliance_account_address(); let initial_allow_list = MoveValue::Vector( @@ -254,9 +254,9 @@ fn create_and_initialize_main_accounts( "initialize", vec![], serialize_values(&vec![ - MoveValue::Signer(root_diem_root_address), + MoveValue::Signer(root_aptos_root_address), MoveValue::Signer(tc_account_address), - MoveValue::vector_u8(diem_root_auth_key.to_vec()), + MoveValue::vector_u8(aptos_root_auth_key.to_vec()), MoveValue::vector_u8(treasury_compliance_auth_key.to_vec()), initial_allow_list, MoveValue::Bool(publishing_option.is_open_module), @@ -323,7 +323,7 @@ fn create_and_initialize_owners_operators( session: &mut Session>, validators: &[Validator], ) { - let diem_root_address = account_config::diem_root_address(); + let aptos_root_address = account_config::aptos_root_address(); let mut owners = vec![]; let mut owner_names = vec![]; let mut owner_auth_keys = vec![]; @@ -351,7 +351,7 @@ fn create_and_initialize_owners_operators( "create_initialize_owners_operators", vec![], serialize_values(&vec![ - MoveValue::Signer(diem_root_address), + MoveValue::Signer(aptos_root_address), MoveValue::Vector(owners), MoveValue::Vector(owner_names), MoveValue::Vector(owner_auth_keys), @@ -512,7 +512,7 @@ impl TestValidator { fn gen(index: usize, rng: &mut rand::rngs::StdRng) -> TestValidator { let name = index.to_string().as_bytes().to_vec(); - let address = diem_config::utils::validator_owner_account_from_name(&name); + let address = aptos_config::utils::validator_owner_account_from_name(&name); let key = Ed25519PrivateKey::generate(rng); let auth_key = AuthenticationKey::ed25519(&key.public_key()); let consensus_pubkey = key.public_key().to_bytes().to_vec(); diff --git a/diem-move/writeset-transaction-generator/Cargo.toml b/aptos-move/writeset-transaction-generator/Cargo.toml similarity index 70% rename from diem-move/writeset-transaction-generator/Cargo.toml rename to aptos-move/writeset-transaction-generator/Cargo.toml index d983202ecc858..d001920896427 100644 --- a/diem-move/writeset-transaction-generator/Cargo.toml +++ b/aptos-move/writeset-transaction-generator/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "diem-writeset-generator" +name = "aptos-writeset-generator" version = "0.1.0" authors = ["Diem Association "] description = "Generating writesets used for incident management" @@ -22,18 +22,18 @@ serde_json = "1.0.64" once_cell = "1.7.2" move-bytecode-verifier = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } -diem-workspace-hack = { path = "../../crates/diem-workspace-hack" } -diem-crypto-derive = { path = "../../crates/diem-crypto-derive" } -diem-crypto = { path = "../../crates/diem-crypto" } -diem-types = { path = "../../types" } -diem-framework-releases = { path = "../../diem-move/diem-framework/DPN/releases" } -diem-framework = { path = "../../diem-move/diem-framework" } +aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" } +aptos-crypto-derive = { path = "../../crates/aptos-crypto-derive" } +aptos-crypto = { path = "../../crates/aptos-crypto" } +aptos-types = { path = "../../types" } +diem-framework-releases = { path = "../../aptos-move/diem-framework/DPN/releases" } +diem-framework = { path = "../../aptos-move/diem-framework" } move-compiler = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } bcs = "0.1.2" -diem-state-view = { path = "../../storage/state-view" } -diem-transaction-replay = { path = "../transaction-replay" } -diemdb = { path = "../../storage/diemdb" } -diem-vm = { path = "../diem-vm" } +aptos-state-view = { path = "../../storage/state-view" } +aptos-transaction-replay = { path = "../transaction-replay" } +aptosdb = { path = "../../storage/aptosdb" } +aptos-vm = { path = "../aptos-vm" } move-binary-format = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860"} move-vm-types = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } move-core-types = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } diff --git a/diem-move/writeset-transaction-generator/release/artifacts.json b/aptos-move/writeset-transaction-generator/release/artifacts.json similarity index 100% rename from diem-move/writeset-transaction-generator/release/artifacts.json rename to aptos-move/writeset-transaction-generator/release/artifacts.json diff --git a/diem-move/writeset-transaction-generator/release/release-1.2.0-rc0.blob b/aptos-move/writeset-transaction-generator/release/release-1.2.0-rc0.blob similarity index 100% rename from diem-move/writeset-transaction-generator/release/release-1.2.0-rc0.blob rename to aptos-move/writeset-transaction-generator/release/release-1.2.0-rc0.blob diff --git a/diem-move/writeset-transaction-generator/release/release-1.4.0-rc0.blob b/aptos-move/writeset-transaction-generator/release/release-1.4.0-rc0.blob similarity index 100% rename from diem-move/writeset-transaction-generator/release/release-1.4.0-rc0.blob rename to aptos-move/writeset-transaction-generator/release/release-1.4.0-rc0.blob diff --git a/diem-move/writeset-transaction-generator/src/admin_script_builder.rs b/aptos-move/writeset-transaction-generator/src/admin_script_builder.rs similarity index 91% rename from diem-move/writeset-transaction-generator/src/admin_script_builder.rs rename to aptos-move/writeset-transaction-generator/src/admin_script_builder.rs index a4349e5ea2840..5c8427350a4aa 100644 --- a/diem-move/writeset-transaction-generator/src/admin_script_builder.rs +++ b/aptos-move/writeset-transaction-generator/src/admin_script_builder.rs @@ -2,9 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 use anyhow::Result; -use diem_types::{ +use aptos_types::{ account_address::AccountAddress, - account_config::diem_root_address, + account_config::aptos_root_address, on_chain_config::ReadWriteSetAnalysis, transaction::{Script, WriteSetPayload}, }; @@ -65,7 +65,7 @@ pub fn encode_remove_validators_payload(validators: Vec) -> Writ WriteSetPayload::Script { script, - execute_as: diem_root_address(), + execute_as: aptos_root_address(), } } @@ -88,7 +88,7 @@ pub fn encode_custom_script( WriteSetPayload::Script { script, - execute_as: execute_as.unwrap_or_else(diem_root_address), + execute_as: execute_as.unwrap_or_else(aptos_root_address), } } @@ -102,7 +102,7 @@ pub fn encode_halt_network_payload() -> WriteSetPayload { vec![], vec![], ), - execute_as: diem_root_address(), + execute_as: aptos_root_address(), } } @@ -116,7 +116,7 @@ pub fn encode_initialize_parallel_execution() -> WriteSetPayload { vec![], vec![], ), - execute_as: diem_root_address(), + execute_as: aptos_root_address(), } } @@ -130,7 +130,7 @@ pub fn encode_disable_parallel_execution() -> WriteSetPayload { vec![], vec![], ), - execute_as: diem_root_address(), + execute_as: aptos_root_address(), } } @@ -138,7 +138,7 @@ pub fn encode_enable_parallel_execution_with_config() -> WriteSetPayload { let payload = bcs::to_bytes(&ReadWriteSetAnalysis::V1( analyze(diem_framework_releases::current_modules()) .expect("Failed to get ReadWriteSet for current Diem Framework") - .normalize_all_scripts(diem_vm::read_write_set_analysis::add_on_functions_list()) + .normalize_all_scripts(aptos_vm::read_write_set_analysis::add_on_functions_list()) .trim() .into_inner(), )) @@ -152,6 +152,6 @@ pub fn encode_enable_parallel_execution_with_config() -> WriteSetPayload { vec![], vec![TransactionArgument::U8Vector(payload)], ), - execute_as: diem_root_address(), + execute_as: aptos_root_address(), } } diff --git a/diem-move/writeset-transaction-generator/src/lib.rs b/aptos-move/writeset-transaction-generator/src/lib.rs similarity index 100% rename from diem-move/writeset-transaction-generator/src/lib.rs rename to aptos-move/writeset-transaction-generator/src/lib.rs diff --git a/diem-move/writeset-transaction-generator/src/writeset_builder.rs b/aptos-move/writeset-transaction-generator/src/writeset_builder.rs similarity index 87% rename from diem-move/writeset-transaction-generator/src/writeset_builder.rs rename to aptos-move/writeset-transaction-generator/src/writeset_builder.rs index ac3a1512d754c..68804d43b512b 100644 --- a/diem-move/writeset-transaction-generator/src/writeset_builder.rs +++ b/aptos-move/writeset-transaction-generator/src/writeset_builder.rs @@ -2,13 +2,13 @@ // SPDX-License-Identifier: Apache-2.0 use anyhow::format_err; -use diem_state_view::StateView; -use diem_types::{ +use aptos_state_view::StateView; +use aptos_types::{ account_address::AccountAddress, - account_config::{self, diem_root_address}, + account_config::{self, aptos_root_address}, transaction::{ChangeSet, Script, Version}, }; -use diem_vm::{convert_changeset_and_events, data_cache::RemoteStorage}; +use aptos_vm::{convert_changeset_and_events, data_cache::RemoteStorage}; use move_core_types::{ identifier::Identifier, language_storage::{ModuleId, TypeTag}, @@ -67,7 +67,7 @@ impl<'r, 'l, S: MoveResolver> GenesisSession<'r, 'l, S> { "DiemConfig", "disable_reconfiguration", vec![], - serialize_values(&vec![MoveValue::Signer(diem_root_address())]), + serialize_values(&vec![MoveValue::Signer(aptos_root_address())]), ) } @@ -76,7 +76,7 @@ impl<'r, 'l, S: MoveResolver> GenesisSession<'r, 'l, S> { "DiemConfig", "enable_reconfiguration", vec![], - serialize_values(&vec![MoveValue::Signer(diem_root_address())]), + serialize_values(&vec![MoveValue::Signer(aptos_root_address())]), ) } pub fn set_diem_version(&mut self, version: Version) { @@ -85,7 +85,7 @@ impl<'r, 'l, S: MoveResolver> GenesisSession<'r, 'l, S> { "set", vec![], serialize_values(&vec![ - MoveValue::Signer(diem_root_address()), + MoveValue::Signer(aptos_root_address()), MoveValue::U64(version), ]), ) @@ -96,7 +96,7 @@ pub fn build_changeset(state_view: &S, procedure: F) -> ChangeS where F: FnOnce(&mut GenesisSession>), { - let move_vm = MoveVM::new(diem_vm::natives::diem_natives()).unwrap(); + let move_vm = MoveVM::new(aptos_vm::natives::aptos_natives()).unwrap(); let (changeset, events) = { let state_view_storage = RemoteStorage::new(state_view); let mut session = GenesisSession(move_vm.new_session(&state_view_storage)); diff --git a/diem-move/writeset-transaction-generator/templates/disable_parallel_execution.move b/aptos-move/writeset-transaction-generator/templates/disable_parallel_execution.move similarity index 100% rename from diem-move/writeset-transaction-generator/templates/disable_parallel_execution.move rename to aptos-move/writeset-transaction-generator/templates/disable_parallel_execution.move diff --git a/diem-move/writeset-transaction-generator/templates/halt_transactions.move b/aptos-move/writeset-transaction-generator/templates/halt_transactions.move similarity index 100% rename from diem-move/writeset-transaction-generator/templates/halt_transactions.move rename to aptos-move/writeset-transaction-generator/templates/halt_transactions.move diff --git a/diem-move/writeset-transaction-generator/templates/initialize_parallel_execution.move b/aptos-move/writeset-transaction-generator/templates/initialize_parallel_execution.move similarity index 100% rename from diem-move/writeset-transaction-generator/templates/initialize_parallel_execution.move rename to aptos-move/writeset-transaction-generator/templates/initialize_parallel_execution.move diff --git a/diem-move/writeset-transaction-generator/templates/remove_validators.move b/aptos-move/writeset-transaction-generator/templates/remove_validators.move similarity index 100% rename from diem-move/writeset-transaction-generator/templates/remove_validators.move rename to aptos-move/writeset-transaction-generator/templates/remove_validators.move diff --git a/diem-move/writeset-transaction-generator/templates/update_parallel_execution_config.move b/aptos-move/writeset-transaction-generator/templates/update_parallel_execution_config.move similarity index 100% rename from diem-move/writeset-transaction-generator/templates/update_parallel_execution_config.move rename to aptos-move/writeset-transaction-generator/templates/update_parallel_execution_config.move diff --git a/diem-node/Cargo.toml b/aptos-node/Cargo.toml similarity index 62% rename from diem-node/Cargo.toml rename to aptos-node/Cargo.toml index 56f4d125b9a27..06e398a6ae12b 100644 --- a/diem-node/Cargo.toml +++ b/aptos-node/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "diem-node" +name = "aptos-node" version = "0.1.0" authors = ["Diem Association "] description = "Diem node" @@ -25,27 +25,27 @@ consensus = { path = "../consensus" } consensus-notifications = { path = "../state-sync/inter-component/consensus-notifications" } crash-handler = { path = "../crates/crash-handler" } data-streaming-service = { path = "../state-sync/state-sync-v2/data-streaming-service" } -diem-infallible = { path = "../crates/diem-infallible" } +aptos-infallible = { path = "../crates/aptos-infallible" } debug-interface = { path = "../crates/debug-interface" } event-notifications = { path = "../state-sync/inter-component/event-notifications" } executor = { path = "../execution/executor" } executor-types = { path = "../execution/executor-types" } -diem-api = { path = "../api" } -diem-config = { path = "../config" } -diem-crypto = { path = "../crates/diem-crypto" } -diem-data-client = { path = "../state-sync/diem-data-client" } -diem-framework-releases = { path = "../diem-move/diem-framework/DPN/releases" } -diem-genesis-tool = {path = "../config/management/genesis", features = ["testing"] } -diem-logger = { path = "../crates/diem-logger" } -diem-mempool = { path = "../mempool" } -diem-metrics = { path = "../crates/diem-metrics" } -diem-secure-storage = { path = "../secure/storage" } -diem-temppath = { path = "../crates/diem-temppath" } -diem-time-service = { path = "../crates/diem-time-service" } -diem-types = { path = "../types" } -diem-vm = { path = "../diem-move/diem-vm" } -diem-workspace-hack = { version = "0.1", path = "../crates/diem-workspace-hack" } -diemdb = { path = "../storage/diemdb" } +aptos-api = { path = "../api" } +aptos-config = { path = "../config" } +aptos-crypto = { path = "../crates/aptos-crypto" } +aptos-data-client = { path = "../state-sync/aptos-data-client" } +diem-framework-releases = { path = "../aptos-move/diem-framework/DPN/releases" } +aptos-genesis-tool = {path = "../config/management/genesis", features = ["testing"] } +aptos-logger = { path = "../crates/aptos-logger" } +aptos-mempool = { path = "../mempool" } +aptos-metrics = { path = "../crates/aptos-metrics" } +aptos-secure-storage = { path = "../secure/storage" } +aptos-temppath = { path = "../crates/aptos-temppath" } +aptos-time-service = { path = "../crates/aptos-time-service" } +aptos-types = { path = "../types" } +aptos-vm = { path = "../aptos-move/aptos-vm" } +aptos-workspace-hack = { version = "0.1", path = "../crates/aptos-workspace-hack" } +aptosdb = { path = "../storage/aptosdb" } mempool-notifications = { path = "../state-sync/inter-component/mempool-notifications" } network = { path = "../network" } network-builder = { path = "../network/builder" } @@ -59,5 +59,5 @@ storage-service-server = { path = "../state-sync/storage-service/server" } [features] default = [] -assert-private-keys-not-cloneable = ["diem-crypto/assert-private-keys-not-cloneable"] -failpoints = ["fail/failpoints", "consensus/failpoints", "executor/failpoints", "diem-mempool/failpoints", "diem-api/failpoints"] +assert-private-keys-not-cloneable = ["aptos-crypto/assert-private-keys-not-cloneable"] +failpoints = ["fail/failpoints", "consensus/failpoints", "executor/failpoints", "aptos-mempool/failpoints", "aptos-api/failpoints"] diff --git a/diem-node/src/lib.rs b/aptos-node/src/lib.rs similarity index 91% rename from diem-node/src/lib.rs rename to aptos-node/src/lib.rs index 16c46586c4171..82faeef67b094 100644 --- a/diem-node/src/lib.rs +++ b/aptos-node/src/lib.rs @@ -1,16 +1,8 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use backup_service::start_backup_service; -use consensus::consensus_provider::start_consensus; -use consensus_notifications::ConsensusNotificationListener; -use data_streaming_service::{ - streaming_client::{new_streaming_service_client_listener_pair, StreamingServiceClient}, - streaming_service::DataStreamingService, -}; -use debug_interface::node_debug_service::NodeDebugService; -use diem_api::runtime::bootstrap as bootstrap_api; -use diem_config::{ +use aptos_api::runtime::bootstrap as bootstrap_api; +use aptos_config::{ config::{ DataStreamingServiceConfig, DiemDataClientConfig, NetworkConfig, NodeConfig, PersistableConfig, StorageServiceConfig, @@ -18,21 +10,29 @@ use diem_config::{ network_id::NetworkId, utils::get_genesis_txn, }; -use diem_data_client::diemnet::DiemNetDataClient; -use diem_infallible::RwLock; -use diem_logger::{prelude::*, Logger}; -use diem_metrics::metric_server; -use diem_time_service::TimeService; -use diem_types::{ - account_config::diem_root_address, +use aptos_data_client::diemnet::DiemNetDataClient; +use aptos_infallible::RwLock; +use aptos_logger::{prelude::*, Logger}; +use aptos_metrics::metric_server; +use aptos_time_service::TimeService; +use aptos_types::{ + account_config::aptos_root_address, account_state::AccountState, chain_id::ChainId, move_resource::MoveStorage, on_chain_config::{VMPublishingOption, ON_CHAIN_CONFIG_REGISTRY}, waypoint::Waypoint, }; -use diem_vm::DiemVM; -use diemdb::DiemDB; +use aptos_vm::DiemVM; +use aptosdb::DiemDB; +use backup_service::start_backup_service; +use consensus::consensus_provider::start_consensus; +use consensus_notifications::ConsensusNotificationListener; +use data_streaming_service::{ + streaming_client::{new_streaming_service_client_listener_pair, StreamingServiceClient}, + streaming_service::DataStreamingService, +}; +use debug_interface::node_debug_service::NodeDebugService; use event_notifications::EventSubscriptionService; use executor::{chunk_executor::ChunkExecutor, db_bootstrapper::maybe_bootstrap}; use futures::channel::mpsc::channel; @@ -70,7 +70,7 @@ const AC_SMP_CHANNEL_BUFFER_SIZE: usize = 1_024; const INTRA_NODE_CHANNEL_BUFFER_SIZE: usize = 1; const MEMPOOL_NETWORK_CHANNEL_BUFFER_SIZE: usize = 1_024; -pub struct DiemHandle { +pub struct AptosHandle { _api: Runtime, _backup: Runtime, _consensus_runtime: Option, @@ -83,7 +83,7 @@ pub struct DiemHandle { pub fn start(config: &NodeConfig, log_file: Option) { crash_handler::setup_panic_handler(); - let mut logger = diem_logger::Logger::new(); + let mut logger = aptos_logger::Logger::new(); logger .channel_size(config.logger.chan_size) .is_async(config.logger.is_async) @@ -127,7 +127,7 @@ pub fn load_test_environment( R: ::rand::RngCore + ::rand::CryptoRng, { // Either allocate a temppath or reuse the passed in path and make sure the directory exists - let config_temp_path = diem_temppath::TempPath::new(); + let config_temp_path = aptos_temppath::TempPath::new(); let config_path = config_path.unwrap_or_else(|| config_temp_path.as_ref().to_path_buf()); std::fs::DirBuilder::new() .recursive(true) @@ -150,7 +150,7 @@ pub fn load_test_environment( } let mut builder = - diem_genesis_tool::validator_builder::ValidatorBuilder::new(&config_path, genesis_modules) + aptos_genesis_tool::validator_builder::ValidatorBuilder::new(&config_path, genesis_modules) .template(template) .randomize_first_validator_ports(random_ports); if let Some(publishing_option) = publishing_option { @@ -158,9 +158,9 @@ pub fn load_test_environment( } let (root_keys, _genesis, genesis_waypoint, validators) = builder.build(rng).unwrap(); - let diem_root_key_path = config_path.join("mint.key"); + let aptos_root_key_path = config_path.join("mint.key"); let serialized_keys = bcs::to_bytes(&root_keys.root_key).unwrap(); - let mut key_file = std::fs::File::create(&diem_root_key_path).unwrap(); + let mut key_file = std::fs::File::create(&aptos_root_key_path).unwrap(); key_file.write_all(&serialized_keys).unwrap(); // Prepare log file since we cannot automatically route logs to stderr @@ -179,7 +179,7 @@ pub fn load_test_environment( println!("Completed generating configuration:"); println!("\tLog file: {:?}", log_file); println!("\tConfig path: {:?}", validators[0].config_path()); - println!("\tDiem root key path: {:?}", diem_root_key_path); + println!("\tDiem root key path: {:?}", aptos_root_key_path); println!("\tWaypoint: {}", genesis_waypoint); println!("\tChainId: {}", ChainId::test()); @@ -211,19 +211,19 @@ fn fetch_chain_id(db: &DbReaderWriter) -> ChainId { let blob = db .reader .get_account_state_with_proof_by_version( - diem_root_address(), + aptos_root_address(), (&*db.reader) .fetch_synced_version() - .expect("[diem-node] failed fetching synced version."), + .expect("[aptos-node] failed fetching synced version."), ) - .expect("[diem-node] failed to get Diem root address account state") + .expect("[aptos-node] failed to get Diem root address account state") .0 - .expect("[diem-node] missing Diem root address account state"); + .expect("[aptos-node] missing Diem root address account state"); AccountState::try_from(&blob) - .expect("[diem-node] failed to convert blob to account state") + .expect("[aptos-node] failed to convert blob to account state") .get_chain_id_resource() - .expect("[diem-node] failed to get chain ID resource") - .expect("[diem-node] missing chain ID resource") + .expect("[aptos-node] failed to get chain ID resource") + .expect("[aptos-node] missing chain ID resource") .chain_id() } @@ -263,9 +263,9 @@ fn create_state_sync_runtimes( ); // Start the diem data client - let (diem_data_client, diem_data_client_runtime) = setup_diem_data_client( + let (aptos_data_client, aptos_data_client_runtime) = setup_aptos_data_client( node_config.state_sync.storage_service, - node_config.state_sync.diem_data_client, + node_config.state_sync.aptos_data_client, storage_service_client_network_handles, peer_metadata_storage, ); @@ -273,7 +273,7 @@ fn create_state_sync_runtimes( // Start the data streaming service let (streaming_service_client, streaming_service_runtime) = setup_data_streaming_service( node_config.state_sync.data_streaming_service, - diem_data_client.clone(), + aptos_data_client.clone(), ); // Create the chunk executor @@ -291,13 +291,13 @@ fn create_state_sync_runtimes( node_config, waypoint, event_subscription_service, - diem_data_client, + aptos_data_client, streaming_service_client, ); // Create and return the new state sync handle StateSyncRuntimes::new( - diem_data_client_runtime, + aptos_data_client_runtime, state_sync_multiplexer, storage_service_runtime, streaming_service_runtime, @@ -306,13 +306,13 @@ fn create_state_sync_runtimes( fn setup_data_streaming_service( config: DataStreamingServiceConfig, - diem_data_client: DiemNetDataClient, + aptos_data_client: DiemNetDataClient, ) -> (StreamingServiceClient, Runtime) { // Create the data streaming service let (streaming_service_client, streaming_service_listener) = new_streaming_service_client_listener_pair(); let data_streaming_service = - DataStreamingService::new(config, diem_data_client, streaming_service_listener); + DataStreamingService::new(config, aptos_data_client, streaming_service_listener); // Start the data streaming service let streaming_service_runtime = Builder::new_multi_thread() @@ -325,9 +325,9 @@ fn setup_data_streaming_service( (streaming_service_client, streaming_service_runtime) } -fn setup_diem_data_client( +fn setup_aptos_data_client( storage_service_config: StorageServiceConfig, - diem_data_client_config: DiemDataClientConfig, + aptos_data_client_config: DiemDataClientConfig, network_handles: HashMap, peer_metadata_storage: Arc, ) -> (DiemNetDataClient, Runtime) { @@ -338,22 +338,22 @@ fn setup_diem_data_client( ); // Create the diem data client - let (diem_data_client, data_summary_poller) = DiemNetDataClient::new( - diem_data_client_config, + let (aptos_data_client, data_summary_poller) = DiemNetDataClient::new( + aptos_data_client_config, storage_service_config, TimeService::real(), network_client, ); // Create a new runtime for the diem data client and spawn the data poller - let diem_data_client_runtime = Builder::new_multi_thread() - .thread_name("diem-data-client") + let aptos_data_client_runtime = Builder::new_multi_thread() + .thread_name("aptos-data-client") .enable_all() .build() .expect("Failed to create diem data client!"); - diem_data_client_runtime.spawn(data_summary_poller.start()); + aptos_data_client_runtime.spawn(data_summary_poller.start()); - (diem_data_client, diem_data_client_runtime) + (aptos_data_client, aptos_data_client_runtime) } fn setup_state_sync_storage_service( @@ -427,7 +427,7 @@ async fn periodic_state_dump(node_config: NodeConfig, db: DbReaderWriter) { } } -pub fn setup_environment(node_config: &NodeConfig, logger: Option>) -> DiemHandle { +pub fn setup_environment(node_config: &NodeConfig, logger: Option>) -> AptosHandle { let debug_if = setup_debug_interface(node_config, logger); let metrics_port = node_config.debug_interface.metrics_server_port; @@ -563,7 +563,7 @@ pub fn setup_environment(node_config: &NodeConfig, logger: Option>) // Create the endpoints to connect the Network to mempool. let (mempool_sender, mempool_events) = network_builder.add_p2p_service( - &diem_mempool::network::network_endpoint_config(MEMPOOL_NETWORK_CHANNEL_BUFFER_SIZE), + &aptos_mempool::network::network_endpoint_config(MEMPOOL_NETWORK_CHANNEL_BUFFER_SIZE), ); mempool_network_handles.push((network_id, mempool_sender, mempool_events)); @@ -621,7 +621,7 @@ pub fn setup_environment(node_config: &NodeConfig, logger: Option>) let (consensus_to_mempool_sender, consensus_requests) = channel(INTRA_NODE_CHANNEL_BUFFER_SIZE); instant = Instant::now(); - let mempool = diem_mempool::bootstrap( + let mempool = aptos_mempool::bootstrap( node_config, Arc::clone(&db_rw.reader), mempool_network_handles, @@ -667,7 +667,7 @@ pub fn setup_environment(node_config: &NodeConfig, logger: Option>) .handle() .spawn(periodic_state_dump(node_config.to_owned(), db_rw)); - DiemHandle { + AptosHandle { _api: api_runtime, _backup: backup_service, _consensus_runtime: consensus_runtime, diff --git a/diem-node/src/main.rs b/aptos-node/src/main.rs similarity index 93% rename from diem-node/src/main.rs rename to aptos-node/src/main.rs index 2eb006a8417e3..8dab2604c1f24 100644 --- a/diem-node/src/main.rs +++ b/aptos-node/src/main.rs @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 #![forbid(unsafe_code)] -use diem_config::config::NodeConfig; -use diem_types::on_chain_config::VMPublishingOption; +use aptos_config::config::NodeConfig; +use aptos_types::on_chain_config::VMPublishingOption; use hex::FromHex; use rand::{rngs::StdRng, SeedableRng}; use std::path::PathBuf; @@ -77,7 +77,7 @@ fn main() { } else { diem_framework_releases::current_module_blobs().to_vec() }; - diem_node::load_test_environment( + aptos_node::load_test_environment( args.config, args.random_ports, args.lazy, @@ -88,6 +88,6 @@ fn main() { } else { let config = NodeConfig::load(args.config.unwrap()).expect("Failed to load node config"); println!("Using node config {:?}", &config); - diem_node::start(&config, None); + aptos_node::start(&config, None); }; } diff --git a/config/Cargo.toml b/config/Cargo.toml index f0350045d1007..a9958e0dad8f7 100644 --- a/config/Cargo.toml +++ b/config/Cargo.toml @@ -1,8 +1,8 @@ [package] -name = "diem-config" +name = "aptos-config" version = "0.1.0" authors = ["Diem Association "] -description = "Diem diem-config" +description = "Diem aptos-config" repository = "https://github.com/diem/diem" homepage = "https://diem.com" license = "Apache-2.0" @@ -19,20 +19,20 @@ serde_yaml = "0.8.17" thiserror = "1.0.24" bcs = "0.1.2" -diem-crypto = { path = "../crates/diem-crypto" } -diem-crypto-derive = { path = "../crates/diem-crypto-derive" } -diem-global-constants = { path = "./global-constants"} -diem-logger = { path = "../crates/diem-logger" } -diem-secure-storage = { path = "../secure/storage" } -diem-temppath = { path = "../crates/diem-temppath" } -diem-types = { path = "../types" } -diem-workspace-hack = { version = "0.1", path = "../crates/diem-workspace-hack" } +aptos-crypto = { path = "../crates/aptos-crypto" } +aptos-crypto-derive = { path = "../crates/aptos-crypto-derive" } +aptos-global-constants = { path = "./global-constants"} +aptos-logger = { path = "../crates/aptos-logger" } +aptos-secure-storage = { path = "../secure/storage" } +aptos-temppath = { path = "../crates/aptos-temppath" } +aptos-types = { path = "../types" } +aptos-workspace-hack = { version = "0.1", path = "../crates/aptos-workspace-hack" } short-hex-str = { path = "../crates/short-hex-str" } [dev-dependencies] -diem-crypto = { path = "../crates/diem-crypto", features = ["fuzzing"] } +aptos-crypto = { path = "../crates/aptos-crypto", features = ["fuzzing"] } [features] default = [] -fuzzing = ["diem-crypto/fuzzing", "diem-types/fuzzing"] +fuzzing = ["aptos-crypto/fuzzing", "aptos-types/fuzzing"] testing = [] diff --git a/config/data/metrics/prometheus.yml b/config/data/metrics/prometheus.yml index bf4e53d2ab520..af553662f0fac 100644 --- a/config/data/metrics/prometheus.yml +++ b/config/data/metrics/prometheus.yml @@ -19,7 +19,7 @@ rule_files: # Here it's Prometheus itself. scrape_configs: # The job name is added as a label `job=` to any timeseries scraped from this config. - - job_name: 'diem-node' + - job_name: 'aptos-node' honor_labels: true # metrics_path defaults to '/metrics' diff --git a/config/generate-key/Cargo.toml b/config/generate-key/Cargo.toml index ca36b41f9631a..2bdd34ae49c64 100644 --- a/config/generate-key/Cargo.toml +++ b/config/generate-key/Cargo.toml @@ -13,6 +13,6 @@ edition = "2018" rand = "0.8.3" bcs = "0.1.2" -diem-crypto = { path = "../../crates/diem-crypto/"} -diem-temppath = { path = "../../crates/diem-temppath" } -diem-workspace-hack = { version = "0.1", path = "../../crates/diem-workspace-hack" } +aptos-crypto = { path = "../../crates/aptos-crypto/"} +aptos-temppath = { path = "../../crates/aptos-temppath" } +aptos-workspace-hack = { version = "0.1", path = "../../crates/aptos-workspace-hack" } diff --git a/config/generate-key/src/lib.rs b/config/generate-key/src/lib.rs index 61bbba1ac10b2..8babccb6e6e8e 100644 --- a/config/generate-key/src/lib.rs +++ b/config/generate-key/src/lib.rs @@ -3,7 +3,7 @@ #![forbid(unsafe_code)] -use diem_crypto::{ed25519::Ed25519PrivateKey, Uniform}; +use aptos_crypto::{ed25519::Ed25519PrivateKey, Uniform}; use rand::{rngs::OsRng, Rng, SeedableRng}; use std::{ fs::{self, File}, @@ -45,7 +45,7 @@ pub fn load_key>(input_file: P) -> Ed25519PrivateKey { #[cfg(test)] mod test { use super::*; - use diem_temppath::TempPath; + use aptos_temppath::TempPath; #[test] fn verify_test_create_and_load_key() { diff --git a/config/global-constants/Cargo.toml b/config/global-constants/Cargo.toml index 36afd1a3e92cf..f23a47a55055f 100644 --- a/config/global-constants/Cargo.toml +++ b/config/global-constants/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "diem-global-constants" +name = "aptos-global-constants" version = "0.1.0" authors = ["Diem Association "] description = "Diem's global constant crate: the source of truth for constant definitions that span multiple crates" diff --git a/config/global-constants/src/lib.rs b/config/global-constants/src/lib.rs index 0f7d1c15de83b..758943fd6b21f 100644 --- a/config/global-constants/src/lib.rs +++ b/config/global-constants/src/lib.rs @@ -9,10 +9,10 @@ #![forbid(unsafe_code)] /// Definitions of global cryptographic keys (e.g., as held in secure storage) +pub const APTOS_ROOT_KEY: &str = "aptos_root"; pub const CONSENSUS_KEY: &str = "consensus"; pub const EXECUTION_KEY: &str = "execution"; pub const FULLNODE_NETWORK_KEY: &str = "fullnode_network"; -pub const DIEM_ROOT_KEY: &str = "diem_root"; pub const TREASURY_COMPLIANCE_KEY: &str = "treasury_compliance"; pub const OPERATOR_ACCOUNT: &str = "operator_account"; pub const OPERATOR_KEY: &str = "operator"; diff --git a/config/management/Cargo.toml b/config/management/Cargo.toml index 07866034ce836..ea7eb408c2967 100644 --- a/config/management/Cargo.toml +++ b/config/management/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "diem-management" +name = "aptos-management" version = "0.1.0" authors = ["Diem Association "] description = "Diem Management is a tool used to manage the configuration of a Diem Node" @@ -19,19 +19,19 @@ thiserror = "1.0.24" toml = { version = "0.5.8", default-features = false } bcs = "0.1.2" -diem-config = { path = ".."} -diem-crypto = { path = "../../crates/diem-crypto" } -diem-global-constants = { path = "../global-constants"} -diem-secure-storage = { path = "../../secure/storage" } -diem-time-service = { path = "../../crates/diem-time-service" } -diem-types = { path = "../../types" } -diem-workspace-hack = { version = "0.1", path = "../../crates/diem-workspace-hack" } -diem-temppath = { path = "../../crates/diem-temppath" } -diem-transaction-builder = { path = "../../sdk/transaction-builder" } +aptos-config = { path = ".."} +aptos-crypto = { path = "../../crates/aptos-crypto" } +aptos-global-constants = { path = "../global-constants"} +aptos-secure-storage = { path = "../../secure/storage" } +aptos-time-service = { path = "../../crates/aptos-time-service" } +aptos-types = { path = "../../types" } +aptos-workspace-hack = { version = "0.1", path = "../../crates/aptos-workspace-hack" } +aptos-temppath = { path = "../../crates/aptos-temppath" } +aptos-transaction-builder = { path = "../../sdk/transaction-builder" } [dev-dependencies] -diem-config = { path = "..", features = ["fuzzing"] } +aptos-config = { path = "..", features = ["fuzzing"] } [features] testing = [] -fuzzing = ["diem-config/fuzzing"] +fuzzing = ["aptos-config/fuzzing"] diff --git a/config/management/README.md b/config/management/README.md index ed276ea65bbd5..ca2413899e5dc 100644 --- a/config/management/README.md +++ b/config/management/README.md @@ -1,14 +1,14 @@ # Diem Management tools -The `diem-management` crate provides a framework for building CLI tools for various +The `aptos-management` crate provides a framework for building CLI tools for various purposes. The purpose of breaking these into multiple tools is to simplify the user experience, and prevent confusion between the different use cases. ### The Tools ``` -diem-management -|-> diem-genesis-tool = A tool for performing the genesis ceremony for the Diem blockchain. -|-> diem-operational-tool = A tool for performing management operations on the Diem blockchain. +aptos-management +|-> aptos-genesis-tool = A tool for performing the genesis ceremony for the Diem blockchain. +|-> aptos-operational-tool = A tool for performing management operations on the Diem blockchain. ``` There are README's for each tool individually. diff --git a/config/management/genesis/Cargo.toml b/config/management/genesis/Cargo.toml index ef340836eb8ee..6e660ae62c85e 100644 --- a/config/management/genesis/Cargo.toml +++ b/config/management/genesis/Cargo.toml @@ -1,10 +1,10 @@ [package] -name = "diem-genesis-tool" +name = "aptos-genesis-tool" version = "0.1.0" authors = ["Diem Association "] description = "A tool to manage genesis" repository = "https://github.com/diem/diem" -homepage = "https://diem.com" +homepage = "https://aptoslabs.com" license = "Apache-2.0" publish = false edition = "2018" @@ -21,23 +21,23 @@ consensus-types = { path = "../../../consensus/consensus-types" } executor = { path = "../../../execution/executor" } generate-key = { path = "../../generate-key" } bcs = "0.1.2" -diem-config = { path = "../.."} -diem-crypto = { path = "../../../crates/diem-crypto" } -diem-framework-releases = { path = "../../../diem-move/diem-framework/DPN/releases"} -diem-global-constants = { path = "../../global-constants" } -diem-management = { path = ".." } -diem-secure-storage = { path = "../../../secure/storage" } -diem-types = { path = "../../../types" } -diem-workspace-hack = { version = "0.1", path = "../../../crates/diem-workspace-hack" } -diem-temppath = { path = "../../../crates/diem-temppath" } -diem-vm = { path = "../../../diem-move/diem-vm" } -diemdb = { path = "../../../storage/diemdb" } +aptos-config = { path = "../.."} +aptos-crypto = { path = "../../../crates/aptos-crypto" } +diem-framework-releases = { path = "../../../aptos-move/diem-framework/DPN/releases"} +aptos-global-constants = { path = "../../global-constants" } +aptos-management = { path = ".." } +aptos-secure-storage = { path = "../../../secure/storage" } +aptos-types = { path = "../../../types" } +aptos-workspace-hack = { version = "0.1", path = "../../../crates/aptos-workspace-hack" } +aptos-temppath = { path = "../../../crates/aptos-temppath" } +aptos-vm = { path = "../../../aptos-move/aptos-vm" } +aptosdb = { path = "../../../storage/aptosdb" } storage-interface = { path = "../../../storage/storage-interface" } -vm-genesis = { path = "../../../diem-move/vm-genesis" } +vm-genesis = { path = "../../../aptos-move/vm-genesis" } [dev-dependencies] -diem-config = { path = "../..", features = ["fuzzing"]} +aptos-config = { path = "../..", features = ["fuzzing"]} [features] testing = [] -fuzzing = ["diem-config/fuzzing"] +fuzzing = ["aptos-config/fuzzing"] diff --git a/config/management/genesis/README.md b/config/management/genesis/README.md index 3853d336ca1ef..2330dd41beebb 100644 --- a/config/management/genesis/README.md +++ b/config/management/genesis/README.md @@ -1,8 +1,8 @@ -# Diem Config Manager +# Aptos Config Manager -The `diem-genesis-tool` provides a tool for the genesis ceremony of the Diem blockchain. The functionality of the tool is dictated by the organization of nodes within the system: +The `aptos-genesis-tool` provides a tool for the genesis ceremony of the Aptos blockchain. The functionality of the tool is dictated by the organization of nodes within the system: -* A diem root account that maintains the set of validator owners, validator operators, and the active validator set. +* A aptos root account that maintains the set of validator owners, validator operators, and the active validator set. * A treasury compliance account that maintains VASPs, DDs, and other related topics. * The initial set of Move modules published at genesis. * Validator owners (OW) that have accounts on the blockchain. These accounts contain a validator configuration and specify a validator operator. @@ -13,7 +13,7 @@ The process for starting organization of the planned and current functionality i * Initialization ceremony * The association sets up a secure-backend for data uploads, `shared storage`, e.g., GitHub. The association then distributes credentials for each OW and OP. - * The association generates its `diem root key` and shares the public key to the `shared storage`. + * The association generates its `aptos root key` and shares the public key to the `shared storage`. * The association uploads the initial set of Move modules to `shared storage`. * Each OW will generate a private `owner key` and share the public key to the `shared storage`. * Each OP will generate a private `operator key` and share the public key to the `shared storage`. @@ -25,23 +25,23 @@ The process for starting organization of the planned and current functionality i * The association will download the accumulated data to produce both a genesis.blob and genesis waypoint. * Starting * The association publishes the data associated with genesis, the genesis.blob, and the genesis waypoint. - * Each OP downloads the genesis waypoint provided by the association and inserts it into their Diem instance(s). + * Each OP downloads the genesis waypoint provided by the association and inserts it into their Aptos instance(s). * Each OP verifies that the genesis.blob, waypoint, and local configuration are correct and broadcast their results to other OPs and the association. * Upon a quorum of validators having correct status, the association instructs the OPs to begin their validators. * Upon a quorum of validators coming online, the blockchain will begin processing transactions. Notes: -* This describes a process for instantiating organization that has yet to be specified but extends from the current state of the Diem Testnet. +* This describes a process for instantiating organization that has yet to be specified but extends from the current state of the Aptos Testnet. * The implementation as described has yet to be fully implemented in Move, hence, this tool maps to the current state. * A new OP / OW onboarding to an existing blockchain follow the same process and delegate the initial creation of accounts and setting of configuration to the association. ## Requirements -Each individual instance, OW or OP, should have access to a secure storage solution. Those leveraging Diem Secure Storage can directly use this tool, those that do not will need to provide their own tooling. +Each individual instance, OW or OP, should have access to a secure storage solution. Those leveraging Aptos Secure Storage can directly use this tool, those that do not will need to provide their own tooling. ## The Tools -`diem-genesis-tool` offers several facilities: +`aptos-genesis-tool` offers several facilities: * Simplified configuration management via a config file that can store frequently reused paramters including validator and shared storage. * Retrieving and submitting OW, OP, and validator configuration -- this is from a local secure storage to a remote secure storage -- leveraging the identity tool. @@ -55,13 +55,13 @@ In addition, the association will provide an entry point into a `shared storage` Each participant must retrieve an appropriate GitHub [token](https://github.com/settings/tokens) for their account that allows access to the `repo` scope. This token must be stored locally on their disk in a file accessible to the management tool. -Finally, each participant should initialize their respective key: `diem_root`, `treasury_compliance`, `owner`, or `operator` in a secure storage solution. How this is done is outside the scope of this document. +Finally, each participant should initialize their respective key: `aptos_root`, `treasury_compliance`, `owner`, or `operator` in a secure storage solution. How this is done is outside the scope of this document. The remainder of this section specifies distinct behaviors for each role. ### Build a Configuration File -While `diem-genesis-tool` supports setting the backends on each command, doing so is cumbersome and fraught with error. Instead, all participants, should first construct a configuration file for use in genesis and later use via the operational tool. Below is an example configuration file in yaml format: +While `aptos-genesis-tool` supports setting the backends on each command, doing so is cumbersome and fraught with error. Instead, all participants, should first construct a configuration file for use in genesis and later use via the operational tool. Below is an example configuration file in yaml format: ``` # config.yaml @@ -86,7 +86,7 @@ validator_backend: Overview of fields: * `chain_id` specifies a distinct chain and is written into genesis, checked during network connections, and part of each transaction. It is provided by the association. -* `json_server` specifies a Diem JSON Server. This can be any that connect to your network including your own of one run by the association. It is not used in genesis, so a dummy value is acceptable during initial configuration. +* `json_server` specifies a Aptos JSON Server. This can be any that connect to your network including your own of one run by the association. It is not used in genesis, so a dummy value is acceptable during initial configuration. * `shared_backend` is a pointer to the associaton's `shared storage`. * `validator_backend` is a pointer to the local validator node's secure storage. @@ -94,34 +94,34 @@ Overview of fields: * The association will publish a layout containing the distinct names and roles of the participants to `shared storage`: ``` -cargo run -p diem-genesis-tool -- \ +cargo run -p aptos-genesis-tool -- \ set-layout \ --config config_file.yaml \ --path $PATH_TO_LAYOUT ``` * The association will publish the initial set of Move modules to `shared storage`: ``` -cargo run -p diem-genesis-tool -- \ +cargo run -p aptos-genesis-tool -- \ set-move-modules \ --config config_file.yaml \ --dir $MOVE_MODULES_DIR ``` This should be a directory containing only Move bytecode files (`.mv` extension). -* The association will publish the the `diem root` public key to the `shared storage`: +* The association will publish the the `aptos root` public key to the `shared storage`: ``` -cargo run -p diem-genesis-tool -- \ - diem-root-key \ +cargo run -p aptos-genesis-tool -- \ + aptos-root-key \ --config config_file.yaml ``` * The association will publish the the `treasury compliance` public key to the `shared storage`: ``` -cargo run -p diem-genesis-tool -- \ - diem-treasury-compliance-key \ +cargo run -p aptos-genesis-tool -- \ + aptos-treasury-compliance-key \ --config config_file.yaml ``` * Upon both OW and OP completing their portion of this process, the association will build a genesis waypoint: ``` -cargo run -p diem-genesis-tool -- \ +cargo run -p aptos-genesis-tool -- \ create-waypoint \ --config config_file.yaml ``` @@ -130,7 +130,7 @@ The layout is a toml configuration file of the following format: ``` [operator] = ["alice", "bob"] [owner] = ["carol", "dave"] -diem_root = "erin" +aptos_root = "erin" treasury_compliance = "fred" ``` where each field maps to a role as described in this document. @@ -139,13 +139,13 @@ where each field maps to a role as described in this document. * Each Validator Owner member will upload their key to GitHub: ``` -cargo run -p diem-genesis-tool -- \ +cargo run -p aptos-genesis-tool -- \ owner-key \ --config config_file.yaml ``` * Each OW will select the OP responsible for operating the validator node. This selection is done by specifying the name of the OP (as registered in the shared Github): ``` -cargo run -p diem-genesis-tool -- +cargo run -p aptos-genesis-tool -- set-operator \ --config config_file.yaml \ --operator-name $OPERATOR_NAME @@ -155,13 +155,13 @@ cargo run -p diem-genesis-tool -- * Each Validator Operator member will upload their key to GitHub: ``` -cargo run -p diem-genesis-tool -- +cargo run -p aptos-genesis-tool -- operator-key \ --config config_file.yaml ``` * For each validator managed by an operator, the operator will upload a signed validator-config. The owner corresponds to the name of the OW (as registered in the shared Github). The namespace in GitHub correlates to the operator namespace: ``` -cargo run -p diem-genesis-tool -- +cargo run -p aptos-genesis-tool -- validator-config \ --config config_file.yaml \ --owner-name $OWNER_NAME \ @@ -170,14 +170,14 @@ cargo run -p diem-genesis-tool -- ``` * Upon receiving signal from the association, OPs can now build genesis: ``` -cargo run -p diem-genesis-tool -- \ +cargo run -p aptos-genesis-tool -- \ genesis \ --config config_file.yaml \ --path $PATH_TO_GENESIS \ ``` * Similarly, the association should publish a genesis waypoint, and the OP should insert it into their storage (using the management tool): ``` -cargo run -p diem-genesist-tool -- \ +cargo run -p aptos-genesis-tool -- \ insert-waypoint \ --config config_file.yaml \ --waypoint $WAYPOINT @@ -185,7 +185,7 @@ cargo run -p diem-genesist-tool -- \ * Perform a verify that ensures the local store maps to Genesis and Genesis maps to the waypoint: ``` -cargo run -p diem-genesis-tool -- \ +cargo run -p aptos-genesis-tool -- \ verify \ --config config_file.yaml \ --genesis_path $PATH_TO_GENESIS diff --git a/config/management/genesis/src/builder.rs b/config/management/genesis/src/builder.rs index 13abc451b8b28..f39a287e95c44 100644 --- a/config/management/genesis/src/builder.rs +++ b/config/management/genesis/src/builder.rs @@ -3,13 +3,13 @@ use crate::layout::Layout; use anyhow::Result; -use diem_crypto::ed25519::Ed25519PublicKey; -use diem_global_constants::{ - DIEM_ROOT_KEY, MOVE_MODULES, OPERATOR_KEY, OWNER_KEY, TREASURY_COMPLIANCE_KEY, +use aptos_crypto::ed25519::Ed25519PublicKey; +use aptos_global_constants::{ + APTOS_ROOT_KEY, MOVE_MODULES, OPERATOR_KEY, OWNER_KEY, TREASURY_COMPLIANCE_KEY, }; -use diem_management::constants::{self, VALIDATOR_CONFIG, VALIDATOR_OPERATOR}; -use diem_secure_storage::{KVStorage, Namespaced}; -use diem_types::{ +use aptos_management::constants::{self, VALIDATOR_CONFIG, VALIDATOR_OPERATOR}; +use aptos_secure_storage::{KVStorage, Namespaced}; +use aptos_types::{ chain_id::ChainId, on_chain_config::{OnChainConsensusConfig, VMPublishingOption}, transaction::{ @@ -66,15 +66,15 @@ impl GenesisBuilder { pub fn set_root_key(&mut self, root_key: Ed25519PublicKey) -> Result<()> { let layout = self.layout()?; - self.with_namespace_mut(&layout.diem_root) - .set(DIEM_ROOT_KEY, root_key) + self.with_namespace_mut(&layout.aptos_root) + .set(APTOS_ROOT_KEY, root_key) .map_err(Into::into) } pub fn root_key(&self) -> Result { let layout = self.layout()?; - self.with_namespace(&layout.diem_root) - .get(DIEM_ROOT_KEY) + self.with_namespace(&layout.aptos_root) + .get(APTOS_ROOT_KEY) .map(|r| r.value) .map_err(Into::into) } @@ -132,7 +132,7 @@ impl GenesisBuilder { let mut validators = Vec::new(); for owner in &layout.owners { let name = owner.as_bytes().to_vec(); - let address = diem_config::utils::default_validator_owner_auth_key_from_name(&name) + let address = aptos_config::utils::default_validator_owner_auth_key_from_name(&name) .derived_address(); let auth_key = self .owner_key(owner) @@ -217,13 +217,13 @@ impl GenesisBuilder { publishing_option: Option, consensus_config: OnChainConsensusConfig, ) -> Result { - let diem_root_key = self.root_key()?; + let aptos_root_key = self.root_key()?; let treasury_compliance_key = self.treasury_compliance_key()?; let validators = self.validators()?; let move_modules = self.move_modules()?; let genesis = vm_genesis::encode_genesis_transaction( - diem_root_key, + aptos_root_key, treasury_compliance_key, &validators, &move_modules, diff --git a/config/management/genesis/src/command.rs b/config/management/genesis/src/command.rs index 9e7bfde6dac29..fc9992fbbada2 100644 --- a/config/management/genesis/src/command.rs +++ b/config/management/genesis/src/command.rs @@ -1,8 +1,8 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_crypto::ed25519::Ed25519PublicKey; -use diem_management::{error::Error, execute_command}; -use diem_types::{transaction::Transaction, waypoint::Waypoint}; +use aptos_crypto::ed25519::Ed25519PublicKey; +use aptos_management::{error::Error, execute_command}; +use aptos_types::{transaction::Transaction, waypoint::Waypoint}; use structopt::StructOpt; #[derive(Debug, StructOpt)] @@ -13,9 +13,9 @@ pub enum Command { #[structopt(about = "Retrieves data from a store to produce genesis")] Genesis(crate::genesis::Genesis), #[structopt(about = "Set the waypoint in the validator storage")] - InsertWaypoint(diem_management::waypoint::InsertWaypoint), - #[structopt(about = "Submits an Ed25519PublicKey for the diem root")] - DiemRootKey(crate::key::DiemRootKey), + InsertWaypoint(aptos_management::waypoint::InsertWaypoint), + #[structopt(about = "Submits an Ed25519PublicKey for the aptos root")] + AptosRootKey(crate::key::AptosRootKey), #[structopt(about = "Submits an Ed25519PublicKey for the operator")] OperatorKey(crate::key::OperatorKey), #[structopt(about = "Submits an Ed25519PublicKey for the owner")] @@ -39,7 +39,7 @@ pub enum CommandName { CreateWaypoint, Genesis, InsertWaypoint, - DiemRootKey, + AptosRootKey, OperatorKey, OwnerKey, SetLayout, @@ -56,7 +56,7 @@ impl From<&Command> for CommandName { Command::CreateWaypoint(_) => CommandName::CreateWaypoint, Command::Genesis(_) => CommandName::Genesis, Command::InsertWaypoint(_) => CommandName::InsertWaypoint, - Command::DiemRootKey(_) => CommandName::DiemRootKey, + Command::AptosRootKey(_) => CommandName::AptosRootKey, Command::OperatorKey(_) => CommandName::OperatorKey, Command::OwnerKey(_) => CommandName::OwnerKey, Command::SetLayout(_) => CommandName::SetLayout, @@ -75,7 +75,7 @@ impl std::fmt::Display for CommandName { CommandName::CreateWaypoint => "create-waypoint", CommandName::Genesis => "genesis", CommandName::InsertWaypoint => "insert-waypoint", - CommandName::DiemRootKey => "diem-root-key", + CommandName::AptosRootKey => "aptos-root-key", CommandName::OperatorKey => "operator-key", CommandName::OwnerKey => "owner-key", CommandName::SetLayout => "set-layout", @@ -97,7 +97,7 @@ impl Command { } Command::Genesis(_) => self.genesis().map(|_| "Success!".to_string()), Command::InsertWaypoint(_) => self.insert_waypoint().map(|_| "Success!".to_string()), - Command::DiemRootKey(_) => self.diem_root_key().map(|_| "Success!".to_string()), + Command::AptosRootKey(_) => self.aptos_root_key().map(|_| "Success!".to_string()), Command::OperatorKey(_) => self.operator_key().map(|_| "Success!".to_string()), Command::OwnerKey(_) => self.owner_key().map(|_| "Success!".to_string()), Command::SetLayout(_) => self.set_layout().map(|_| "Success!".to_string()), @@ -123,8 +123,8 @@ impl Command { execute_command!(self, Command::InsertWaypoint, CommandName::InsertWaypoint) } - pub fn diem_root_key(self) -> Result { - execute_command!(self, Command::DiemRootKey, CommandName::DiemRootKey) + pub fn aptos_root_key(self) -> Result { + execute_command!(self, Command::AptosRootKey, CommandName::AptosRootKey) } pub fn operator_key(self) -> Result { @@ -173,11 +173,11 @@ impl Command { pub mod tests { use super::*; use crate::storage_helper::StorageHelper; - use diem_crypto::{ed25519::Ed25519PrivateKey, PrivateKey, Uniform}; - use diem_global_constants::{OPERATOR_KEY, OWNER_KEY}; - use diem_management::constants; - use diem_secure_storage::KVStorage; - use diem_types::{account_address, chain_id::ChainId, transaction::TransactionPayload}; + use aptos_crypto::{ed25519::Ed25519PrivateKey, PrivateKey, Uniform}; + use aptos_global_constants::{OPERATOR_KEY, OWNER_KEY}; + use aptos_management::constants; + use aptos_secure_storage::KVStorage; + use aptos_types::{account_address, chain_id::ChainId, transaction::TransactionPayload}; use std::{ fs::File, io::{Read, Write}, @@ -190,7 +190,7 @@ pub mod tests { // Each identity works in their own namespace // Alice, Bob, and Carol are owners. // Operator_Alice, Operator_Bob and Operator_Carol are operators. - // Dave is the diem root. + // Dave is the aptos root. // Each user will upload their contents to *_ns + "shared" // Common is used by the technical staff for coordination. let alice_ns = "alice"; @@ -208,11 +208,11 @@ pub mod tests { let layout_text = "\ operators = [\"operator_alice_shared\", \"operator_bob_shared\", \"operator_carol_shared\"]\n\ owners = [\"alice_shared\", \"bob_shared\", \"carol_shared\"]\n\ - diem_root = \"dave_shared\"\n\ + aptos_root = \"dave_shared\"\n\ treasury_compliance = \"dave_shared\"\n\ "; - let temppath = diem_temppath::TempPath::new(); + let temppath = aptos_temppath::TempPath::new(); temppath.create_as_file().unwrap(); let mut file = File::create(temppath.path()).unwrap(); file.write_all(&layout_text.to_string().into_bytes()) @@ -224,11 +224,11 @@ pub mod tests { .unwrap(); // Step 2) Upload the Move modules - let tempdir = diem_temppath::TempPath::new(); + let tempdir = aptos_temppath::TempPath::new(); tempdir.create_as_dir().unwrap(); for b in diem_framework_releases::current_module_blobs() { let mut temppath = - diem_temppath::TempPath::new_with_temp_dir(tempdir.path().to_path_buf()); + aptos_temppath::TempPath::new_with_temp_dir(tempdir.path().to_path_buf()); temppath.create_as_file().unwrap(); temppath.persist(); // otherwise, file will disappear before we call set_move_modules let mut file = File::create(temppath.path()).unwrap(); @@ -242,7 +242,7 @@ pub mod tests { // Step 3) Upload the root keys: helper.initialize_by_idx(dave_ns.into(), storage_idx); helper - .diem_root_key(dave_ns, &(dave_ns.to_string() + shared)) + .aptos_root_key(dave_ns, &(dave_ns.to_string() + shared)) .unwrap(); helper .treasury_compliance_key(dave_ns, &(dave_ns.to_string() + shared)) @@ -298,7 +298,7 @@ pub mod tests { } // Step 8) Produce genesis - let genesis_path = diem_temppath::TempPath::new(); + let genesis_path = aptos_temppath::TempPath::new(); genesis_path.create_as_file().unwrap(); helper .genesis(ChainId::test(), genesis_path.path()) @@ -321,7 +321,7 @@ pub mod tests { fn test_set_layout() { let helper = StorageHelper::new(); - let temppath = diem_temppath::TempPath::new(); + let temppath = aptos_temppath::TempPath::new(); helper .set_layout(temppath.path().to_str().unwrap()) .unwrap_err(); @@ -331,7 +331,7 @@ pub mod tests { let layout_text = "\ operators = [\"alice\", \"bob\"]\n\ owners = [\"carol\"]\n\ - diem_root = \"dave\"\n\ + aptos_root = \"dave\"\n\ treasury_compliance = \"other_dave\"\n\ "; file.write_all(&layout_text.to_string().into_bytes()) @@ -348,7 +348,7 @@ pub mod tests { #[test] fn test_validator_config() { - use diem_types::account_address::AccountAddress; + use aptos_types::account_address::AccountAddress; let storage_helper = StorageHelper::new(); let local_operator_ns = "local"; @@ -364,7 +364,7 @@ pub mod tests { let owner_name = "owner"; let owner_key = Ed25519PrivateKey::generate_for_testing().public_key(); let owner_account = - diem_config::utils::validator_owner_account_from_name(owner_name.as_bytes()); + aptos_config::utils::validator_owner_account_from_name(owner_name.as_bytes()); let mut shared_storage = storage_helper.storage(owner_name.into()); shared_storage .set(OWNER_KEY, owner_key) diff --git a/config/management/genesis/src/config_builder.rs b/config/management/genesis/src/config_builder.rs index c077c3d874aaf..5951ea023dc4e 100644 --- a/config/management/genesis/src/config_builder.rs +++ b/config/management/genesis/src/config_builder.rs @@ -2,10 +2,10 @@ // SPDX-License-Identifier: Apache-2.0 use crate::validator_builder::ValidatorBuilder; -use diem_config::config::NodeConfig; -use diem_crypto::ed25519::Ed25519PrivateKey; -use diem_secure_storage::{CryptoStorage, KVStorage, Storage}; -use diem_temppath::TempPath; +use aptos_config::config::NodeConfig; +use aptos_crypto::ed25519::Ed25519PrivateKey; +use aptos_secure_storage::{CryptoStorage, KVStorage, Storage}; +use aptos_temppath::TempPath; use rand::{rngs::StdRng, SeedableRng}; pub fn test_config() -> (NodeConfig, Ed25519PrivateKey) { @@ -30,37 +30,37 @@ pub fn test_config() -> (NodeConfig, Ed25519PrivateKey) { .identity_from_storage() .backend; let storage: Storage = std::convert::TryFrom::try_from(backend).unwrap(); - let mut test = diem_config::config::TestConfig::new_with_temp_dir(Some(path)); + let mut test = aptos_config::config::TestConfig::new_with_temp_dir(Some(path)); test.execution_key( storage - .export_private_key(diem_global_constants::EXECUTION_KEY) + .export_private_key(aptos_global_constants::EXECUTION_KEY) .unwrap(), ); test.operator_key( storage - .export_private_key(diem_global_constants::OPERATOR_KEY) + .export_private_key(aptos_global_constants::OPERATOR_KEY) .unwrap(), ); test.owner_key( storage - .export_private_key(diem_global_constants::OWNER_KEY) + .export_private_key(aptos_global_constants::OWNER_KEY) .unwrap(), ); config.test = Some(test); let owner_account = storage - .get(diem_global_constants::OWNER_ACCOUNT) + .get(aptos_global_constants::OWNER_ACCOUNT) .unwrap() .value; - let mut sr_test = diem_config::config::SafetyRulesTestConfig::new(owner_account); + let mut sr_test = aptos_config::config::SafetyRulesTestConfig::new(owner_account); sr_test.consensus_key( storage - .export_private_key(diem_global_constants::CONSENSUS_KEY) + .export_private_key(aptos_global_constants::CONSENSUS_KEY) .unwrap(), ); sr_test.execution_key( storage - .export_private_key(diem_global_constants::EXECUTION_KEY) + .export_private_key(aptos_global_constants::EXECUTION_KEY) .unwrap(), ); config.consensus.safety_rules.test = Some(sr_test); diff --git a/config/management/genesis/src/fullnode_builder.rs b/config/management/genesis/src/fullnode_builder.rs index 4b053bc5a93e5..86ba45c4b51fa 100644 --- a/config/management/genesis/src/fullnode_builder.rs +++ b/config/management/genesis/src/fullnode_builder.rs @@ -2,13 +2,13 @@ // SPDX-License-Identifier: Apache-2.0 use anyhow::{ensure, Result}; -use diem_config::{ +use aptos_config::{ config::{Identity, NodeConfig, PeerRole, RoleType, WaypointConfig}, generator::build_seed_for_network, network_id::NetworkId, }; -use diem_crypto::{x25519, Uniform}; -use diem_types::{transaction::Transaction, waypoint::Waypoint}; +use aptos_crypto::{x25519, Uniform}; +use aptos_types::{transaction::Transaction, waypoint::Waypoint}; use rand::rngs::OsRng; use std::{ fs::File, @@ -104,7 +104,7 @@ impl FullnodeConfig { if let Identity::None = network_config.identity { let key = x25519::PrivateKey::generate(&mut OsRng); - let peer_id = diem_types::account_address::from_identity_public_key(key.public_key()); + let peer_id = aptos_types::account_address::from_identity_public_key(key.public_key()); network_config.identity = Identity::from_config(key, peer_id); } } @@ -154,7 +154,7 @@ impl FullnodeConfig { if let Identity::None = fullnode_vfn_network.identity { let key = x25519::PrivateKey::generate(&mut OsRng); - let peer_id = diem_types::account_address::from_identity_public_key(key.public_key()); + let peer_id = aptos_types::account_address::from_identity_public_key(key.public_key()); fullnode_vfn_network.identity = Identity::from_config(key, peer_id); } diff --git a/config/management/genesis/src/genesis.rs b/config/management/genesis/src/genesis.rs index 36423bfa0efcd..3db3042de3987 100644 --- a/config/management/genesis/src/genesis.rs +++ b/config/management/genesis/src/genesis.rs @@ -2,12 +2,11 @@ // SPDX-License-Identifier: Apache-2.0 use crate::builder::GenesisBuilder; -use diem_management::{config::ConfigPath, error::Error, secure_backend::SharedBackend}; -use diem_secure_storage::Storage; -use diem_types::on_chain_config::VMPublishingOption; -use diem_types::{ +use aptos_management::{config::ConfigPath, error::Error, secure_backend::SharedBackend}; +use aptos_secure_storage::Storage; +use aptos_types::{ chain_id::ChainId, - on_chain_config::{ConsensusConfigV2, OnChainConsensusConfig}, + on_chain_config::{ConsensusConfigV2, OnChainConsensusConfig, VMPublishingOption}, transaction::Transaction, }; use std::{fs::File, io::Write, path::PathBuf}; @@ -28,7 +27,7 @@ pub struct Genesis { } impl Genesis { - fn config(&self) -> Result { + fn config(&self) -> Result { self.config .load()? .override_chain_id(self.chain_id) diff --git a/config/management/genesis/src/key.rs b/config/management/genesis/src/key.rs index 494f8aaa2cef1..30b30c48c9b28 100644 --- a/config/management/genesis/src/key.rs +++ b/config/management/genesis/src/key.rs @@ -1,8 +1,8 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_crypto::ed25519::Ed25519PublicKey; -use diem_management::{ +use aptos_crypto::ed25519::Ed25519PublicKey; +use aptos_management::{ config::ConfigPath, error::Error, secure_backend::{SecureBackend, SharedBackend}, @@ -10,7 +10,7 @@ use diem_management::{ use std::{convert::TryFrom, path::PathBuf, str::FromStr}; use structopt::StructOpt; -diem_management::secure_backend!( +aptos_management::secure_backend!( ValidatorBackend, validator_backend, "validator configuration", @@ -42,14 +42,14 @@ impl Key { .override_validator_backend(&self.validator_backend.validator_backend)?; let key = if let Some(path_to_key) = &self.path_to_key { - diem_management::read_key_from_file(path_to_key) + aptos_management::read_key_from_file(path_to_key) .map_err(|e| Error::UnableToReadFile(format!("{:?}", path_to_key), e))? } else { let mut validator_storage = config.validator_backend(); let key = validator_storage.ed25519_public_from_private(key_name)?; if let Some(account_name) = account_name { - let peer_id = diem_types::account_address::from_public_key(&key); + let peer_id = aptos_types::account_address::from_public_key(&key); validator_storage.set(account_name, peer_id)?; } key @@ -63,15 +63,15 @@ impl Key { } #[derive(Debug, StructOpt)] -pub struct DiemRootKey { +pub struct AptosRootKey { #[structopt(flatten)] key: Key, } -impl DiemRootKey { +impl AptosRootKey { pub fn execute(self) -> Result { self.key - .submit_key(diem_global_constants::DIEM_ROOT_KEY, None) + .submit_key(aptos_global_constants::APTOS_ROOT_KEY, None) } } @@ -84,8 +84,8 @@ pub struct OperatorKey { impl OperatorKey { pub fn execute(self) -> Result { self.key.submit_key( - diem_global_constants::OPERATOR_KEY, - Some(diem_global_constants::OPERATOR_ACCOUNT), + aptos_global_constants::OPERATOR_KEY, + Some(aptos_global_constants::OPERATOR_ACCOUNT), ) } } @@ -98,7 +98,7 @@ pub struct OwnerKey { impl OwnerKey { pub fn execute(self) -> Result { - self.key.submit_key(diem_global_constants::OWNER_KEY, None) + self.key.submit_key(aptos_global_constants::OWNER_KEY, None) } } @@ -111,7 +111,7 @@ pub struct TreasuryComplianceKey { impl TreasuryComplianceKey { pub fn execute(self) -> Result { self.key - .submit_key(diem_global_constants::TREASURY_COMPLIANCE_KEY, None) + .submit_key(aptos_global_constants::TREASURY_COMPLIANCE_KEY, None) } } @@ -119,17 +119,17 @@ impl TreasuryComplianceKey { mod tests { use super::*; use crate::storage_helper::StorageHelper; - use diem_secure_storage::{CryptoStorage, KVStorage}; + use aptos_secure_storage::{CryptoStorage, KVStorage}; #[test] fn test_owner_key() { - test_key(diem_global_constants::OWNER_KEY, StorageHelper::owner_key); + test_key(aptos_global_constants::OWNER_KEY, StorageHelper::owner_key); } #[test] fn test_operator_key() { test_key( - diem_global_constants::OPERATOR_KEY, + aptos_global_constants::OPERATOR_KEY, StorageHelper::operator_key, ); } diff --git a/config/management/genesis/src/layout.rs b/config/management/genesis/src/layout.rs index fd50fa4ceedcf..5c1f2c3d3c9dc 100644 --- a/config/management/genesis/src/layout.rs +++ b/config/management/genesis/src/layout.rs @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 use crate::builder::GenesisBuilder; -use diem_management::{config::ConfigPath, error::Error, secure_backend::SharedBackend}; -use diem_secure_storage::Storage; +use aptos_management::{config::ConfigPath, error::Error, secure_backend::SharedBackend}; +use aptos_secure_storage::Storage; use serde::{Deserialize, Serialize}; use std::{ fs::File, @@ -19,7 +19,7 @@ use structopt::StructOpt; pub struct Layout { pub operators: Vec, pub owners: Vec, - pub diem_root: String, + pub aptos_root: String, pub treasury_compliance: String, } @@ -89,7 +89,7 @@ mod tests { let contents = "\ operators = [\"alice\", \"bob\"]\n\ owners = [\"carol\"]\n\ - diem_root = \"dave\"\n\ + aptos_root = \"dave\"\n\ treasury_compliance = \"other_dave\"\n\ "; @@ -99,7 +99,7 @@ mod tests { vec!["alice".to_string(), "bob".to_string()] ); assert_eq!(layout.owners, vec!["carol".to_string()]); - assert_eq!(layout.diem_root, "dave"); + assert_eq!(layout.aptos_root, "dave"); assert_eq!(layout.treasury_compliance, "other_dave"); } } diff --git a/config/management/genesis/src/main.rs b/config/management/genesis/src/main.rs index 38674de364077..69689a389c963 100644 --- a/config/management/genesis/src/main.rs +++ b/config/management/genesis/src/main.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 #![forbid(unsafe_code)] -use diem_genesis_tool::command::Command; +use aptos_genesis_tool::command::Command; use structopt::StructOpt; fn main() { diff --git a/config/management/genesis/src/move_modules.rs b/config/management/genesis/src/move_modules.rs index b60f2b3ecff9a..6f358fa3cbd1f 100644 --- a/config/management/genesis/src/move_modules.rs +++ b/config/management/genesis/src/move_modules.rs @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 use crate::builder::GenesisBuilder; -use diem_management::{config::ConfigPath, error::Error, secure_backend::SharedBackend}; -use diem_secure_storage::Storage; +use aptos_management::{config::ConfigPath, error::Error, secure_backend::SharedBackend}; +use aptos_secure_storage::Storage; use std::{fs, path::PathBuf}; use structopt::StructOpt; diff --git a/config/management/genesis/src/storage_helper.rs b/config/management/genesis/src/storage_helper.rs index 2481635892e2f..4c577365e5f8e 100644 --- a/config/management/genesis/src/storage_helper.rs +++ b/config/management/genesis/src/storage_helper.rs @@ -4,31 +4,31 @@ // FIXME: (gnazario) storage helper doesn't belong in the genesis tool, but it's attached to it right now use crate::command::Command; -use consensus_types::safety_data::SafetyData; -use diem_crypto::{ +use aptos_crypto::{ ed25519::{Ed25519PrivateKey, Ed25519PublicKey}, Uniform, }; -use diem_global_constants::{ - CONSENSUS_KEY, DIEM_ROOT_KEY, EXECUTION_KEY, FULLNODE_NETWORK_KEY, OPERATOR_KEY, OWNER_KEY, +use aptos_global_constants::{ + APTOS_ROOT_KEY, CONSENSUS_KEY, EXECUTION_KEY, FULLNODE_NETWORK_KEY, OPERATOR_KEY, OWNER_KEY, SAFETY_DATA, TREASURY_COMPLIANCE_KEY, VALIDATOR_NETWORK_KEY, WAYPOINT, }; -use diem_management::{error::Error, secure_backend::DISK}; -use diem_secure_storage::{CryptoStorage, KVStorage, Namespaced, OnDiskStorage, Storage}; -use diem_types::{ +use aptos_management::{error::Error, secure_backend::DISK}; +use aptos_secure_storage::{CryptoStorage, KVStorage, Namespaced, OnDiskStorage, Storage}; +use aptos_types::{ chain_id::ChainId, network_address::NetworkAddress, transaction::Transaction, waypoint::Waypoint, }; +use consensus_types::safety_data::SafetyData; use std::{fs::File, path::Path}; use structopt::StructOpt; pub struct StorageHelper { - temppath: diem_temppath::TempPath, + temppath: aptos_temppath::TempPath, } impl StorageHelper { pub fn new() -> Self { - let temppath = diem_temppath::TempPath::new(); + let temppath = aptos_temppath::TempPath::new(); temppath.create_as_file().unwrap(); File::create(temppath.path()).unwrap(); Self { temppath } @@ -57,12 +57,12 @@ impl StorageHelper { // Initialize all keys in storage storage - .import_private_key(DIEM_ROOT_KEY, Ed25519PrivateKey::generate(&mut rng)) + .import_private_key(APTOS_ROOT_KEY, Ed25519PrivateKey::generate(&mut rng)) .unwrap(); // TODO(davidiw) use distinct keys in tests for treasury and diem root keys - let diem_root_key = storage.export_private_key(DIEM_ROOT_KEY).unwrap(); + let aptos_root_key = storage.export_private_key(APTOS_ROOT_KEY).unwrap(); storage - .import_private_key(TREASURY_COMPLIANCE_KEY, diem_root_key) + .import_private_key(TREASURY_COMPLIANCE_KEY, aptos_root_key) .unwrap(); storage .import_private_key(CONSENSUS_KEY, Ed25519PrivateKey::generate(&mut rng)) @@ -93,7 +93,7 @@ impl StorageHelper { pub fn create_waypoint(&self, chain_id: ChainId) -> Result { let args = format!( " - diem-genesis-tool + aptos-genesis-tool create-waypoint --chain-id {chain_id} --shared-backend backend={backend};\ @@ -111,7 +111,7 @@ impl StorageHelper { pub fn insert_waypoint(&self, validator_ns: &str, waypoint: Waypoint) -> Result<(), Error> { let args = format!( " - diem-genesis-tool + aptos-genesis-tool insert-waypoint --validator-backend backend={backend};\ path={path};\ @@ -132,7 +132,7 @@ impl StorageHelper { pub fn genesis(&self, chain_id: ChainId, genesis_path: &Path) -> Result { let args = format!( " - diem-genesis-tool + aptos-genesis-tool genesis --chain-id {chain_id} --shared-backend backend={backend};\ @@ -149,15 +149,15 @@ impl StorageHelper { command.genesis() } - pub fn diem_root_key( + pub fn aptos_root_key( &self, validator_ns: &str, shared_ns: &str, ) -> Result { let args = format!( " - diem-genesis-tool - diem-root-key + aptos-genesis-tool + aptos-root-key --validator-backend backend={backend};\ path={path};\ namespace={validator_ns} @@ -172,7 +172,7 @@ impl StorageHelper { ); let command = Command::from_iter(args.split_whitespace()); - command.diem_root_key() + command.aptos_root_key() } pub fn operator_key( @@ -182,7 +182,7 @@ impl StorageHelper { ) -> Result { let args = format!( " - diem-genesis-tool + aptos-genesis-tool operator-key --validator-backend backend={backend};\ path={path};\ @@ -208,7 +208,7 @@ impl StorageHelper { ) -> Result { let args = format!( " - diem-genesis-tool + aptos-genesis-tool owner-key --validator-backend backend={backend};\ path={path};\ @@ -231,7 +231,7 @@ impl StorageHelper { pub fn set_layout(&self, path: &str) -> Result { let args = format!( " - diem-genesis-tool + aptos-genesis-tool set-layout --path {path} --shared-backend backend={backend};\ @@ -251,7 +251,7 @@ impl StorageHelper { println!("setting move modules with dir {}", dir); let args = format!( " - diem-genesis-tool + aptos-genesis-tool set-move-modules --dir {dir} --shared-backend backend={backend};\ @@ -269,7 +269,7 @@ impl StorageHelper { pub fn set_operator(&self, operator_name: &str, shared_ns: &str) -> Result { let args = format!( " - diem-genesis-tool + aptos-genesis-tool set-operator --operator-name {operator_name} --shared-backend backend={backend};\ @@ -293,7 +293,7 @@ impl StorageHelper { ) -> Result { let args = format!( " - diem-genesis-tool + aptos-genesis-tool treasury-compliance-key --validator-backend backend={backend};\ path={path};\ @@ -323,7 +323,7 @@ impl StorageHelper { ) -> Result { let args = format!( " - diem-genesis-tool + aptos-genesis-tool validator-config --owner-name {owner_name} --validator-address {validator_address} @@ -354,7 +354,7 @@ impl StorageHelper { pub fn verify(&self, namespace: &str) -> Result { let args = format!( " - diem-genesis-tool + aptos-genesis-tool verify --validator-backend backend={backend};\ path={path};\ @@ -372,7 +372,7 @@ impl StorageHelper { pub fn verify_genesis(&self, namespace: &str, genesis_path: &Path) -> Result { let args = format!( " - diem-genesis-tool + aptos-genesis-tool verify --validator-backend backend={backend};\ path={path};\ diff --git a/config/management/genesis/src/validator_builder.rs b/config/management/genesis/src/validator_builder.rs index bfcbe969532b8..8d1dc8e00471d 100644 --- a/config/management/genesis/src/validator_builder.rs +++ b/config/management/genesis/src/validator_builder.rs @@ -6,32 +6,32 @@ use crate::{ waypoint::create_genesis_waypoint, }; use anyhow::Result; -use consensus_types::safety_data::SafetyData; -use diem_config::{ +use aptos_config::{ config::{ DiscoveryMethod, Identity, NetworkConfig, NodeConfig, OnDiskStorageConfig, SafetyRulesService, SecureBackend, WaypointConfig, }, network_id::NetworkId, }; -use diem_crypto::{ +use aptos_crypto::{ ed25519::{Ed25519PrivateKey, Ed25519PublicKey}, Uniform, }; -use diem_global_constants::{ +use aptos_global_constants::{ CONSENSUS_KEY, EXECUTION_KEY, FULLNODE_NETWORK_KEY, GENESIS_WAYPOINT, OPERATOR_ACCOUNT, OPERATOR_KEY, OWNER_ACCOUNT, OWNER_KEY, SAFETY_DATA, VALIDATOR_NETWORK_KEY, WAYPOINT, }; -use diem_management::{ +use aptos_management::{ storage::StorageWrapper, validator_config::build_validator_config_transaction, }; -use diem_secure_storage::{CryptoStorage, KVStorage, OnDiskStorage, Storage}; -use diem_types::{ +use aptos_secure_storage::{CryptoStorage, KVStorage, OnDiskStorage, Storage}; +use aptos_types::{ chain_id::ChainId, on_chain_config::{ConsensusConfigV2, OnChainConsensusConfig, VMPublishingOption}, transaction::{authenticator::AuthenticationKey, Transaction}, waypoint::Waypoint, }; +use consensus_types::safety_data::SafetyData; use std::{ convert::TryFrom, fs::File, @@ -40,7 +40,7 @@ use std::{ path::{Path, PathBuf}, }; -const DIEM_ROOT_NS: &str = "diem_root"; +const APTOS_ROOT_NS: &str = "aptos_root"; const OPERATOR_NS: &str = "_operator"; const OWNER_NS: &str = "_owner"; @@ -134,7 +134,7 @@ impl RootKeys { where R: ::rand::RngCore + ::rand::CryptoRng, { - // TODO use distinct keys for diem root and treasury + // TODO use distinct keys for aptos root and treasury // let root_key = Ed25519PrivateKey::generate(rng); // let treasury_compliance_key = Ed25519PrivateKey::generate(rng); let key = Ed25519PrivateKey::generate(&mut rng).to_bytes(); @@ -286,7 +286,7 @@ impl ValidatorBuilder { if let Some(template_fullnode_config) = config.full_node_networks.first() { template_fullnode_config.listen_address.clone() } else { - diem_config::utils::get_available_port_in_multiaddr(true) + aptos_config::utils::get_available_port_in_multiaddr(true) }; let fullnode_network = NetworkConfig { listen_address: fullnode_network_listen_address, @@ -303,7 +303,7 @@ impl ValidatorBuilder { }; let vfn_network = NetworkConfig { - listen_address: diem_config::utils::get_available_port_in_multiaddr(true), + listen_address: aptos_config::utils::get_available_port_in_multiaddr(true), network_id: NetworkId::Vfn, max_outbound_connections: 0, identity: Identity::from_storage( @@ -346,7 +346,7 @@ impl ValidatorBuilder { // Set owner key and account address storage.import_private_key(OWNER_KEY, Ed25519PrivateKey::generate(&mut rng))?; let owner_address = - diem_config::utils::validator_owner_account_from_name(validator.owner().as_bytes()); + aptos_config::utils::validator_owner_account_from_name(validator.owner().as_bytes()); storage.set(OWNER_ACCOUNT, owner_address)?; // Set operator key and account address @@ -381,8 +381,8 @@ impl ValidatorBuilder { let layout = Layout { owners: validators.iter().map(|v| v.owner()).collect(), operators: validators.iter().map(|v| v.operator()).collect(), - diem_root: DIEM_ROOT_NS.into(), - treasury_compliance: DIEM_ROOT_NS.into(), + aptos_root: APTOS_ROOT_NS.into(), + treasury_compliance: APTOS_ROOT_NS.into(), }; genesis_builder.set_layout(&layout)?; genesis_builder.set_move_modules(move_modules)?; diff --git a/config/management/genesis/src/validator_config.rs b/config/management/genesis/src/validator_config.rs index cc4fc62d78c40..33f99629aa4f3 100644 --- a/config/management/genesis/src/validator_config.rs +++ b/config/management/genesis/src/validator_config.rs @@ -1,9 +1,9 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_global_constants::OWNER_ACCOUNT; -use diem_management::{constants, error::Error, secure_backend::SharedBackend}; -use diem_types::{network_address::NetworkAddress, transaction::Transaction}; +use aptos_global_constants::OWNER_ACCOUNT; +use aptos_management::{constants, error::Error, secure_backend::SharedBackend}; +use aptos_types::{network_address::NetworkAddress, transaction::Transaction}; use structopt::StructOpt; #[derive(Debug, StructOpt)] @@ -11,7 +11,7 @@ pub struct ValidatorConfig { #[structopt(long)] owner_name: String, #[structopt(flatten)] - validator_config: diem_management::validator_config::ValidatorConfig, + validator_config: aptos_management::validator_config::ValidatorConfig, #[structopt(long)] validator_address: NetworkAddress, #[structopt(long)] @@ -31,7 +31,7 @@ impl ValidatorConfig { // Retrieve and set owner account let owner_account = - diem_config::utils::validator_owner_account_from_name(self.owner_name.as_bytes()); + aptos_config::utils::validator_owner_account_from_name(self.owner_name.as_bytes()); let mut validator_storage = config.validator_backend(); validator_storage.set(OWNER_ACCOUNT, owner_account)?; diff --git a/config/management/genesis/src/validator_operator.rs b/config/management/genesis/src/validator_operator.rs index e4161f5649023..85648239d9fd1 100644 --- a/config/management/genesis/src/validator_operator.rs +++ b/config/management/genesis/src/validator_operator.rs @@ -1,8 +1,10 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_global_constants::OPERATOR_KEY; -use diem_management::{config::ConfigPath, constants, error::Error, secure_backend::SharedBackend}; +use aptos_global_constants::OPERATOR_KEY; +use aptos_management::{ + config::ConfigPath, constants, error::Error, secure_backend::SharedBackend, +}; use structopt::StructOpt; #[derive(Debug, StructOpt)] diff --git a/config/management/genesis/src/verify.rs b/config/management/genesis/src/verify.rs index 109a3b70ae9ea..f648079882e9a 100644 --- a/config/management/genesis/src/verify.rs +++ b/config/management/genesis/src/verify.rs @@ -1,23 +1,23 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_config::config::RocksdbConfig; -use diem_global_constants::{ +use aptos_config::config::RocksdbConfig; +use aptos_global_constants::{ CONSENSUS_KEY, FULLNODE_NETWORK_KEY, OPERATOR_ACCOUNT, OPERATOR_KEY, OWNER_ACCOUNT, OWNER_KEY, SAFETY_DATA, VALIDATOR_NETWORK_KEY, WAYPOINT, }; -use diem_management::{ +use aptos_management::{ config::ConfigPath, error::Error, secure_backend::ValidatorBackend, storage::StorageWrapper as Storage, }; -use diem_temppath::TempPath; -use diem_types::{ +use aptos_temppath::TempPath; +use aptos_types::{ account_address::AccountAddress, account_config, account_state::AccountState, network_address::NetworkAddress, on_chain_config::ValidatorSet, validator_config::ValidatorConfig, waypoint::Waypoint, }; -use diem_vm::DiemVM; -use diemdb::DiemDB; +use aptos_vm::DiemVM; +use aptosdb::DiemDB; use executor::db_bootstrapper; use std::{ convert::TryFrom, @@ -209,7 +209,7 @@ fn compute_genesis( genesis_path: &Path, db_path: &Path, ) -> Result<(DbReaderWriter, Waypoint), Error> { - let diemdb = DiemDB::open( + let aptosdb = DiemDB::open( db_path, false, None, @@ -217,7 +217,7 @@ fn compute_genesis( true, /* account_count_migration */ ) .map_err(|e| Error::UnexpectedError(e.to_string()))?; - let db_rw = DbReaderWriter::new(diemdb); + let db_rw = DbReaderWriter::new(aptosdb); let mut file = File::open(genesis_path) .map_err(|e| Error::UnexpectedError(format!("Unable to open genesis file: {}", e)))?; diff --git a/config/management/genesis/src/waypoint.rs b/config/management/genesis/src/waypoint.rs index b019205952719..948aec416caf1 100644 --- a/config/management/genesis/src/waypoint.rs +++ b/config/management/genesis/src/waypoint.rs @@ -1,12 +1,12 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_config::config::RocksdbConfig; -use diem_management::{config::ConfigPath, error::Error, secure_backend::SharedBackend}; -use diem_temppath::TempPath; -use diem_types::{chain_id::ChainId, transaction::Transaction, waypoint::Waypoint}; -use diem_vm::DiemVM; -use diemdb::DiemDB; +use aptos_config::config::RocksdbConfig; +use aptos_management::{config::ConfigPath, error::Error, secure_backend::SharedBackend}; +use aptos_temppath::TempPath; +use aptos_types::{chain_id::ChainId, transaction::Transaction, waypoint::Waypoint}; +use aptos_vm::DiemVM; +use aptosdb::DiemDB; use executor::db_bootstrapper; use storage_interface::DbReaderWriter; use structopt::StructOpt; @@ -40,7 +40,7 @@ impl CreateWaypoint { pub fn create_genesis_waypoint(genesis: &Transaction) -> Result { let path = TempPath::new(); - let diemdb = DiemDB::open( + let aptosdb = DiemDB::open( &path, false, None, @@ -48,7 +48,7 @@ pub fn create_genesis_waypoint(genesis: &Transaction) -> Result true, /* account_count_migration */ ) .map_err(|e| Error::UnexpectedError(e.to_string()))?; - let db_rw = DbReaderWriter::new(diemdb); + let db_rw = DbReaderWriter::new(aptosdb); db_bootstrapper::generate_waypoint::(&db_rw, genesis) .map_err(|e| Error::UnexpectedError(e.to_string())) diff --git a/config/management/operational/Cargo.toml b/config/management/operational/Cargo.toml index f077034f4f593..e9118ca5fed76 100644 --- a/config/management/operational/Cargo.toml +++ b/config/management/operational/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "diem-operational-tool" +name = "aptos-operational-tool" version = "0.1.0" authors = ["Diem Association "] description = "Diem Management is a tool for operators to manage nodes" @@ -27,21 +27,21 @@ toml = { version = "0.5.8", default-features = false } url = "2.2.2" bcs = "0.1.2" -diem-rest-client = { path = "../../../crates/diem-rest-client" } -diem-config = { path = "../.."} -diem-crypto = { path = "../../../crates/diem-crypto" } -diem-global-constants = { path = "../../global-constants" } -diem-infallible = { path = "../../../crates/diem-infallible" } -diem-management = { path = ".." } -diem-secure-storage = { path = "../../../secure/storage" } -diem-types = { path = "../../../types" } -diem-workspace-hack = { version = "0.1", path = "../../../crates/diem-workspace-hack" } -diem-temppath = { path = "../../../crates/diem-temppath" } +aptos-rest-client = { path = "../../../crates/aptos-rest-client" } +aptos-config = { path = "../.."} +aptos-crypto = { path = "../../../crates/aptos-crypto" } +aptos-global-constants = { path = "../../global-constants" } +aptos-infallible = { path = "../../../crates/aptos-infallible" } +aptos-management = { path = ".." } +aptos-secure-storage = { path = "../../../secure/storage" } +aptos-types = { path = "../../../types" } +aptos-workspace-hack = { version = "0.1", path = "../../../crates/aptos-workspace-hack" } +aptos-temppath = { path = "../../../crates/aptos-temppath" } fallible = { path = "../../../crates/fallible" } netcore = { path = "../../../network/netcore" } network = { path = "../../../network" } -diem-transaction-builder = { path = "../../../sdk/transaction-builder" } +aptos-transaction-builder = { path = "../../../sdk/transaction-builder" } [features] testing = [] -fuzzing = ["diem-config/fuzzing"] +fuzzing = ["aptos-config/fuzzing"] diff --git a/config/management/operational/README.md b/config/management/operational/README.md index def474cc38a18..9e155aaad9ff3 100644 --- a/config/management/operational/README.md +++ b/config/management/operational/README.md @@ -1,6 +1,6 @@ # Diem Operational Tool -The `diem-operational-tool` provides a tool for operators to perform maintenance functions +The `aptos-operational-tool` provides a tool for operators to perform maintenance functions on the Diem blockchain post-genesis. The functionality of the tool is dictated by the organization of nodes within the system: diff --git a/config/management/operational/src/account_resource.rs b/config/management/operational/src/account_resource.rs index 2d5883be52956..623763bdc259e 100644 --- a/config/management/operational/src/account_resource.rs +++ b/config/management/operational/src/account_resource.rs @@ -2,11 +2,11 @@ // SPDX-License-Identifier: Apache-2.0 use crate::{auto_validate::AutoValidate, rest_client::RestClient, TransactionContext}; -use diem_crypto::ed25519::Ed25519PublicKey; -use diem_global_constants::{OPERATOR_ACCOUNT, OPERATOR_KEY}; -use diem_management::{error::Error, transaction::build_raw_transaction}; -use diem_transaction_builder::stdlib as transaction_builder; -use diem_types::{ +use aptos_crypto::ed25519::Ed25519PublicKey; +use aptos_global_constants::{OPERATOR_ACCOUNT, OPERATOR_KEY}; +use aptos_management::{error::Error, transaction::build_raw_transaction}; +use aptos_transaction_builder::stdlib as transaction_builder; +use aptos_types::{ account_address::AccountAddress, transaction::{authenticator::AuthenticationKey, Transaction}, }; @@ -19,7 +19,7 @@ pub struct AccountResource { #[structopt(long, help = "Account address to display the account resource")] account_address: AccountAddress, #[structopt(flatten)] - config: diem_management::config::ConfigPath, + config: aptos_management::config::ConfigPath, /// JSON-RPC Endpoint (e.g. http://localhost:8080) #[structopt(long, required_unless = "config")] json_server: Option, @@ -57,7 +57,7 @@ pub struct RotateOperatorKey { #[structopt(long, required_unless = "config")] json_server: Option, #[structopt(flatten)] - validator_config: diem_management::validator_config::ValidatorConfig, + validator_config: aptos_management::validator_config::ValidatorConfig, #[structopt(flatten)] auto_validate: AutoValidate, } diff --git a/config/management/operational/src/auto_validate.rs b/config/management/operational/src/auto_validate.rs index 467a0e885a1b5..da7277471d712 100644 --- a/config/management/operational/src/auto_validate.rs +++ b/config/management/operational/src/auto_validate.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 use crate::{validate_transaction::ValidateTransaction, TransactionContext}; -use diem_management::error::Error; +use aptos_management::error::Error; use std::{thread::sleep, time}; use structopt::StructOpt; diff --git a/config/management/operational/src/command.rs b/config/management/operational/src/command.rs index bdd91d4a5c932..6461c29c84e7f 100644 --- a/config/management/operational/src/command.rs +++ b/config/management/operational/src/command.rs @@ -6,10 +6,10 @@ use crate::{ validator_set::DecryptedValidatorInfo, validator_state::VerifyValidatorStateResult, TransactionContext, }; -use diem_config::config::Peer; -use diem_crypto::{ed25519::Ed25519PublicKey, x25519}; -use diem_management::{error::Error, execute_command, execute_command_await}; -use diem_types::{account_address::AccountAddress, waypoint::Waypoint, PeerId}; +use aptos_config::config::Peer; +use aptos_crypto::{ed25519::Ed25519PublicKey, x25519}; +use aptos_management::{error::Error, execute_command, execute_command_await}; +use aptos_types::{account_address::AccountAddress, waypoint::Waypoint, PeerId}; use serde::Serialize; use std::collections::HashMap; use structopt::StructOpt; @@ -42,7 +42,7 @@ pub enum Command { #[structopt(about = "Generate a PrivateKey to a file")] GenerateKey(crate::keys::GenerateKey), #[structopt(about = "Set the waypoint in the validator storage")] - InsertWaypoint(diem_management::waypoint::InsertWaypoint), + InsertWaypoint(aptos_management::waypoint::InsertWaypoint), #[structopt(about = "Prints an account from the validator storage")] PrintAccount(crate::print::PrintAccount), #[structopt(about = "Prints an ed25519 public key from the validator storage")] diff --git a/config/management/operational/src/governance.rs b/config/management/operational/src/governance.rs index d05b561fc5376..c943e89f15956 100644 --- a/config/management/operational/src/governance.rs +++ b/config/management/operational/src/governance.rs @@ -2,17 +2,17 @@ // SPDX-License-Identifier: Apache-2.0 use crate::{auto_validate::AutoValidate, rest_client::RestClient, TransactionContext}; -use diem_global_constants::DIEM_ROOT_KEY; -use diem_management::{ +use aptos_global_constants::APTOS_ROOT_KEY; +use aptos_management::{ config::{Config, ConfigPath}, error::Error, secure_backend::ValidatorBackend, transaction::build_raw_transaction, }; -use diem_transaction_builder::stdlib as transaction_builder; -use diem_types::{ +use aptos_transaction_builder::stdlib as transaction_builder; +use aptos_types::{ account_address::AccountAddress, - account_config::diem_root_address, + account_config::aptos_root_address, chain_id::ChainId, transaction::{authenticator::AuthenticationKey, ScriptFunction, TransactionPayload}, }; @@ -55,11 +55,11 @@ impl CreateAccount { .override_json_server(&self.json_server) .override_validator_backend(&self.validator_backend.validator_backend)?; - let key = diem_management::read_key_from_file(&self.path_to_key) + let key = aptos_management::read_key_from_file(&self.path_to_key) .map_err(|e| Error::UnableToReadFile(format!("{:?}", self.path_to_key), e))?; let client = RestClient::new(config.json_server.clone()); - let seq_num = client.sequence_number(diem_root_address()).await?; + let seq_num = client.sequence_number(aptos_root_address()).await?; let auth_key = AuthenticationKey::ed25519(&key); let account_address = auth_key.derived_address(); let script = script_callback( @@ -70,7 +70,7 @@ impl CreateAccount { ) .into_script_function(); let mut transaction_context = - build_and_submit_diem_root_transaction(&config, seq_num, script, action).await?; + build_and_submit_aptos_root_transaction(&config, seq_num, script, action).await?; // Perform auto validation if required transaction_context = self @@ -124,7 +124,7 @@ struct RootValidatorOperation { #[structopt(long, required_unless = "config")] json_server: Option, #[structopt(flatten)] - validator_config: diem_management::validator_config::ValidatorConfig, + validator_config: aptos_management::validator_config::ValidatorConfig, #[structopt(flatten)] auto_validate: AutoValidate, } @@ -156,7 +156,7 @@ impl AddValidator { .await? .human_name; - let seq_num = client.sequence_number(diem_root_address()).await?; + let seq_num = client.sequence_number(aptos_root_address()).await?; let script = transaction_builder::encode_add_validator_and_reconfigure_script_function( seq_num, name, @@ -164,7 +164,7 @@ impl AddValidator { ) .into_script_function(); let mut transaction_context = - build_and_submit_diem_root_transaction(&config, seq_num, script, "add-validator") + build_and_submit_aptos_root_transaction(&config, seq_num, script, "add-validator") .await?; // Perform auto validation if required @@ -198,7 +198,7 @@ impl RemoveValidator { .await? .human_name; - let seq_num = client.sequence_number(diem_root_address()).await?; + let seq_num = client.sequence_number(aptos_root_address()).await?; let script = transaction_builder::encode_remove_validator_and_reconfigure_script_function( seq_num, name, @@ -207,7 +207,7 @@ impl RemoveValidator { .into_script_function(); let mut transaction_context = - build_and_submit_diem_root_transaction(&config, seq_num, script, "remove-validator") + build_and_submit_aptos_root_transaction(&config, seq_num, script, "remove-validator") .await?; // Perform auto validation if required @@ -221,7 +221,7 @@ impl RemoveValidator { } } -async fn build_and_submit_diem_root_transaction( +async fn build_and_submit_aptos_root_transaction( config: &Config, seq_num: u64, script_function: ScriptFunction, @@ -229,13 +229,13 @@ async fn build_and_submit_diem_root_transaction( ) -> Result { let txn = build_raw_transaction( config.chain_id, - diem_root_address(), + aptos_root_address(), seq_num, script_function, ); let mut storage = config.validator_backend(); - let signed_txn = storage.sign(DIEM_ROOT_KEY, action, txn)?; + let signed_txn = storage.sign(APTOS_ROOT_KEY, action, txn)?; let client = RestClient::new(config.json_server.clone()); client.submit_transaction(signed_txn).await diff --git a/config/management/operational/src/keys.rs b/config/management/operational/src/keys.rs index 195db951fec95..fb482afcdb5a8 100644 --- a/config/management/operational/src/keys.rs +++ b/config/management/operational/src/keys.rs @@ -1,16 +1,16 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_config::config::{Peer, PeerRole}; -use diem_crypto::{ +use aptos_config::config::{Peer, PeerRole}; +use aptos_crypto::{ ed25519::Ed25519PrivateKey, x25519, x25519::PUBLIC_KEY_SIZE, Uniform, ValidCryptoMaterial, ValidCryptoMaterialStringExt, }; -use diem_global_constants::OWNER_ACCOUNT; -use diem_management::{ +use aptos_global_constants::OWNER_ACCOUNT; +use aptos_management::{ config::ConfigPath, error::Error, secure_backend::ValidatorBackend, storage::StorageWrapper, }; -use diem_types::{ +use aptos_types::{ account_address::{from_identity_public_key, AccountAddress}, PeerId, }; diff --git a/config/management/operational/src/lib.rs b/config/management/operational/src/lib.rs index 68e512e77ab61..fd14cfcf00738 100644 --- a/config/management/operational/src/lib.rs +++ b/config/management/operational/src/lib.rs @@ -20,7 +20,7 @@ mod network_checker; #[cfg(any(test, feature = "testing"))] pub mod test_helper; -use diem_types::account_address::AccountAddress; +use aptos_types::account_address::AccountAddress; use serde::Serialize; /// Information for validating a transaction after it's been submitted, or diff --git a/config/management/operational/src/main.rs b/config/management/operational/src/main.rs index 097beca60090a..efec2a5ca80e2 100644 --- a/config/management/operational/src/main.rs +++ b/config/management/operational/src/main.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 #![forbid(unsafe_code)] -use diem_operational_tool::command::{Command, ResultWrapper}; +use aptos_operational_tool::command::{Command, ResultWrapper}; use std::process::exit; use structopt::StructOpt; diff --git a/config/management/operational/src/network_checker.rs b/config/management/operational/src/network_checker.rs index c76fc5573ff96..0e211a31c878c 100644 --- a/config/management/operational/src/network_checker.rs +++ b/config/management/operational/src/network_checker.rs @@ -5,13 +5,13 @@ use crate::{ rest_client::RestClient, validator_set::{validator_set_full_node_addresses, validator_set_validator_addresses}, }; -use diem_config::{ +use aptos_config::{ config::{RoleType, HANDSHAKE_VERSION}, network_id::{NetworkContext, NetworkId}, }; -use diem_crypto::{x25519, x25519::PRIVATE_KEY_SIZE}; -use diem_management::error::Error; -use diem_types::{account_address, chain_id::ChainId, network_address::NetworkAddress, PeerId}; +use aptos_crypto::{x25519, x25519::PRIVATE_KEY_SIZE}; +use aptos_management::error::Error; +use aptos_types::{account_address, chain_id::ChainId, network_address::NetworkAddress, PeerId}; use fallible::copy_from_slice::copy_slice_to_vec; use futures::{AsyncReadExt, AsyncWriteExt}; use netcore::transport::tcp::{resolve_and_connect, TcpSocket}; diff --git a/config/management/operational/src/owner.rs b/config/management/operational/src/owner.rs index 2ea24c923e528..fd2bcfc31debf 100644 --- a/config/management/operational/src/owner.rs +++ b/config/management/operational/src/owner.rs @@ -2,12 +2,12 @@ // SPDX-License-Identifier: Apache-2.0 use crate::{auto_validate::AutoValidate, rest_client::RestClient, TransactionContext}; -use diem_management::{ +use aptos_management::{ config::ConfigPath, error::Error, secure_backend::ValidatorBackend, transaction::build_raw_transaction, }; -use diem_transaction_builder::stdlib as transaction_builder; -use diem_types::{account_address::AccountAddress, chain_id::ChainId}; +use aptos_transaction_builder::stdlib as transaction_builder; +use aptos_types::{account_address::AccountAddress, chain_id::ChainId}; use structopt::StructOpt; #[derive(Debug, StructOpt)] @@ -37,7 +37,7 @@ impl SetValidatorOperator { .override_json_server(&self.json_server) .override_validator_backend(&self.validator_backend.validator_backend)?; let mut storage = config.validator_backend(); - let owner_address = storage.account_address(diem_global_constants::OWNER_ACCOUNT)?; + let owner_address = storage.account_address(aptos_global_constants::OWNER_ACCOUNT)?; let client = RestClient::new(config.json_server.clone()); let txn = build_raw_transaction( @@ -51,7 +51,7 @@ impl SetValidatorOperator { .into_script_function(), ); - let signed_txn = storage.sign(diem_global_constants::OWNER_KEY, "set-operator", txn)?; + let signed_txn = storage.sign(aptos_global_constants::OWNER_KEY, "set-operator", txn)?; let mut transaction_context = client.submit_transaction(signed_txn).await?; // Perform auto validation if required diff --git a/config/management/operational/src/print.rs b/config/management/operational/src/print.rs index 6a63a18363478..77e60b70e4a51 100644 --- a/config/management/operational/src/print.rs +++ b/config/management/operational/src/print.rs @@ -1,10 +1,10 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_crypto::{ed25519::Ed25519PublicKey, x25519}; +use aptos_crypto::{ed25519::Ed25519PublicKey, x25519}; -use diem_management::{config::ConfigPath, error::Error, secure_backend::ValidatorBackend}; -use diem_types::{account_address::AccountAddress, waypoint::Waypoint}; +use aptos_management::{config::ConfigPath, error::Error, secure_backend::ValidatorBackend}; +use aptos_types::{account_address::AccountAddress, waypoint::Waypoint}; use structopt::StructOpt; #[derive(Debug, StructOpt)] diff --git a/config/management/operational/src/rest_client.rs b/config/management/operational/src/rest_client.rs index 94140c355b757..8ff70daf92885 100644 --- a/config/management/operational/src/rest_client.rs +++ b/config/management/operational/src/rest_client.rs @@ -2,9 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 use crate::{TransactionContext, TransactionStatus}; -use diem_management::error::Error; -use diem_rest_client::Client; -use diem_types::{ +use aptos_management::error::Error; +use aptos_rest_client::Client; +use aptos_types::{ account_address::AccountAddress, account_config, account_config::AccountResource, account_state::AccountState, account_state_blob::AccountStateBlob, transaction::SignedTransaction, validator_config::ValidatorConfigResource, diff --git a/config/management/operational/src/test_helper.rs b/config/management/operational/src/test_helper.rs index c54945363631f..d614d6ce34ba0 100644 --- a/config/management/operational/src/test_helper.rs +++ b/config/management/operational/src/test_helper.rs @@ -10,10 +10,10 @@ use crate::{ validator_state::VerifyValidatorStateResult, TransactionContext, }; -use diem_config::{config, config::Peer, network_id::NetworkId}; -use diem_crypto::{ed25519::Ed25519PublicKey, traits::ValidCryptoMaterialStringExt, x25519}; -use diem_management::{error::Error, secure_backend::DISK}; -use diem_types::{ +use aptos_config::{config, config::Peer, network_id::NetworkId}; +use aptos_crypto::{ed25519::Ed25519PublicKey, traits::ValidCryptoMaterialStringExt, x25519}; +use aptos_management::{error::Error, secure_backend::DISK}; +use aptos_types::{ account_address::AccountAddress, chain_id::ChainId, network_address::NetworkAddress, waypoint::Waypoint, PeerId, }; @@ -24,7 +24,7 @@ use std::{ }; use structopt::StructOpt; -const TOOL_NAME: &str = "diem-operational-tool"; +const TOOL_NAME: &str = "aptos-operational-tool"; /// A helper to test the operational tool in tests pub struct OperationalTool { diff --git a/config/management/operational/src/validate_transaction.rs b/config/management/operational/src/validate_transaction.rs index e6107ff994f06..48d8dce50e0af 100644 --- a/config/management/operational/src/validate_transaction.rs +++ b/config/management/operational/src/validate_transaction.rs @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 use crate::{rest_client::RestClient, TransactionContext}; -use diem_management::{config::ConfigPath, error::Error}; -use diem_types::account_address::AccountAddress; +use aptos_management::{config::ConfigPath, error::Error}; +use aptos_types::account_address::AccountAddress; use structopt::StructOpt; #[derive(Debug, StructOpt)] diff --git a/config/management/operational/src/validator_config.rs b/config/management/operational/src/validator_config.rs index c264536747c93..9e5b920d8b74a 100644 --- a/config/management/operational/src/validator_config.rs +++ b/config/management/operational/src/validator_config.rs @@ -2,12 +2,12 @@ // SPDX-License-Identifier: Apache-2.0 use crate::{auto_validate::AutoValidate, rest_client::RestClient, TransactionContext}; -use diem_crypto::{ed25519::Ed25519PublicKey, x25519}; -use diem_global_constants::{ +use aptos_crypto::{ed25519::Ed25519PublicKey, x25519}; +use aptos_global_constants::{ CONSENSUS_KEY, FULLNODE_NETWORK_KEY, OPERATOR_ACCOUNT, OWNER_ACCOUNT, VALIDATOR_NETWORK_KEY, }; -use diem_management::{error::Error, secure_backend::ValidatorBackend, storage::to_x25519}; -use diem_types::{ +use aptos_management::{error::Error, secure_backend::ValidatorBackend, storage::to_x25519}; +use aptos_types::{ account_address::AccountAddress, network_address::{NetworkAddress, Protocol}, }; @@ -22,7 +22,7 @@ pub struct SetValidatorConfig { #[structopt(long, required_unless = "config")] json_server: Option, #[structopt(flatten)] - validator_config: diem_management::validator_config::ValidatorConfig, + validator_config: aptos_management::validator_config::ValidatorConfig, #[structopt( long, required_unless = "fullnode-address", @@ -125,7 +125,7 @@ pub struct RotateKey { #[structopt(long, required_unless = "config")] json_server: Option, #[structopt(flatten)] - validator_config: diem_management::validator_config::ValidatorConfig, + validator_config: aptos_management::validator_config::ValidatorConfig, #[structopt(flatten)] auto_validate: AutoValidate, } @@ -263,7 +263,7 @@ pub struct ValidatorConfig { #[structopt(long, help = "Validator account address to display the config")] account_address: AccountAddress, #[structopt(flatten)] - config: diem_management::config::ConfigPath, + config: aptos_management::config::ConfigPath, /// JSON-RPC Endpoint (e.g. http://localhost:8080) #[structopt(long, required_unless = "config")] json_server: Option, @@ -296,7 +296,7 @@ pub struct DecodedValidatorConfig { impl DecodedValidatorConfig { pub fn from_validator_config_resource( - config_resource: &diem_types::validator_config::ValidatorConfigResource, + config_resource: &aptos_types::validator_config::ValidatorConfigResource, ) -> Result { let config = config_resource .validator_config @@ -309,7 +309,7 @@ impl DecodedValidatorConfig { } pub fn from_validator_config( - config: &diem_types::validator_config::ValidatorConfig, + config: &aptos_types::validator_config::ValidatorConfig, ) -> Result { let fullnode_network_addresses = fullnode_addresses(config)?; let validator_network_addresses = validator_addresses(config).unwrap_or_else(|error| { @@ -333,7 +333,7 @@ impl DecodedValidatorConfig { } pub fn fullnode_addresses( - config: &diem_types::validator_config::ValidatorConfig, + config: &aptos_types::validator_config::ValidatorConfig, ) -> Result, Error> { config .fullnode_network_addresses() @@ -341,7 +341,7 @@ pub fn fullnode_addresses( } pub fn validator_addresses( - config: &diem_types::validator_config::ValidatorConfig, + config: &aptos_types::validator_config::ValidatorConfig, ) -> Result, Error> { config .validator_network_addresses() diff --git a/config/management/operational/src/validator_set.rs b/config/management/operational/src/validator_set.rs index 8c358c9eaef1b..5c638a6337d4b 100644 --- a/config/management/operational/src/validator_set.rs +++ b/config/management/operational/src/validator_set.rs @@ -5,9 +5,9 @@ use crate::{ rest_client::RestClient, validator_config::{fullnode_addresses, validator_addresses, DecodedValidatorConfig}, }; -use diem_crypto::ed25519::Ed25519PublicKey; -use diem_management::{config::ConfigPath, error::Error, secure_backend::ValidatorBackend}; -use diem_types::{ +use aptos_crypto::ed25519::Ed25519PublicKey; +use aptos_management::{config::ConfigPath, error::Error, secure_backend::ValidatorBackend}; +use aptos_types::{ account_address::AccountAddress, network_address::NetworkAddress, validator_info::ValidatorInfo, }; use serde::Serialize; diff --git a/config/management/operational/src/validator_state.rs b/config/management/operational/src/validator_state.rs index 0c0156235efda..9e24561ec97c4 100644 --- a/config/management/operational/src/validator_state.rs +++ b/config/management/operational/src/validator_state.rs @@ -2,10 +2,10 @@ // SPDX-License-Identifier: Apache-2.0 use crate::{rest_client::RestClient, validator_config::DecodedValidatorConfig}; -use diem_global_constants::{ +use aptos_global_constants::{ CONSENSUS_KEY, FULLNODE_NETWORK_KEY, OWNER_ACCOUNT, VALIDATOR_NETWORK_KEY, }; -use diem_management::{ +use aptos_management::{ config::ConfigPath, error::Error, secure_backend::ValidatorBackend, storage::to_x25519, }; use serde::Serialize; diff --git a/config/management/src/config.rs b/config/management/src/config.rs index 505377cb816c4..ca5e0ed888d3a 100644 --- a/config/management/src/config.rs +++ b/config/management/src/config.rs @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 use crate::{error::Error, storage::StorageWrapper}; -use diem_config::config; -use diem_types::chain_id::{self, ChainId}; +use aptos_config::config; +use aptos_types::chain_id::{self, ChainId}; use serde::{Deserialize, Serialize}; use std::path::{Path, PathBuf}; use structopt::StructOpt; @@ -13,7 +13,7 @@ use structopt::StructOpt; /// # Example: /// /// ``` -/// use diem_management::config::ConfigPath; +/// use aptos_management::config::ConfigPath; /// use structopt::StructOpt; /// /// #[derive(Clone, Debug, StructOpt)] @@ -38,7 +38,7 @@ use structopt::StructOpt; /// // Output: /// // ... /// // OPTIONS: -/// // --config Path to a diem-management configuration file +/// // --config Path to a aptos-management configuration file /// // --test /// /// // let none = "cmd"; @@ -144,7 +144,7 @@ impl Config { #[derive(Clone, Debug, Default, StructOpt)] pub struct ConfigPath { - /// Path to a diem-management configuration file + /// Path to a aptos-management configuration file #[structopt(long)] config: Option, } @@ -162,8 +162,8 @@ impl ConfigPath { #[cfg(test)] mod tests { use super::*; - use diem_config::config::{SecureBackend, Token, VaultConfig}; - use diem_types::chain_id::NamedChain; + use aptos_config::config::{SecureBackend, Token, VaultConfig}; + use aptos_types::chain_id::NamedChain; #[test] fn example() { diff --git a/config/management/src/lib.rs b/config/management/src/lib.rs index 18289cb843c90..373c8d072f36e 100644 --- a/config/management/src/lib.rs +++ b/config/management/src/lib.rs @@ -12,7 +12,7 @@ pub mod validator_config; pub mod waypoint; pub mod constants { - use diem_types::account_config::XUS_NAME; + use aptos_types::account_config::XUS_NAME; pub const COMMON_NS: &str = "common"; pub const LAYOUT: &str = "layout"; pub const VALIDATOR_CONFIG: &str = "validator_config"; @@ -52,7 +52,7 @@ macro_rules! execute_command_await { }; } -use diem_crypto::ed25519::Ed25519PublicKey; +use aptos_crypto::ed25519::Ed25519PublicKey; use std::{convert::TryInto, fs, path::Path}; /// Reads a given ed25519 public key from file. Attempts to read the key using @@ -68,6 +68,6 @@ pub fn read_key_from_file(path: &Path) -> Result { key_data .as_slice() .try_into() - .map_err(|e: diem_crypto::CryptoMaterialError| e.to_string()) + .map_err(|e: aptos_crypto::CryptoMaterialError| e.to_string()) } } diff --git a/config/management/src/secure_backend.rs b/config/management/src/secure_backend.rs index 1ef0e5609dc89..669918ccf2b09 100644 --- a/config/management/src/secure_backend.rs +++ b/config/management/src/secure_backend.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 use crate::error::Error; -use diem_config::config::{self, GitHubConfig, OnDiskStorageConfig, Token, VaultConfig}; +use aptos_config::config::{self, GitHubConfig, OnDiskStorageConfig, Token, VaultConfig}; use std::{ collections::HashMap, convert::{TryFrom, TryInto}, @@ -203,7 +203,7 @@ mod tests { #[test] fn test_disk() { - let path = diem_temppath::TempPath::new(); + let path = aptos_temppath::TempPath::new(); path.create_as_file().unwrap(); let disk = format!("backend=disk;path={}", path.path().to_str().unwrap()); storage(&disk).unwrap(); @@ -214,7 +214,7 @@ mod tests { #[test] fn test_github() { - let path = diem_temppath::TempPath::new(); + let path = aptos_temppath::TempPath::new(); path.create_as_file().unwrap(); let mut file = File::create(path.path()).unwrap(); file.write_all(b"disk_token").unwrap(); @@ -245,7 +245,7 @@ mod tests { #[test] fn test_vault() { - let path = diem_temppath::TempPath::new(); + let path = aptos_temppath::TempPath::new(); path.create_as_file().unwrap(); let mut file = File::create(path.path()).unwrap(); file.write_all(b"disk_token").unwrap(); diff --git a/config/management/src/storage.rs b/config/management/src/storage.rs index e7e70a991023b..57144fdca63ae 100644 --- a/config/management/src/storage.rs +++ b/config/management/src/storage.rs @@ -2,12 +2,12 @@ // SPDX-License-Identifier: Apache-2.0 use crate::error::Error; -use diem_crypto::{ +use aptos_crypto::{ ed25519::{Ed25519PrivateKey, Ed25519PublicKey}, x25519, }; -use diem_secure_storage::{CryptoStorage, KVStorage, Storage}; -use diem_types::{ +use aptos_secure_storage::{CryptoStorage, KVStorage, Storage}; +use aptos_types::{ account_address::AccountAddress, transaction::{RawTransaction, SignedTransaction, Transaction}, waypoint::Waypoint, diff --git a/config/management/src/transaction.rs b/config/management/src/transaction.rs index 5e554834d9a4e..e7276ba9c2789 100644 --- a/config/management/src/transaction.rs +++ b/config/management/src/transaction.rs @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 use crate::constants; -use diem_time_service::{TimeService, TimeServiceTrait}; -use diem_types::{ +use aptos_time_service::{TimeService, TimeServiceTrait}; +use aptos_types::{ account_address::AccountAddress, chain_id::ChainId, transaction::{RawTransaction, ScriptFunction}, diff --git a/config/management/src/validator_config.rs b/config/management/src/validator_config.rs index 6f0ac55443b3c..f06c23b41bd75 100644 --- a/config/management/src/validator_config.rs +++ b/config/management/src/validator_config.rs @@ -8,20 +8,20 @@ use crate::{ storage::to_x25519, transaction::build_raw_transaction, }; -use core::str::FromStr; -use diem_config::config::HANDSHAKE_VERSION; -use diem_global_constants::{ +use aptos_config::config::HANDSHAKE_VERSION; +use aptos_global_constants::{ CONSENSUS_KEY, FULLNODE_NETWORK_KEY, OPERATOR_ACCOUNT, OPERATOR_KEY, OWNER_ACCOUNT, VALIDATOR_NETWORK_KEY, }; -use diem_secure_storage::{CryptoStorage, KVStorage, Storage}; -use diem_transaction_builder::stdlib as transaction_builder; -use diem_types::{ +use aptos_secure_storage::{CryptoStorage, KVStorage, Storage}; +use aptos_transaction_builder::stdlib as transaction_builder; +use aptos_types::{ account_address::AccountAddress, chain_id::ChainId, network_address::{NetworkAddress, Protocol}, transaction::{SignedTransaction, Transaction}, }; +use core::str::FromStr; use std::net::{Ipv4Addr, ToSocketAddrs}; use structopt::StructOpt; diff --git a/config/management/src/waypoint.rs b/config/management/src/waypoint.rs index d5317d6a32ef5..cefa013e9c0fa 100644 --- a/config/management/src/waypoint.rs +++ b/config/management/src/waypoint.rs @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 use crate::{config::ConfigPath, error::Error, secure_backend::ValidatorBackend}; -use diem_global_constants::{GENESIS_WAYPOINT, WAYPOINT}; -use diem_types::waypoint::Waypoint; +use aptos_global_constants::{GENESIS_WAYPOINT, WAYPOINT}; +use aptos_types::waypoint::Waypoint; use structopt::StructOpt; #[derive(Debug, StructOpt)] diff --git a/config/seed-peer-generator/Cargo.toml b/config/seed-peer-generator/Cargo.toml index 45f86116fbbd7..70855888e520e 100644 --- a/config/seed-peer-generator/Cargo.toml +++ b/config/seed-peer-generator/Cargo.toml @@ -20,16 +20,16 @@ tokio = { version = "1.8.1", features = ["full"] } url = "2.2.2" bcs = "0.1.2" -diem-config = { path = ".." } -diem-crypto = { path = "../../crates/diem-crypto" } -diem-rest-client = { path = "../../crates/diem-rest-client" } -diem-logger = { path = "../../crates/diem-logger" } -diem-temppath = { path = "../../crates/diem-temppath" } -diem-types = { path = "../../types" } -diem-workspace-hack = { version = "0.1", path = "../../crates/diem-workspace-hack" } +aptos-config = { path = ".." } +aptos-crypto = { path = "../../crates/aptos-crypto" } +aptos-rest-client = { path = "../../crates/aptos-rest-client" } +aptos-logger = { path = "../../crates/aptos-logger" } +aptos-temppath = { path = "../../crates/aptos-temppath" } +aptos-types = { path = "../../types" } +aptos-workspace-hack = { version = "0.1", path = "../../crates/aptos-workspace-hack" } [dev-dependencies] -diem-types = {path = "../../types", features = ["fuzzing"]} +aptos-types = {path = "../../types", features = ["fuzzing"]} [features] default = [] diff --git a/config/seed-peer-generator/src/main.rs b/config/seed-peer-generator/src/main.rs index a4748dbd1608f..0c6c410a8f3ca 100644 --- a/config/seed-peer-generator/src/main.rs +++ b/config/seed-peer-generator/src/main.rs @@ -3,7 +3,7 @@ #![forbid(unsafe_code)] -use diem_config::config::{PersistableConfig, RoleType}; +use aptos_config::config::{PersistableConfig, RoleType}; use std::path::PathBuf; use structopt::StructOpt; diff --git a/config/seed-peer-generator/src/utils.rs b/config/seed-peer-generator/src/utils.rs index 04e2a1f0899db..7b42740c01f47 100644 --- a/config/seed-peer-generator/src/utils.rs +++ b/config/seed-peer-generator/src/utils.rs @@ -6,11 +6,11 @@ use std::convert::TryFrom; use anyhow::Error; -use diem_config::config::{Peer, PeerRole, PeerSet}; -use diem_logger::prelude::*; -use diem_rest_client::Client; -use diem_types::{ - account_config::diem_root_address, account_state::AccountState, +use aptos_config::config::{Peer, PeerRole, PeerSet}; +use aptos_logger::prelude::*; +use aptos_rest_client::Client; +use aptos_types::{ + account_config::aptos_root_address, account_state::AccountState, account_state_blob::AccountStateBlob, network_address::NetworkAddress, on_chain_config::ValidatorSet, validator_info::ValidatorInfo, PeerId, }; @@ -38,7 +38,7 @@ pub(crate) fn to_fullnode_addresses( fn get_validator_set(client_endpoint: String) -> anyhow::Result { let client = Client::new(url::Url::parse(&client_endpoint)?); let rt = tokio::runtime::Runtime::new().unwrap(); - let blob = rt.block_on(client.get_account_state_blob(diem_root_address()))?; + let blob = rt.block_on(client.get_account_state_blob(aptos_root_address()))?; let account_state_blob: AccountStateBlob = blob.inner().clone().into(); let account_state = AccountState::try_from(&account_state_blob)?; if let Some(val) = account_state.get_validator_set()? { @@ -95,9 +95,9 @@ fn to_seed_peer Result, bcs::Error> #[cfg(test)] mod tests { use super::*; - use diem_config::config::HANDSHAKE_VERSION; - use diem_crypto::{ed25519::Ed25519PrivateKey, x25519, PrivateKey as PK, Uniform}; - use diem_types::validator_config::ValidatorConfig; + use aptos_config::config::HANDSHAKE_VERSION; + use aptos_crypto::{ed25519::Ed25519PrivateKey, x25519, PrivateKey as PK, Uniform}; + use aptos_types::validator_config::ValidatorConfig; use rand::{prelude::StdRng, SeedableRng}; fn validator_set( diff --git a/config/src/config/consensus_config.rs b/config/src/config/consensus_config.rs index 5cba12141efad..491c6a2df4f10 100644 --- a/config/src/config/consensus_config.rs +++ b/config/src/config/consensus_config.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 use crate::config::SafetyRulesConfig; -use diem_types::{account_address::AccountAddress, block_info::Round}; +use aptos_types::{account_address::AccountAddress, block_info::Round}; use serde::{Deserialize, Serialize}; use std::{collections::HashMap, path::PathBuf}; diff --git a/config/src/config/execution_config.rs b/config/src/config/execution_config.rs index 691cbc51c51c0..b6f49a00ab167 100644 --- a/config/src/config/execution_config.rs +++ b/config/src/config/execution_config.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 use crate::config::{Error, RootPath, SecureBackend}; -use diem_types::transaction::Transaction; +use aptos_types::transaction::Transaction; use serde::{Deserialize, Serialize}; use std::{ fs::File, @@ -120,8 +120,8 @@ pub struct RemoteExecutionService { #[cfg(test)] mod test { use super::*; - use diem_temppath::TempPath; - use diem_types::{ + use aptos_temppath::TempPath; + use aptos_types::{ transaction::{ChangeSet, Transaction, WriteSetPayload}, write_set::WriteSetMut, }; diff --git a/config/src/config/key_manager_config.rs b/config/src/config/key_manager_config.rs index 6f9c273db2b8a..1d32f7e423a6b 100644 --- a/config/src/config/key_manager_config.rs +++ b/config/src/config/key_manager_config.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 use crate::config::{Error, LoggerConfig, PersistableConfig, SecureBackend}; -use diem_types::chain_id::{self, ChainId}; +use aptos_types::chain_id::{self, ChainId}; use serde::{Deserialize, Serialize}; use std::path::{Path, PathBuf}; diff --git a/config/src/config/logger_config.rs b/config/src/config/logger_config.rs index feddad32d856f..01a054bb5be66 100644 --- a/config/src/config/logger_config.rs +++ b/config/src/config/logger_config.rs @@ -1,7 +1,7 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_logger::{Level, CHANNEL_SIZE}; +use aptos_logger::{Level, CHANNEL_SIZE}; use serde::{Deserialize, Serialize}; #[derive(Clone, Debug, Deserialize, PartialEq, Serialize)] diff --git a/config/src/config/mod.rs b/config/src/config/mod.rs index fafce2e513c2f..15991a2db49cd 100644 --- a/config/src/config/mod.rs +++ b/config/src/config/mod.rs @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 use crate::network_id::NetworkId; -use diem_secure_storage::{KVStorage, Storage}; -use diem_types::{waypoint::Waypoint, PeerId}; +use aptos_secure_storage::{KVStorage, Storage}; +use aptos_types::{waypoint::Waypoint, PeerId}; use rand::{rngs::StdRng, SeedableRng}; use serde::{de::DeserializeOwned, Deserialize, Serialize}; use std::{ @@ -139,7 +139,7 @@ impl WaypointConfig { WaypointConfig::FromStorage(backend) => { let storage: Storage = backend.into(); let waypoint = storage - .get::(diem_global_constants::WAYPOINT) + .get::(aptos_global_constants::WAYPOINT) .expect("Unable to read waypoint") .value; Some(waypoint) @@ -154,7 +154,7 @@ impl WaypointConfig { WaypointConfig::FromStorage(backend) => { let storage: Storage = backend.into(); storage - .get::(diem_global_constants::GENESIS_WAYPOINT) + .get::(aptos_global_constants::GENESIS_WAYPOINT) .expect("Unable to read waypoint") .value } diff --git a/config/src/config/network_config.rs b/config/src/config/network_config.rs index 4c7a9d43ef64f..d53648cbd420c 100644 --- a/config/src/config/network_config.rs +++ b/config/src/config/network_config.rs @@ -7,9 +7,9 @@ use crate::{ network_id::NetworkId, utils, }; -use diem_crypto::{x25519, Uniform}; -use diem_secure_storage::{CryptoStorage, KVStorage, Storage}; -use diem_types::{ +use aptos_crypto::{x25519, Uniform}; +use aptos_secure_storage::{CryptoStorage, KVStorage, Storage}; +use aptos_types::{ network_address::NetworkAddress, transaction::authenticator::AuthenticationKey, PeerId, }; use rand::{ @@ -226,12 +226,12 @@ impl NetworkConfig { let mut rng = StdRng::from_seed(OsRng.gen()); let key = x25519::PrivateKey::generate(&mut rng); let peer_id = - diem_types::account_address::from_identity_public_key(key.public_key()); + aptos_types::account_address::from_identity_public_key(key.public_key()); self.identity = Identity::from_config(key, peer_id); } Identity::FromConfig(config) => { let peer_id = - diem_types::account_address::from_identity_public_key(config.key.public_key()); + aptos_types::account_address::from_identity_public_key(config.key.public_key()); if config.peer_id == PeerId::ZERO { config.peer_id = peer_id; } diff --git a/config/src/config/safety_rules_config.rs b/config/src/config/safety_rules_config.rs index d78aa1da08c7c..2ef62adb717bf 100644 --- a/config/src/config/safety_rules_config.rs +++ b/config/src/config/safety_rules_config.rs @@ -5,8 +5,8 @@ use crate::{ config::{LoggerConfig, SecureBackend}, keys::ConfigKey, }; -use diem_crypto::{ed25519::Ed25519PrivateKey, Uniform}; -use diem_types::{network_address::NetworkAddress, waypoint::Waypoint, PeerId}; +use aptos_crypto::{ed25519::Ed25519PrivateKey, Uniform}; +use aptos_types::{network_address::NetworkAddress, waypoint::Waypoint, PeerId}; use rand::rngs::StdRng; use serde::{Deserialize, Serialize}; use std::{ diff --git a/config/src/config/secure_backend_config.rs b/config/src/config/secure_backend_config.rs index 773fd36bec2e2..4234846666e13 100644 --- a/config/src/config/secure_backend_config.rs +++ b/config/src/config/secure_backend_config.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 use crate::config::Error; -use diem_secure_storage::{ +use aptos_secure_storage::{ GitHubStorage, InMemoryStorage, Namespaced, OnDiskStorage, Storage, VaultStorage, }; use serde::{Deserialize, Serialize}; @@ -317,7 +317,7 @@ vault: #[test] fn test_token_reading() { - let temppath = diem_temppath::TempPath::new(); + let temppath = aptos_temppath::TempPath::new(); temppath.create_as_file().unwrap(); let mut file = File::create(temppath.path()).unwrap(); file.write_all(b"disk_token").unwrap(); diff --git a/config/src/config/state_sync_config.rs b/config/src/config/state_sync_config.rs index fb7c5439a57aa..6aee5211b1e47 100644 --- a/config/src/config/state_sync_config.rs +++ b/config/src/config/state_sync_config.rs @@ -30,7 +30,7 @@ pub struct StateSyncConfig { // Everything above belongs to state sync v1 and will be removed in the future. pub data_streaming_service: DataStreamingServiceConfig, - pub diem_data_client: DiemDataClientConfig, + pub aptos_data_client: DiemDataClientConfig, pub state_sync_driver: StateSyncDriverConfig, pub storage_service: StorageServiceConfig, } @@ -48,7 +48,7 @@ impl Default for StateSyncConfig { sync_request_timeout_ms: 60_000, tick_interval_ms: 100, data_streaming_service: DataStreamingServiceConfig::default(), - diem_data_client: DiemDataClientConfig::default(), + aptos_data_client: DiemDataClientConfig::default(), state_sync_driver: StateSyncDriverConfig::default(), storage_service: StorageServiceConfig::default(), } diff --git a/config/src/config/test_config.rs b/config/src/config/test_config.rs index 1d4d8090a97e4..981e0be690df0 100644 --- a/config/src/config/test_config.rs +++ b/config/src/config/test_config.rs @@ -2,9 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 use crate::keys::ConfigKey; -use diem_crypto::{ed25519::Ed25519PrivateKey, PrivateKey, Uniform}; -use diem_temppath::TempPath; -use diem_types::{ +use aptos_crypto::{ed25519::Ed25519PrivateKey, PrivateKey, Uniform}; +use aptos_temppath::TempPath; +use aptos_types::{ on_chain_config::VMPublishingOption, transaction::authenticator::AuthenticationKey, }; use rand::rngs::StdRng; diff --git a/config/src/generator.rs b/config/src/generator.rs index 8bf8b55db434c..ec0135fff1b3c 100644 --- a/config/src/generator.rs +++ b/config/src/generator.rs @@ -65,7 +65,7 @@ pub fn validator_swarm_for_testing(nodes: usize) -> ValidatorSwarm { /// with a fully formatted `NetworkAddress` containing its network identity pubkey /// and handshake protocol version. pub fn build_seed_for_network(seed_config: &NetworkConfig, seed_role: PeerRole) -> PeerSet { - let seed_pubkey = diem_crypto::PrivateKey::public_key(&seed_config.identity_key()); + let seed_pubkey = aptos_crypto::PrivateKey::public_key(&seed_config.identity_key()); let seed_addr = seed_config .listen_address .clone() diff --git a/config/src/keys.rs b/config/src/keys.rs index 3643cc97a590c..61944d832675c 100644 --- a/config/src/keys.rs +++ b/config/src/keys.rs @@ -12,7 +12,7 @@ //! while ignored during serialization. //! -use diem_crypto::PrivateKey; +use aptos_crypto::PrivateKey; use serde::{de::DeserializeOwned, Deserialize, Serialize}; /// ConfigKey places a clonable wrapper around PrivateKeys for config purposes only. The only time @@ -36,7 +36,7 @@ impl ConfigKey { } pub fn public_key(&self) -> T::PublicKeyMaterial { - diem_crypto::PrivateKey::public_key(&self.key) + aptos_crypto::PrivateKey::public_key(&self.key) } } @@ -47,10 +47,10 @@ impl Clone for ConfigKey { } #[cfg(test)] -impl Default for ConfigKey { +impl Default for ConfigKey { fn default() -> Self { Self { - key: diem_crypto::Uniform::generate_for_testing(), + key: aptos_crypto::Uniform::generate_for_testing(), } } } diff --git a/config/src/network_id.rs b/config/src/network_id.rs index 0c232f956fd8f..f98c70e1ea921 100644 --- a/config/src/network_id.rs +++ b/config/src/network_id.rs @@ -1,7 +1,7 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 use crate::config::{PeerRole, RoleType}; -use diem_types::PeerId; +use aptos_types::PeerId; use serde::{Deserialize, Deserializer, Serialize, Serializer}; use short_hex_str::AsShortHexStr; use std::{fmt, str::FromStr}; diff --git a/config/src/utils.rs b/config/src/utils.rs index 5b5f3d5bff3b1..3f146fd4da201 100644 --- a/config/src/utils.rs +++ b/config/src/utils.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 use crate::config::NodeConfig; -use diem_types::{ +use aptos_types::{ account_address::AccountAddress, network_address::{NetworkAddress, Protocol}, transaction::{authenticator::AuthenticationKey, Transaction}, @@ -14,7 +14,7 @@ pub fn default_validator_owner_auth_key_from_name(name: &[u8]) -> Authentication let salt = "validator_owner::"; let mut name_in_bytes = salt.as_bytes().to_vec(); name_in_bytes.extend_from_slice(name); - let hash = diem_crypto::HashValue::sha3_256_of(&name_in_bytes); + let hash = aptos_crypto::HashValue::sha3_256_of(&name_in_bytes); AuthenticationKey::new(*hash.as_ref()) } diff --git a/consensus/Cargo.toml b/consensus/Cargo.toml index ada54ecfadc9d..9e81fecd89752 100644 --- a/consensus/Cargo.toml +++ b/consensus/Cargo.toml @@ -38,17 +38,17 @@ executor = { path = "../execution/executor" } executor-types = { path = "../execution/executor-types" } fallible = { path = "../crates/fallible" } bcs = "0.1.2" -diem-config = { path = "../config" } -diem-crypto = { path = "../crates/diem-crypto" } -diem-logger = { path = "../crates/diem-logger" } -diem-mempool = { path = "../mempool" } -diem-metrics = { path = "../crates/diem-metrics" } -diem-infallible = { path = "../crates/diem-infallible" } -diem-secure-storage = { path = "../secure/storage" } -diem-temppath = { path = "../crates/diem-temppath" } -diem-types = { path = "../types" } -diem-vm = { path = "../diem-move/diem-vm" } -diem-workspace-hack = { version = "0.1", path = "../crates/diem-workspace-hack" } +aptos-config = { path = "../config" } +aptos-crypto = { path = "../crates/aptos-crypto" } +aptos-logger = { path = "../crates/aptos-logger" } +aptos-mempool = { path = "../mempool" } +aptos-metrics = { path = "../crates/aptos-metrics" } +aptos-infallible = { path = "../crates/aptos-infallible" } +aptos-secure-storage = { path = "../secure/storage" } +aptos-temppath = { path = "../crates/aptos-temppath" } +aptos-types = { path = "../types" } +aptos-vm = { path = "../aptos-move/aptos-vm" } +aptos-workspace-hack = { version = "0.1", path = "../crates/aptos-workspace-hack" } network = { path = "../network" } safety-rules = { path = "safety-rules" } short-hex-str = { path = "../crates/short-hex-str" } @@ -62,14 +62,14 @@ tempfile = "3.2.0" consensus-types = { path = "consensus-types", default-features = false, features = ["fuzzing"] } executor-test-helpers = { path = "../execution/executor-test-helpers" } -diem-config = { path = "../config", features = ["fuzzing"] } -diem-mempool = { path = "../mempool", features = ["fuzzing"] } +aptos-config = { path = "../config", features = ["fuzzing"] } +aptos-mempool = { path = "../mempool", features = ["fuzzing"] } network = { path = "../network", features = ["fuzzing"] } safety-rules = { path = "safety-rules", features = ["testing"] } -vm-genesis = { path = "../diem-move/vm-genesis" } +vm-genesis = { path = "../aptos-move/vm-genesis" } vm-validator = { path = "../vm-validator" } [features] default = [] -fuzzing = ["proptest", "consensus-types/fuzzing", "diem-config/fuzzing", "diem-crypto/fuzzing", "diem-mempool/fuzzing", "diem-types/fuzzing", "safety-rules/testing"] +fuzzing = ["proptest", "consensus-types/fuzzing", "aptos-config/fuzzing", "aptos-crypto/fuzzing", "aptos-mempool/fuzzing", "aptos-types/fuzzing", "safety-rules/testing"] failpoints = ["fail/failpoints"] diff --git a/consensus/consensus-types/Cargo.toml b/consensus/consensus-types/Cargo.toml index d2dbb18b23d46..7eb369aff5945 100644 --- a/consensus/consensus-types/Cargo.toml +++ b/consensus/consensus-types/Cargo.toml @@ -15,11 +15,11 @@ serde = { version = "1.0.124", default-features = false } executor-types = { path = "../../execution/executor-types" } bcs = "0.1.2" -diem-crypto = { path = "../../crates/diem-crypto" } -diem-crypto-derive = { path = "../../crates/diem-crypto-derive" } -diem-infallible = { path = "../../crates/diem-infallible" } -diem-types = { path = "../../types" } -diem-workspace-hack = { version = "0.1", path = "../../crates/diem-workspace-hack" } +aptos-crypto = { path = "../../crates/aptos-crypto" } +aptos-crypto-derive = { path = "../../crates/aptos-crypto-derive" } +aptos-infallible = { path = "../../crates/aptos-infallible" } +aptos-types = { path = "../../types" } +aptos-workspace-hack = { version = "0.1", path = "../../crates/aptos-workspace-hack" } short-hex-str = { path = "../../crates/short-hex-str" } @@ -27,8 +27,8 @@ short-hex-str = { path = "../../crates/short-hex-str" } proptest = "1.0.0" serde_json = "1.0.64" -diem-types = { path = "../../types", features = ["fuzzing"] } +aptos-types = { path = "../../types", features = ["fuzzing"] } [features] default = [] -fuzzing = ["proptest", "diem-types/fuzzing", "diem-crypto/fuzzing"] +fuzzing = ["proptest", "aptos-types/fuzzing", "aptos-crypto/fuzzing"] diff --git a/consensus/consensus-types/src/block.rs b/consensus/consensus-types/src/block.rs index 8b652a6394bb1..15f88b628b35e 100644 --- a/consensus/consensus-types/src/block.rs +++ b/consensus/consensus-types/src/block.rs @@ -7,9 +7,9 @@ use crate::{ quorum_cert::QuorumCert, }; use anyhow::{bail, ensure, format_err}; -use diem_crypto::{ed25519::Ed25519Signature, hash::CryptoHash, HashValue}; -use diem_infallible::duration_since_epoch; -use diem_types::{ +use aptos_crypto::{ed25519::Ed25519Signature, hash::CryptoHash, HashValue}; +use aptos_infallible::duration_since_epoch; +use aptos_types::{ account_address::AccountAddress, block_info::BlockInfo, block_metadata::BlockMetadata, diff --git a/consensus/consensus-types/src/block_data.rs b/consensus/consensus-types/src/block_data.rs index dd37f03ef875c..dd57260d82317 100644 --- a/consensus/consensus-types/src/block_data.rs +++ b/consensus/consensus-types/src/block_data.rs @@ -6,9 +6,9 @@ use crate::{ quorum_cert::QuorumCert, vote_data::VoteData, }; -use diem_crypto::hash::HashValue; -use diem_crypto_derive::{BCSCryptoHash, CryptoHasher}; -use diem_types::{ +use aptos_crypto::hash::HashValue; +use aptos_crypto_derive::{BCSCryptoHash, CryptoHasher}; +use aptos_types::{ block_info::BlockInfo, ledger_info::{LedgerInfo, LedgerInfoWithSignatures}, }; @@ -209,7 +209,7 @@ impl BlockData { #[test] fn test_reconfiguration_suffix() { - use diem_types::{ + use aptos_types::{ account_address::AccountAddress, epoch_state::EpochState, on_chain_config::ValidatorSet, }; diff --git a/consensus/consensus-types/src/block_retrieval.rs b/consensus/consensus-types/src/block_retrieval.rs index 44b12678ed05f..471708f94eaf0 100644 --- a/consensus/consensus-types/src/block_retrieval.rs +++ b/consensus/consensus-types/src/block_retrieval.rs @@ -3,8 +3,8 @@ use crate::block::Block; use anyhow::ensure; -use diem_crypto::hash::HashValue; -use diem_types::validator_verifier::ValidatorVerifier; +use aptos_crypto::hash::HashValue; +use aptos_types::validator_verifier::ValidatorVerifier; use serde::{Deserialize, Serialize}; use short_hex_str::AsShortHexStr; use std::fmt; diff --git a/consensus/consensus-types/src/block_test.rs b/consensus/consensus-types/src/block_test.rs index 0f0d37381486b..86523bdda51e3 100644 --- a/consensus/consensus-types/src/block_test.rs +++ b/consensus/consensus-types/src/block_test.rs @@ -8,8 +8,8 @@ use crate::{ }, quorum_cert::QuorumCert, }; -use diem_crypto::hash::HashValue; -use diem_types::{validator_signer::ValidatorSigner, validator_verifier::ValidatorVerifier}; +use aptos_crypto::hash::HashValue; +use aptos_types::{validator_signer::ValidatorSigner, validator_verifier::ValidatorVerifier}; use std::{collections::BTreeMap, sync::Arc}; #[test] @@ -63,7 +63,7 @@ fn test_nil_block() { let nil_block_child = Block::new_proposal( payload, 2, - diem_infallible::duration_since_epoch().as_micros() as u64, + aptos_infallible::duration_since_epoch().as_micros() as u64, nil_block_qc, &signer, ); @@ -82,7 +82,7 @@ fn test_block_relation() { let next_block = Block::new_proposal( payload.clone(), 1, - diem_infallible::duration_since_epoch().as_micros() as u64, + aptos_infallible::duration_since_epoch().as_micros() as u64, quorum_cert, &signer, ); @@ -106,7 +106,7 @@ fn test_same_qc_different_authors() { let genesis_qc = certificate_for_genesis(); let round = 1; let payload = vec![]; - let current_timestamp = diem_infallible::duration_since_epoch().as_micros() as u64; + let current_timestamp = aptos_infallible::duration_since_epoch().as_micros() as u64; let block_round_1 = Block::new_proposal( payload.clone(), round, diff --git a/consensus/consensus-types/src/block_test_utils.rs b/consensus/consensus-types/src/block_test_utils.rs index a0fef4f8a97c0..1eea4789ec906 100644 --- a/consensus/consensus-types/src/block_test_utils.rs +++ b/consensus/consensus-types/src/block_test_utils.rs @@ -9,11 +9,11 @@ use crate::{ quorum_cert::QuorumCert, vote_data::VoteData, }; -use diem_crypto::{ +use aptos_crypto::{ ed25519::Ed25519PrivateKey, hash::{CryptoHash, HashValue}, }; -use diem_types::{ +use aptos_types::{ account_address::AccountAddress, block_info::BlockInfo, ledger_info::{LedgerInfo, LedgerInfoWithSignatures}, @@ -43,7 +43,7 @@ prop_compose! { Block::new_proposal( vec![], round, - diem_infallible::duration_since_epoch().as_micros() as u64, + aptos_infallible::duration_since_epoch().as_micros() as u64, parent_qc, &signer, ) @@ -88,7 +88,7 @@ prop_compose! { block.payload().unwrap().clone(), block.author().unwrap(), block.round(), - diem_infallible::duration_since_epoch().as_micros() as u64, + aptos_infallible::duration_since_epoch().as_micros() as u64, block.quorum_cert().clone(), ), signature: Some(block.signature().unwrap().clone()), diff --git a/consensus/consensus-types/src/common.rs b/consensus/consensus-types/src/common.rs index 23acfffcb3cf7..5bb902789d723 100644 --- a/consensus/consensus-types/src/common.rs +++ b/consensus/consensus-types/src/common.rs @@ -1,7 +1,7 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_types::{account_address::AccountAddress, transaction::SignedTransaction}; +use aptos_types::{account_address::AccountAddress, transaction::SignedTransaction}; /// The round of a block is a consensus-internal counter, which starts with 0 and increases /// monotonically. It is used for the protocol safety and liveness (please see the detailed diff --git a/consensus/consensus-types/src/executed_block.rs b/consensus/consensus-types/src/executed_block.rs index ca7392ed0e193..9963cb95b8cbb 100644 --- a/consensus/consensus-types/src/executed_block.rs +++ b/consensus/consensus-types/src/executed_block.rs @@ -7,8 +7,8 @@ use crate::{ quorum_cert::QuorumCert, vote_proposal::{MaybeSignedVoteProposal, VoteProposal}, }; -use diem_crypto::hash::HashValue; -use diem_types::{ +use aptos_crypto::hash::HashValue; +use aptos_types::{ block_info::BlockInfo, contract_event::ContractEvent, transaction::{Transaction, TransactionStatus}, diff --git a/consensus/consensus-types/src/experimental/commit_decision.rs b/consensus/consensus-types/src/experimental/commit_decision.rs index 3d1d27a0ae5ce..8f7613cadcf06 100644 --- a/consensus/consensus-types/src/experimental/commit_decision.rs +++ b/consensus/consensus-types/src/experimental/commit_decision.rs @@ -3,7 +3,7 @@ use crate::common::Round; use anyhow::Context; -use diem_types::{ledger_info::LedgerInfoWithSignatures, validator_verifier::ValidatorVerifier}; +use aptos_types::{ledger_info::LedgerInfoWithSignatures, validator_verifier::ValidatorVerifier}; use serde::{Deserialize, Serialize}; use std::fmt::{Debug, Display, Formatter}; diff --git a/consensus/consensus-types/src/experimental/commit_vote.rs b/consensus/consensus-types/src/experimental/commit_vote.rs index b1536b1a406cf..f2d1e8170e689 100644 --- a/consensus/consensus-types/src/experimental/commit_vote.rs +++ b/consensus/consensus-types/src/experimental/commit_vote.rs @@ -3,8 +3,8 @@ use crate::common::{Author, Round}; use anyhow::Context; -use diem_crypto::ed25519::Ed25519Signature; -use diem_types::{ +use aptos_crypto::ed25519::Ed25519Signature; +use aptos_types::{ block_info::BlockInfo, ledger_info::LedgerInfo, validator_signer::ValidatorSigner, validator_verifier::ValidatorVerifier, }; diff --git a/consensus/consensus-types/src/proposal_msg.rs b/consensus/consensus-types/src/proposal_msg.rs index 13a0579763b1e..9800399a505c0 100644 --- a/consensus/consensus-types/src/proposal_msg.rs +++ b/consensus/consensus-types/src/proposal_msg.rs @@ -3,7 +3,7 @@ use crate::{block::Block, common::Author, sync_info::SyncInfo}; use anyhow::{anyhow, ensure, format_err, Context, Result}; -use diem_types::validator_verifier::ValidatorVerifier; +use aptos_types::validator_verifier::ValidatorVerifier; use serde::{Deserialize, Serialize}; use short_hex_str::AsShortHexStr; use std::fmt; diff --git a/consensus/consensus-types/src/quorum_cert.rs b/consensus/consensus-types/src/quorum_cert.rs index edb3d1e9b8a21..4352184693e76 100644 --- a/consensus/consensus-types/src/quorum_cert.rs +++ b/consensus/consensus-types/src/quorum_cert.rs @@ -3,8 +3,8 @@ use crate::vote_data::VoteData; use anyhow::{ensure, Context}; -use diem_crypto::{hash::CryptoHash, HashValue}; -use diem_types::{ +use aptos_crypto::{hash::CryptoHash, HashValue}; +use aptos_types::{ block_info::BlockInfo, ledger_info::{LedgerInfo, LedgerInfoWithSignatures}, validator_verifier::ValidatorVerifier, diff --git a/consensus/consensus-types/src/sync_info.rs b/consensus/consensus-types/src/sync_info.rs index ffff647f8f9dd..2f2f66ff87c6a 100644 --- a/consensus/consensus-types/src/sync_info.rs +++ b/consensus/consensus-types/src/sync_info.rs @@ -6,7 +6,7 @@ use crate::{ timeout_certificate::TimeoutCertificate, }; use anyhow::{ensure, Context}; -use diem_types::{ +use aptos_types::{ block_info::BlockInfo, ledger_info::LedgerInfoWithSignatures, validator_verifier::ValidatorVerifier, }; diff --git a/consensus/consensus-types/src/timeout.rs b/consensus/consensus-types/src/timeout.rs index a179087c1b9fd..c5b4181e685f6 100644 --- a/consensus/consensus-types/src/timeout.rs +++ b/consensus/consensus-types/src/timeout.rs @@ -2,9 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 use crate::common::Round; -use diem_crypto::ed25519::Ed25519Signature; -use diem_crypto_derive::{BCSCryptoHash, CryptoHasher}; -use diem_types::validator_signer::ValidatorSigner; +use aptos_crypto::ed25519::Ed25519Signature; +use aptos_crypto_derive::{BCSCryptoHash, CryptoHasher}; +use aptos_types::validator_signer::ValidatorSigner; use serde::{Deserialize, Serialize}; use std::fmt::{Display, Formatter}; diff --git a/consensus/consensus-types/src/timeout_2chain.rs b/consensus/consensus-types/src/timeout_2chain.rs index 56fcb8d9bbdfb..2e041b307278e 100644 --- a/consensus/consensus-types/src/timeout_2chain.rs +++ b/consensus/consensus-types/src/timeout_2chain.rs @@ -3,9 +3,9 @@ use crate::{common::Author, quorum_cert::QuorumCert}; use anyhow::{ensure, Context}; -use diem_crypto::ed25519::Ed25519Signature; -use diem_crypto_derive::{BCSCryptoHash, CryptoHasher}; -use diem_types::{ +use aptos_crypto::ed25519::Ed25519Signature; +use aptos_crypto_derive::{BCSCryptoHash, CryptoHasher}; +use aptos_types::{ block_info::Round, validator_signer::ValidatorSigner, validator_verifier::ValidatorVerifier, }; use serde::{Deserialize, Serialize}; @@ -198,8 +198,8 @@ impl TwoChainTimeoutCertificate { #[test] fn test_2chain_timeout_certificate() { use crate::vote_data::VoteData; - use diem_crypto::hash::CryptoHash; - use diem_types::{ + use aptos_crypto::hash::CryptoHash; + use aptos_types::{ block_info::BlockInfo, ledger_info::{LedgerInfo, LedgerInfoWithSignatures}, validator_verifier::random_validator_verifier, diff --git a/consensus/consensus-types/src/timeout_certificate.rs b/consensus/consensus-types/src/timeout_certificate.rs index cc953281d556e..6a9ba06352683 100644 --- a/consensus/consensus-types/src/timeout_certificate.rs +++ b/consensus/consensus-types/src/timeout_certificate.rs @@ -6,8 +6,8 @@ use crate::{ timeout::Timeout, }; use anyhow::Context; -use diem_crypto::ed25519::Ed25519Signature; -use diem_types::validator_verifier::ValidatorVerifier; +use aptos_crypto::ed25519::Ed25519Signature; +use aptos_types::validator_verifier::ValidatorVerifier; use serde::{Deserialize, Serialize}; use std::{collections::BTreeMap, fmt}; diff --git a/consensus/consensus-types/src/vote.rs b/consensus/consensus-types/src/vote.rs index b6ec168ef6bc6..a63eaaf66cd96 100644 --- a/consensus/consensus-types/src/vote.rs +++ b/consensus/consensus-types/src/vote.rs @@ -6,8 +6,8 @@ use crate::{ vote_data::VoteData, }; use anyhow::{ensure, Context}; -use diem_crypto::{ed25519::Ed25519Signature, hash::CryptoHash}; -use diem_types::{ +use aptos_crypto::{ed25519::Ed25519Signature, hash::CryptoHash}; +use aptos_types::{ ledger_info::LedgerInfo, validator_signer::ValidatorSigner, validator_verifier::ValidatorVerifier, }; diff --git a/consensus/consensus-types/src/vote_data.rs b/consensus/consensus-types/src/vote_data.rs index 168b569e0c005..a5c0306d5759d 100644 --- a/consensus/consensus-types/src/vote_data.rs +++ b/consensus/consensus-types/src/vote_data.rs @@ -1,8 +1,8 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_crypto_derive::{BCSCryptoHash, CryptoHasher}; -use diem_types::block_info::BlockInfo; +use aptos_crypto_derive::{BCSCryptoHash, CryptoHasher}; +use aptos_types::block_info::BlockInfo; use serde::{Deserialize, Serialize}; use std::fmt::{Display, Formatter}; diff --git a/consensus/consensus-types/src/vote_msg.rs b/consensus/consensus-types/src/vote_msg.rs index 83bcd9a9c5b28..0f968c69beb02 100644 --- a/consensus/consensus-types/src/vote_msg.rs +++ b/consensus/consensus-types/src/vote_msg.rs @@ -3,8 +3,8 @@ use crate::{sync_info::SyncInfo, vote::Vote}; use anyhow::ensure; -use diem_crypto::HashValue; -use diem_types::validator_verifier::ValidatorVerifier; +use aptos_crypto::HashValue; +use aptos_types::validator_verifier::ValidatorVerifier; use serde::{Deserialize, Serialize}; use std::fmt::{Display, Formatter}; diff --git a/consensus/consensus-types/src/vote_proposal.rs b/consensus/consensus-types/src/vote_proposal.rs index 5a884cd0fc84a..94326fb384750 100644 --- a/consensus/consensus-types/src/vote_proposal.rs +++ b/consensus/consensus-types/src/vote_proposal.rs @@ -2,12 +2,12 @@ // SPDX-License-Identifier: Apache-2.0 use crate::{block::Block, vote_data::VoteData}; -use diem_crypto::{ +use aptos_crypto::{ ed25519::Ed25519Signature, hash::{TransactionAccumulatorHasher, ACCUMULATOR_PLACEHOLDER_HASH}, }; -use diem_crypto_derive::{BCSCryptoHash, CryptoHasher}; -use diem_types::{ +use aptos_crypto_derive::{BCSCryptoHash, CryptoHasher}; +use aptos_types::{ epoch_state::EpochState, proof::{accumulator::InMemoryAccumulator, AccumulatorExtensionProof}, }; diff --git a/consensus/safety-rules/Cargo.toml b/consensus/safety-rules/Cargo.toml index 75bb947568f38..6b4c33d7e777a 100644 --- a/consensus/safety-rules/Cargo.toml +++ b/consensus/safety-rules/Cargo.toml @@ -14,19 +14,19 @@ rand_core = "0.6.2" crash-handler = { path = "../../crates/crash-handler" } consensus-types = { path = "../consensus-types" } -diem-config = { path = "../../config" } -diem-crypto = { path = "../../crates/diem-crypto" } -diem-global-constants = { path = "../../config/global-constants"} -diem-infallible = { path = "../../crates/diem-infallible" } -diem-logger = { path = "../../crates/diem-logger" } -diem-proptest-helpers = { path = "../../crates/diem-proptest-helpers", optional = true } -diem-secure-net = { path = "../../secure/net" } -diem-secure-push-metrics = { path = "../../secure/push-metrics" } -diem-secure-storage = { path = "../../secure/storage" } -diem-temppath = { path = "../../crates/diem-temppath" } -diem-types = { path = "../../types" } -diem-vault-client = { path = "../../secure/storage/vault" } -diem-workspace-hack = { version = "0.1", path = "../../crates/diem-workspace-hack" } +aptos-config = { path = "../../config" } +aptos-crypto = { path = "../../crates/aptos-crypto" } +aptos-global-constants = { path = "../../config/global-constants"} +aptos-infallible = { path = "../../crates/aptos-infallible" } +aptos-logger = { path = "../../crates/aptos-logger" } +aptos-proptest-helpers = { path = "../../crates/aptos-proptest-helpers", optional = true } +aptos-secure-net = { path = "../../secure/net" } +aptos-secure-push-metrics = { path = "../../secure/push-metrics" } +aptos-secure-storage = { path = "../../secure/storage" } +aptos-temppath = { path = "../../crates/aptos-temppath" } +aptos-types = { path = "../../types" } +aptos-vault-client = { path = "../../secure/storage/vault" } +aptos-workspace-hack = { version = "0.1", path = "../../crates/aptos-workspace-hack" } serde = { version = "1.0.124", default-features = false } serde_json = "1.0.64" thiserror = "1.0.24" @@ -37,9 +37,9 @@ tempfile = "3.2.0" proptest = "1.0.0" consensus-types = { path = "../consensus-types", features = ["fuzzing"] } -diem-config = { path = "../../config", features = ["fuzzing"] } -diem-proptest-helpers = { path = "../../crates/diem-proptest-helpers" } -diem-secure-storage = { path = "../../secure/storage", features = ["testing"] } +aptos-config = { path = "../../config", features = ["fuzzing"] } +aptos-proptest-helpers = { path = "../../crates/aptos-proptest-helpers" } +aptos-secure-storage = { path = "../../secure/storage", features = ["testing"] } [[bench]] name = "safety_rules" @@ -52,5 +52,5 @@ required-features = ["testing"] [features] default = [] -fuzzing = ["consensus-types/fuzzing", "diem-config/fuzzing", "proptest", "diem-proptest-helpers"] -testing = ["diem-secure-storage/testing"] +fuzzing = ["consensus-types/fuzzing", "aptos-config/fuzzing", "proptest", "aptos-proptest-helpers"] +testing = ["aptos-secure-storage/testing"] diff --git a/consensus/safety-rules/benches/safety_rules.rs b/consensus/safety-rules/benches/safety_rules.rs index db43c0537f8eb..ac33abbc0fd13 100644 --- a/consensus/safety-rules/benches/safety_rules.rs +++ b/consensus/safety-rules/benches/safety_rules.rs @@ -1,11 +1,11 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 +use aptos_crypto::{ed25519::Ed25519PrivateKey, Uniform}; +use aptos_secure_storage::{InMemoryStorage, KVStorage, OnDiskStorage, Storage, VaultStorage}; +use aptos_types::validator_signer::ValidatorSigner; use consensus_types::block::block_test_utils; use criterion::{black_box, criterion_group, criterion_main, Criterion}; -use diem_crypto::{ed25519::Ed25519PrivateKey, Uniform}; -use diem_secure_storage::{InMemoryStorage, KVStorage, OnDiskStorage, Storage, VaultStorage}; -use diem_types::validator_signer::ValidatorSigner; use safety_rules::{test_utils, PersistentSafetyStorage, SafetyRulesManager, TSafetyRules}; use tempfile::NamedTempFile; diff --git a/consensus/safety-rules/src/configurable_validator_signer.rs b/consensus/safety-rules/src/configurable_validator_signer.rs index 1ebbe4031372d..c6e3b40e88be8 100644 --- a/consensus/safety-rules/src/configurable_validator_signer.rs +++ b/consensus/safety-rules/src/configurable_validator_signer.rs @@ -2,12 +2,12 @@ // SPDX-License-Identifier: Apache-2.0 use crate::{Error, PersistentSafetyStorage}; -use diem_crypto::{ +use aptos_crypto::{ ed25519::{Ed25519PrivateKey, Ed25519PublicKey, Ed25519Signature}, hash::CryptoHash, }; -use diem_global_constants::CONSENSUS_KEY; -use diem_types::{account_address::AccountAddress, validator_signer::ValidatorSigner}; +use aptos_global_constants::CONSENSUS_KEY; +use aptos_types::{account_address::AccountAddress, validator_signer::ValidatorSigner}; use serde::Serialize; /// A ConfigurableValidatorSigner is a ValidatorSigner wrapper that offers either diff --git a/consensus/safety-rules/src/consensus_state.rs b/consensus/safety-rules/src/consensus_state.rs index 33f15cf599585..058eca59fd3c9 100644 --- a/consensus/safety-rules/src/consensus_state.rs +++ b/consensus/safety-rules/src/consensus_state.rs @@ -1,8 +1,8 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 +use aptos_types::waypoint::Waypoint; use consensus_types::{common::Round, safety_data::SafetyData}; -use diem_types::waypoint::Waypoint; use serde::{Deserialize, Serialize}; use std::fmt::{Display, Formatter}; diff --git a/consensus/safety-rules/src/counters.rs b/consensus/safety-rules/src/counters.rs index a4eb6efc7bba5..e42096cf58061 100644 --- a/consensus/safety-rules/src/counters.rs +++ b/consensus/safety-rules/src/counters.rs @@ -1,7 +1,7 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_secure_push_metrics::{ +use aptos_secure_push_metrics::{ register_histogram_vec, register_int_counter_vec, register_int_gauge_vec, HistogramTimer, HistogramVec, IntCounterVec, IntGaugeVec, }; @@ -14,7 +14,7 @@ pub const WAYPOINT_VERSION: &str = "waypoint_version"; pub static LATENCY: Lazy = Lazy::new(|| { register_histogram_vec!( - "diem_safety_rules_latency", + "aptos_safety_rules_latency", "Time to perform an operation", &["source", "field"] ) @@ -23,7 +23,7 @@ pub static LATENCY: Lazy = Lazy::new(|| { static QUERY_COUNTER: Lazy = Lazy::new(|| { register_int_counter_vec!( - "diem_safety_rules_queries", + "aptos_safety_rules_queries", "Outcome of calling into LSR", &["method", "result"] ) @@ -32,7 +32,7 @@ static QUERY_COUNTER: Lazy = Lazy::new(|| { static STATE_GAUGE: Lazy = Lazy::new(|| { register_int_gauge_vec!( - "diem_safety_rules_state", + "aptos_safety_rules_state", "Current internal state of LSR", &["field"] ) diff --git a/consensus/safety-rules/src/error.rs b/consensus/safety-rules/src/error.rs index 9d1ad40d48c93..471755c52a1bf 100644 --- a/consensus/safety-rules/src/error.rs +++ b/consensus/safety-rules/src/error.rs @@ -63,16 +63,16 @@ impl From for Error { } } -impl From for Error { - fn from(error: diem_secure_net::Error) -> Self { +impl From for Error { + fn from(error: aptos_secure_net::Error) -> Self { Self::InternalError(error.to_string()) } } -impl From for Error { - fn from(error: diem_secure_storage::Error) -> Self { +impl From for Error { + fn from(error: aptos_secure_storage::Error) -> Self { match error { - diem_secure_storage::Error::PermissionDenied => { + aptos_secure_storage::Error::PermissionDenied => { // If a storage error is thrown that indicates a permission failure, we // want to panic immediately to alert an operator that something has gone // wrong. For example, this error is thrown when a storage (e.g., vault) @@ -83,8 +83,8 @@ impl From for Error { error ); } - diem_secure_storage::Error::KeyVersionNotFound(_, _) - | diem_secure_storage::Error::KeyNotSet(_) => { + aptos_secure_storage::Error::KeyVersionNotFound(_, _) + | aptos_secure_storage::Error::KeyNotSet(_) => { Self::SecureStorageMissingDataError(error.to_string()) } _ => Self::SecureStorageUnexpectedError(error.to_string()), diff --git a/consensus/safety-rules/src/fuzzing_utils.rs b/consensus/safety-rules/src/fuzzing_utils.rs index df95ba6ac926a..621f33764449a 100644 --- a/consensus/safety-rules/src/fuzzing_utils.rs +++ b/consensus/safety-rules/src/fuzzing_utils.rs @@ -2,22 +2,13 @@ // SPDX-License-Identifier: Apache-2.0 use crate::serializer::SafetyRulesInput; -#[cfg(any(test, feature = "fuzzing"))] -use consensus_types::block::Block; -use consensus_types::{ - block_data::{BlockData, BlockType}, - quorum_cert::QuorumCert, - timeout::Timeout, - vote_data::VoteData, - vote_proposal::{MaybeSignedVoteProposal, VoteProposal}, -}; -use diem_crypto::{ +use aptos_crypto::{ ed25519::{Ed25519PrivateKey, Ed25519PublicKey}, hash::{HashValue, TransactionAccumulatorHasher}, test_utils::TEST_SEED, traits::{SigningKey, Uniform}, }; -use diem_types::{ +use aptos_types::{ account_address::AccountAddress, epoch_change::EpochChangeProof, epoch_state::EpochState, @@ -27,6 +18,15 @@ use diem_types::{ transaction::SignedTransaction, validator_verifier::{ValidatorConsensusInfo, ValidatorVerifier}, }; +#[cfg(any(test, feature = "fuzzing"))] +use consensus_types::block::Block; +use consensus_types::{ + block_data::{BlockData, BlockType}, + quorum_cert::QuorumCert, + timeout::Timeout, + vote_data::VoteData, + vote_proposal::{MaybeSignedVoteProposal, VoteProposal}, +}; use proptest::prelude::*; use rand::{rngs::StdRng, SeedableRng}; @@ -247,11 +247,11 @@ pub fn arb_safety_rules_input() -> impl Strategy { #[cfg(any(test, feature = "fuzzing"))] pub mod fuzzing { use crate::{error::Error, serializer::SafetyRulesInput, test_utils, TSafetyRules}; + use aptos_crypto::ed25519::Ed25519Signature; + use aptos_types::epoch_change::EpochChangeProof; use consensus_types::{ block_data::BlockData, timeout::Timeout, vote::Vote, vote_proposal::MaybeSignedVoteProposal, }; - use diem_crypto::ed25519::Ed25519Signature; - use diem_types::epoch_change::EpochChangeProof; pub fn fuzz_initialize(proof: EpochChangeProof) -> Result<(), Error> { let mut safety_rules = test_utils::test_safety_rules_uninitialized(); diff --git a/consensus/safety-rules/src/local_client.rs b/consensus/safety-rules/src/local_client.rs index 26fc4e2161c89..c9c0bb75d0e89 100644 --- a/consensus/safety-rules/src/local_client.rs +++ b/consensus/safety-rules/src/local_client.rs @@ -2,6 +2,12 @@ // SPDX-License-Identifier: Apache-2.0 use crate::{ConsensusState, Error, SafetyRules, TSafetyRules}; +use aptos_crypto::ed25519::Ed25519Signature; +use aptos_infallible::RwLock; +use aptos_types::{ + epoch_change::EpochChangeProof, + ledger_info::{LedgerInfo, LedgerInfoWithSignatures}, +}; use consensus_types::{ block_data::BlockData, timeout::Timeout, @@ -9,12 +15,6 @@ use consensus_types::{ vote::Vote, vote_proposal::MaybeSignedVoteProposal, }; -use diem_crypto::ed25519::Ed25519Signature; -use diem_infallible::RwLock; -use diem_types::{ - epoch_change::EpochChangeProof, - ledger_info::{LedgerInfo, LedgerInfoWithSignatures}, -}; use std::sync::Arc; /// A local interface into SafetyRules. Constructed in such a way that the container / caller diff --git a/consensus/safety-rules/src/logging.rs b/consensus/safety-rules/src/logging.rs index 5f99c198c459c..0ae8ea8c1016e 100644 --- a/consensus/safety-rules/src/logging.rs +++ b/consensus/safety-rules/src/logging.rs @@ -2,9 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 use crate::Error; +use aptos_logger::Schema; +use aptos_types::waypoint::Waypoint; use consensus_types::common::{Author, Round}; -use diem_logger::Schema; -use diem_types::waypoint::Waypoint; use serde::Serialize; #[derive(Schema)] diff --git a/consensus/safety-rules/src/main.rs b/consensus/safety-rules/src/main.rs index 804b29ba46874..9ac428b87bfa3 100644 --- a/consensus/safety-rules/src/main.rs +++ b/consensus/safety-rules/src/main.rs @@ -5,8 +5,8 @@ #![forbid(unsafe_code)] -use diem_config::config::{PersistableConfig, SafetyRulesConfig}; -use diem_secure_push_metrics::MetricsPusher; +use aptos_config::config::{PersistableConfig, SafetyRulesConfig}; +use aptos_secure_push_metrics::MetricsPusher; use safety_rules::Process; use std::{env, process}; @@ -23,14 +23,14 @@ fn main() { process::exit(1); }); - diem_logger::Logger::new() + aptos_logger::Logger::new() .channel_size(config.logger.chan_size) .is_async(config.logger.is_async) .level(config.logger.level) .read_env() .init(); - diem_logger::info!(config = config, "Loaded SafetyRules config"); + aptos_logger::info!(config = config, "Loaded SafetyRules config"); crash_handler::setup_panic_handler(); let _mp = MetricsPusher::start(); diff --git a/consensus/safety-rules/src/persistent_safety_storage.rs b/consensus/safety-rules/src/persistent_safety_storage.rs index b3f5b3a272773..bf9a8ba5c62aa 100644 --- a/consensus/safety-rules/src/persistent_safety_storage.rs +++ b/consensus/safety-rules/src/persistent_safety_storage.rs @@ -6,15 +6,15 @@ use crate::{ logging::{self, LogEntry, LogEvent}, Error, }; -use consensus_types::{common::Author, safety_data::SafetyData}; -use diem_crypto::{ +use aptos_crypto::{ ed25519::{Ed25519PrivateKey, Ed25519PublicKey, Ed25519Signature}, hash::CryptoHash, }; -use diem_global_constants::{CONSENSUS_KEY, EXECUTION_KEY, OWNER_ACCOUNT, SAFETY_DATA, WAYPOINT}; -use diem_logger::prelude::*; -use diem_secure_storage::{CryptoStorage, KVStorage, Storage}; -use diem_types::waypoint::Waypoint; +use aptos_global_constants::{CONSENSUS_KEY, EXECUTION_KEY, OWNER_ACCOUNT, SAFETY_DATA, WAYPOINT}; +use aptos_logger::prelude::*; +use aptos_secure_storage::{CryptoStorage, KVStorage, Storage}; +use aptos_types::waypoint::Waypoint; +use consensus_types::{common::Author, safety_data::SafetyData}; use serde::Serialize; /// SafetyRules needs an abstract storage interface to act as a common utility for storing @@ -82,7 +82,7 @@ impl PersistentSafetyStorage { // inconsistencies or why they did not reset storage between rounds. Do not repeat the // checks again below, because it is just too strange to have a partially configured // storage. - if let Err(diem_secure_storage::Error::KeyAlreadyExists(_)) = result { + if let Err(aptos_secure_storage::Error::KeyAlreadyExists(_)) = result { warn!("Attempted to re-initialize existing storage"); return Ok(()); } @@ -195,9 +195,9 @@ impl PersistentSafetyStorage { mod tests { use super::*; use crate::counters; - use diem_crypto::{hash::HashValue, Uniform}; - use diem_secure_storage::InMemoryStorage; - use diem_types::{ + use aptos_crypto::{hash::HashValue, Uniform}; + use aptos_secure_storage::InMemoryStorage; + use aptos_types::{ block_info::BlockInfo, epoch_state::EpochState, ledger_info::LedgerInfo, transaction::Version, validator_signer::ValidatorSigner, waypoint::Waypoint, }; diff --git a/consensus/safety-rules/src/process.rs b/consensus/safety-rules/src/process.rs index 7826dbefa02af..d54d1ed761234 100644 --- a/consensus/safety-rules/src/process.rs +++ b/consensus/safety-rules/src/process.rs @@ -6,7 +6,7 @@ use crate::{ remote_service::{self, RemoteService}, safety_rules_manager, }; -use diem_config::config::{SafetyRulesConfig, SafetyRulesService}; +use aptos_config::config::{SafetyRulesConfig, SafetyRulesService}; use std::net::SocketAddr; diff --git a/consensus/safety-rules/src/remote_service.rs b/consensus/safety-rules/src/remote_service.rs index 2b929437b0c34..c7c5780e394ce 100644 --- a/consensus/safety-rules/src/remote_service.rs +++ b/consensus/safety-rules/src/remote_service.rs @@ -6,8 +6,8 @@ use crate::{ serializer::{SafetyRulesInput, SerializerClient, SerializerService, TSerializerClient}, Error, SafetyRules, TSafetyRules, }; -use diem_logger::warn; -use diem_secure_net::{NetworkClient, NetworkServer}; +use aptos_logger::warn; +use aptos_secure_net::{NetworkClient, NetworkServer}; use std::net::SocketAddr; pub trait RemoteService { diff --git a/consensus/safety-rules/src/safety_rules.rs b/consensus/safety-rules/src/safety_rules.rs index a54402349c372..4db0732956a83 100644 --- a/consensus/safety-rules/src/safety_rules.rs +++ b/consensus/safety-rules/src/safety_rules.rs @@ -10,6 +10,19 @@ use crate::{ persistent_safety_storage::PersistentSafetyStorage, t_safety_rules::TSafetyRules, }; +use aptos_crypto::{ + ed25519::{Ed25519PublicKey, Ed25519Signature}, + hash::{CryptoHash, HashValue}, + traits::Signature, +}; +use aptos_logger::prelude::*; +use aptos_types::{ + block_info::BlockInfo, + epoch_change::EpochChangeProof, + epoch_state::EpochState, + ledger_info::{LedgerInfo, LedgerInfoWithSignatures}, + waypoint::Waypoint, +}; use consensus_types::{ block::Block, block_data::BlockData, @@ -22,19 +35,6 @@ use consensus_types::{ vote_data::VoteData, vote_proposal::MaybeSignedVoteProposal, }; -use diem_crypto::{ - ed25519::{Ed25519PublicKey, Ed25519Signature}, - hash::{CryptoHash, HashValue}, - traits::Signature, -}; -use diem_logger::prelude::*; -use diem_types::{ - block_info::BlockInfo, - epoch_change::EpochChangeProof, - epoch_state::EpochState, - ledger_info::{LedgerInfo, LedgerInfoWithSignatures}, - waypoint::Waypoint, -}; use serde::Serialize; use std::cmp::Ordering; diff --git a/consensus/safety-rules/src/safety_rules_2chain.rs b/consensus/safety-rules/src/safety_rules_2chain.rs index d1a1eab5e604e..6c1339bab0ca0 100644 --- a/consensus/safety-rules/src/safety_rules_2chain.rs +++ b/consensus/safety-rules/src/safety_rules_2chain.rs @@ -2,6 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 use crate::{error::Error, safety_rules::next_round, SafetyRules}; +use aptos_crypto::{ed25519::Ed25519Signature, hash::CryptoHash, HashValue}; +use aptos_types::{block_info::BlockInfo, ledger_info::LedgerInfo}; use consensus_types::{ block::Block, safety_data::SafetyData, @@ -9,8 +11,6 @@ use consensus_types::{ vote::Vote, vote_proposal::MaybeSignedVoteProposal, }; -use diem_crypto::{ed25519::Ed25519Signature, hash::CryptoHash, HashValue}; -use diem_types::{block_info::BlockInfo, ledger_info::LedgerInfo}; /// 2-chain safety rules implementation impl SafetyRules { diff --git a/consensus/safety-rules/src/safety_rules_manager.rs b/consensus/safety-rules/src/safety_rules_manager.rs index ce74721bf5177..48c1b6ce01e32 100644 --- a/consensus/safety-rules/src/safety_rules_manager.rs +++ b/consensus/safety-rules/src/safety_rules_manager.rs @@ -10,9 +10,9 @@ use crate::{ thread::ThreadService, SafetyRules, TSafetyRules, }; -use diem_config::config::{SafetyRulesConfig, SafetyRulesService}; -use diem_infallible::RwLock; -use diem_secure_storage::{KVStorage, Storage}; +use aptos_config::config::{SafetyRulesConfig, SafetyRulesService}; +use aptos_infallible::RwLock; +use aptos_secure_storage::{KVStorage, Storage}; use std::{convert::TryInto, net::SocketAddr, sync::Arc}; pub fn storage(config: &SafetyRulesConfig) -> PersistentSafetyStorage { diff --git a/consensus/safety-rules/src/serializer.rs b/consensus/safety-rules/src/serializer.rs index 0aeceb35bff69..5d4b14e8675eb 100644 --- a/consensus/safety-rules/src/serializer.rs +++ b/consensus/safety-rules/src/serializer.rs @@ -2,6 +2,12 @@ // SPDX-License-Identifier: Apache-2.0 use crate::{counters, logging::LogEntry, ConsensusState, Error, SafetyRules, TSafetyRules}; +use aptos_crypto::ed25519::Ed25519Signature; +use aptos_infallible::RwLock; +use aptos_types::{ + epoch_change::EpochChangeProof, + ledger_info::{LedgerInfo, LedgerInfoWithSignatures}, +}; use consensus_types::{ block_data::BlockData, timeout::Timeout, @@ -9,12 +15,6 @@ use consensus_types::{ vote::Vote, vote_proposal::MaybeSignedVoteProposal, }; -use diem_crypto::ed25519::Ed25519Signature; -use diem_infallible::RwLock; -use diem_types::{ - epoch_change::EpochChangeProof, - ledger_info::{LedgerInfo, LedgerInfoWithSignatures}, -}; use serde::{Deserialize, Serialize}; use std::sync::Arc; diff --git a/consensus/safety-rules/src/t_safety_rules.rs b/consensus/safety-rules/src/t_safety_rules.rs index 1ac83d6828a8b..db77f3420adfb 100644 --- a/consensus/safety-rules/src/t_safety_rules.rs +++ b/consensus/safety-rules/src/t_safety_rules.rs @@ -2,6 +2,11 @@ // SPDX-License-Identifier: Apache-2.0 use crate::{ConsensusState, Error}; +use aptos_crypto::ed25519::Ed25519Signature; +use aptos_types::{ + epoch_change::EpochChangeProof, + ledger_info::{LedgerInfo, LedgerInfoWithSignatures}, +}; use consensus_types::{ block_data::BlockData, timeout::Timeout, @@ -9,11 +14,6 @@ use consensus_types::{ vote::Vote, vote_proposal::MaybeSignedVoteProposal, }; -use diem_crypto::ed25519::Ed25519Signature; -use diem_types::{ - epoch_change::EpochChangeProof, - ledger_info::{LedgerInfo, LedgerInfoWithSignatures}, -}; /// Interface for SafetyRules pub trait TSafetyRules { diff --git a/consensus/safety-rules/src/test_utils.rs b/consensus/safety-rules/src/test_utils.rs index c635f5775a7c2..db70bd37bed25 100644 --- a/consensus/safety-rules/src/test_utils.rs +++ b/consensus/safety-rules/src/test_utils.rs @@ -5,24 +5,14 @@ use crate::{ persistent_safety_storage::PersistentSafetyStorage, serializer::SerializerService, SafetyRules, TSafetyRules, }; -use consensus_types::{ - block::Block, - common::{Payload, Round}, - quorum_cert::QuorumCert, - timeout::Timeout, - timeout_2chain::{TwoChainTimeout, TwoChainTimeoutCertificate}, - vote::Vote, - vote_data::VoteData, - vote_proposal::{MaybeSignedVoteProposal, VoteProposal}, -}; -use diem_crypto::{ +use aptos_crypto::{ ed25519::Ed25519PrivateKey, hash::{CryptoHash, TransactionAccumulatorHasher}, traits::SigningKey, Uniform, }; -use diem_secure_storage::{InMemoryStorage, Storage}; -use diem_types::{ +use aptos_secure_storage::{InMemoryStorage, Storage}; +use aptos_types::{ block_info::BlockInfo, epoch_change::EpochChangeProof, epoch_state::EpochState, @@ -33,6 +23,16 @@ use diem_types::{ validator_signer::ValidatorSigner, waypoint::Waypoint, }; +use consensus_types::{ + block::Block, + common::{Payload, Round}, + quorum_cert::QuorumCert, + timeout::Timeout, + timeout_2chain::{TwoChainTimeout, TwoChainTimeoutCertificate}, + vote::Vote, + vote_data::VoteData, + vote_proposal::{MaybeSignedVoteProposal, VoteProposal}, +}; use std::collections::BTreeMap; pub type Proof = AccumulatorExtensionProof; diff --git a/consensus/safety-rules/src/tests/local.rs b/consensus/safety-rules/src/tests/local.rs index 2bcef367166ca..0a41374780bdf 100644 --- a/consensus/safety-rules/src/tests/local.rs +++ b/consensus/safety-rules/src/tests/local.rs @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 use crate::{test_utils, tests::suite, SafetyRulesManager}; -use diem_crypto::{ed25519::Ed25519PrivateKey, Uniform}; -use diem_types::validator_signer::ValidatorSigner; +use aptos_crypto::{ed25519::Ed25519PrivateKey, Uniform}; +use aptos_types::validator_signer::ValidatorSigner; #[test] fn test() { diff --git a/consensus/safety-rules/src/tests/networking.rs b/consensus/safety-rules/src/tests/networking.rs index 3fd13345fc185..f24a93564e15e 100644 --- a/consensus/safety-rules/src/tests/networking.rs +++ b/consensus/safety-rules/src/tests/networking.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 use crate::{test_utils, SafetyRulesManager}; -use diem_types::validator_signer::ValidatorSigner; +use aptos_types::validator_signer::ValidatorSigner; #[test] fn test_reconnect() { diff --git a/consensus/safety-rules/src/tests/safety_rules.rs b/consensus/safety-rules/src/tests/safety_rules.rs index 7f86344b1eb4d..70a2e8b7bb2f0 100644 --- a/consensus/safety-rules/src/tests/safety_rules.rs +++ b/consensus/safety-rules/src/tests/safety_rules.rs @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 use crate::{test_utils, tests::suite, SafetyRules}; -use diem_crypto::{ed25519::Ed25519PrivateKey, Uniform}; -use diem_types::validator_signer::ValidatorSigner; +use aptos_crypto::{ed25519::Ed25519PrivateKey, Uniform}; +use aptos_types::validator_signer::ValidatorSigner; #[test] fn test() { diff --git a/consensus/safety-rules/src/tests/serializer.rs b/consensus/safety-rules/src/tests/serializer.rs index 71377f9b3adde..424730ec9fae8 100644 --- a/consensus/safety-rules/src/tests/serializer.rs +++ b/consensus/safety-rules/src/tests/serializer.rs @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 use crate::{test_utils, tests::suite, SafetyRulesManager}; -use diem_crypto::{ed25519::Ed25519PrivateKey, Uniform}; -use diem_types::validator_signer::ValidatorSigner; +use aptos_crypto::{ed25519::Ed25519PrivateKey, Uniform}; +use aptos_types::validator_signer::ValidatorSigner; #[test] fn test() { diff --git a/consensus/safety-rules/src/tests/suite.rs b/consensus/safety-rules/src/tests/suite.rs index 711db70eee659..5c42f7a6e3fe1 100644 --- a/consensus/safety-rules/src/tests/suite.rs +++ b/consensus/safety-rules/src/tests/suite.rs @@ -2,21 +2,13 @@ // SPDX-License-Identifier: Apache-2.0 use crate::{test_utils, test_utils::make_timeout_cert, Error, SafetyRules, TSafetyRules}; -use consensus_types::{ - block::block_test_utils::random_payload, - common::Round, - quorum_cert::QuorumCert, - timeout::Timeout, - timeout_2chain::{TwoChainTimeout, TwoChainTimeoutCertificate}, - vote_proposal::MaybeSignedVoteProposal, -}; -use diem_crypto::{ +use aptos_crypto::{ ed25519::{Ed25519PrivateKey, Ed25519Signature}, hash::{CryptoHash, HashValue, ACCUMULATOR_PLACEHOLDER_HASH}, }; -use diem_global_constants::CONSENSUS_KEY; -use diem_secure_storage::CryptoStorage; -use diem_types::{ +use aptos_global_constants::CONSENSUS_KEY; +use aptos_secure_storage::CryptoStorage; +use aptos_types::{ account_address::AccountAddress, block_info::BlockInfo, epoch_state::EpochState, @@ -24,6 +16,14 @@ use diem_types::{ validator_signer::ValidatorSigner, validator_verifier::ValidatorVerifier, }; +use consensus_types::{ + block::block_test_utils::random_payload, + common::Round, + quorum_cert::QuorumCert, + timeout::Timeout, + timeout_2chain::{TwoChainTimeout, TwoChainTimeoutCertificate}, + vote_proposal::MaybeSignedVoteProposal, +}; use std::collections::BTreeMap; type Proof = test_utils::Proof; diff --git a/consensus/safety-rules/src/tests/thread.rs b/consensus/safety-rules/src/tests/thread.rs index f4c6adb01de59..1c91bbb3a7c02 100644 --- a/consensus/safety-rules/src/tests/thread.rs +++ b/consensus/safety-rules/src/tests/thread.rs @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 use crate::{test_utils, tests::suite, SafetyRulesManager}; -use diem_crypto::{ed25519::Ed25519PrivateKey, Uniform}; -use diem_types::validator_signer::ValidatorSigner; +use aptos_crypto::{ed25519::Ed25519PrivateKey, Uniform}; +use aptos_types::validator_signer::ValidatorSigner; #[test] fn test() { diff --git a/consensus/safety-rules/src/tests/vault.rs b/consensus/safety-rules/src/tests/vault.rs index 532277c7fee91..f93ad2be197d9 100644 --- a/consensus/safety-rules/src/tests/vault.rs +++ b/consensus/safety-rules/src/tests/vault.rs @@ -2,10 +2,10 @@ // SPDX-License-Identifier: Apache-2.0 use crate::{tests::suite, PersistentSafetyStorage, SafetyRulesManager}; -use diem_crypto::{ed25519::Ed25519PrivateKey, Uniform}; -use diem_secure_storage::{KVStorage, Storage, VaultStorage}; -use diem_types::validator_signer::ValidatorSigner; -use diem_vault_client::dev::{self, ROOT_TOKEN}; +use aptos_crypto::{ed25519::Ed25519PrivateKey, Uniform}; +use aptos_secure_storage::{KVStorage, Storage, VaultStorage}; +use aptos_types::validator_signer::ValidatorSigner; +use aptos_vault_client::dev::{self, ROOT_TOKEN}; /// A test for verifying VaultStorage properly supports the SafetyRule backend. This test /// depends on running Vault, which can be done by using the provided docker run script in diff --git a/consensus/safety-rules/src/thread.rs b/consensus/safety-rules/src/thread.rs index b3683b7aeb344..efd63921cdd9c 100644 --- a/consensus/safety-rules/src/thread.rs +++ b/consensus/safety-rules/src/thread.rs @@ -11,7 +11,7 @@ use crate::{ persistent_safety_storage::PersistentSafetyStorage, remote_service::{self, RemoteService}, }; -use diem_config::utils; +use aptos_config::utils; use std::{ net::{IpAddr, Ipv4Addr, SocketAddr}, thread::{self, JoinHandle}, diff --git a/consensus/safety-rules/tests/binary.rs b/consensus/safety-rules/tests/binary.rs index 7716524550e1c..70ecacd5fd181 100644 --- a/consensus/safety-rules/tests/binary.rs +++ b/consensus/safety-rules/tests/binary.rs @@ -1,11 +1,11 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_config::{ +use aptos_config::{ config::{NodeConfig, PersistableConfig, RemoteService, SafetyRulesService}, utils, }; -use diem_types::validator_signer::ValidatorSigner; +use aptos_types::validator_signer::ValidatorSigner; use safety_rules::{test_utils, SafetyRulesManager}; use std::net::{IpAddr, Ipv4Addr, SocketAddr}; @@ -24,7 +24,7 @@ fn test_consensus_state() { let server_address = SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), server_port).into(); config.service = SafetyRulesService::Process(RemoteService { server_address }); - let config_path = diem_temppath::TempPath::new(); + let config_path = aptos_temppath::TempPath::new(); config_path.create_as_file().unwrap(); config.save_config(config_path.path()).unwrap(); diff --git a/consensus/src/block_storage/block_store.rs b/consensus/src/block_storage/block_store.rs index a1bc32e219e4e..da76bdd6c0a25 100644 --- a/consensus/src/block_storage/block_store.rs +++ b/consensus/src/block_storage/block_store.rs @@ -16,15 +16,15 @@ use crate::{ }; use anyhow::{bail, ensure, format_err, Context}; +use aptos_crypto::{hash::ACCUMULATOR_PLACEHOLDER_HASH, HashValue}; +use aptos_infallible::RwLock; +use aptos_logger::prelude::*; +use aptos_types::{ledger_info::LedgerInfoWithSignatures, transaction::TransactionStatus}; use consensus_types::{ block::Block, common::Round, executed_block::ExecutedBlock, quorum_cert::QuorumCert, sync_info::SyncInfo, timeout_2chain::TwoChainTimeoutCertificate, timeout_certificate::TimeoutCertificate, }; -use diem_crypto::{hash::ACCUMULATOR_PLACEHOLDER_HASH, HashValue}; -use diem_infallible::RwLock; -use diem_logger::prelude::*; -use diem_types::{ledger_info::LedgerInfoWithSignatures, transaction::TransactionStatus}; use executor_types::{Error, StateComputeResult}; use futures::executor::block_on; #[cfg(test)] diff --git a/consensus/src/block_storage/block_store_and_lec_recovery_test.rs b/consensus/src/block_storage/block_store_and_lec_recovery_test.rs index 5475575a4d3c7..fb80223e4a3c7 100644 --- a/consensus/src/block_storage/block_store_and_lec_recovery_test.rs +++ b/consensus/src/block_storage/block_store_and_lec_recovery_test.rs @@ -8,10 +8,10 @@ use crate::{ test_utils::{EmptyStorage, MockTransactionManager, TreeInserter}, util::mock_time_service::SimulatedTimeService, }; +use aptos_config::config::NodeConfig; +use aptos_crypto::{ed25519::Ed25519PrivateKey, Uniform}; +use aptos_types::validator_signer::ValidatorSigner; use consensus_types::{block::Block, quorum_cert::QuorumCert}; -use diem_config::config::NodeConfig; -use diem_crypto::{ed25519::Ed25519PrivateKey, Uniform}; -use diem_types::validator_signer::ValidatorSigner; use execution_correctness::{ExecutionCorrectness, ExecutionCorrectnessManager}; use executor::components::apply_chunk_output::IntoLedgerView; use executor_test_helpers::start_storage_service; diff --git a/consensus/src/block_storage/block_store_test.rs b/consensus/src/block_storage/block_store_test.rs index 24df58a47d03d..19c7ecf5140a5 100644 --- a/consensus/src/block_storage/block_store_test.rs +++ b/consensus/src/block_storage/block_store_test.rs @@ -8,6 +8,10 @@ use crate::{ build_empty_tree, build_simple_tree, consensus_runtime, timed_block_on, TreeInserter, }, }; +use aptos_crypto::{HashValue, PrivateKey}; +use aptos_types::{ + validator_signer::ValidatorSigner, validator_verifier::random_validator_verifier, +}; use consensus_types::{ block::{ block_test_utils::{ @@ -20,10 +24,6 @@ use consensus_types::{ vote::Vote, vote_data::VoteData, }; -use diem_crypto::{HashValue, PrivateKey}; -use diem_types::{ - validator_signer::ValidatorSigner, validator_verifier::random_validator_verifier, -}; use proptest::prelude::*; use std::{cmp::min, collections::HashSet}; @@ -115,7 +115,7 @@ proptest! { // recursion depth 50) ){ - let authors: HashSet = private_keys.iter().map(|private_key| diem_types::account_address::from_public_key(&private_key.public_key())).collect(); + let authors: HashSet = private_keys.iter().map(|private_key| aptos_types::account_address::from_public_key(&private_key.public_key())).collect(); let mut runtime = consensus_runtime(); let block_store = build_empty_tree(); for block in blocks { @@ -267,7 +267,7 @@ async fn test_path_from_root() { #[tokio::test] async fn test_insert_vote() { - ::diem_logger::Logger::init_for_testing(); + ::aptos_logger::Logger::init_for_testing(); // Set up enough different authors to support different votes for the same block. let (signers, validator_verifier) = random_validator_verifier(11, Some(10), false); let my_signer = signers[10].clone(); diff --git a/consensus/src/block_storage/block_tree.rs b/consensus/src/block_storage/block_tree.rs index 1f3d2dd05bd5a..e1aae44043dc6 100644 --- a/consensus/src/block_storage/block_tree.rs +++ b/consensus/src/block_storage/block_tree.rs @@ -8,13 +8,13 @@ use crate::{ persistent_liveness_storage::PersistentLivenessStorage, }; use anyhow::bail; +use aptos_crypto::HashValue; +use aptos_logger::prelude::*; +use aptos_types::{block_info::BlockInfo, ledger_info::LedgerInfoWithSignatures}; use consensus_types::{ executed_block::ExecutedBlock, quorum_cert::QuorumCert, timeout_2chain::TwoChainTimeoutCertificate, timeout_certificate::TimeoutCertificate, }; -use diem_crypto::HashValue; -use diem_logger::prelude::*; -use diem_types::{block_info::BlockInfo, ledger_info::LedgerInfoWithSignatures}; use mirai_annotations::{checked_verify_eq, precondition}; use std::{ collections::{vec_deque::VecDeque, HashMap, HashSet}, diff --git a/consensus/src/block_storage/mod.rs b/consensus/src/block_storage/mod.rs index 73be935b88b5c..aad6e8714f415 100644 --- a/consensus/src/block_storage/mod.rs +++ b/consensus/src/block_storage/mod.rs @@ -1,19 +1,19 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 +use aptos_crypto::HashValue; use consensus_types::{ executed_block::ExecutedBlock, quorum_cert::QuorumCert, timeout_certificate::TimeoutCertificate, }; -use diem_crypto::HashValue; use std::sync::Arc; mod block_store; mod block_tree; pub mod tracing; +use aptos_types::ledger_info::LedgerInfoWithSignatures; pub use block_store::{sync_manager::BlockRetriever, BlockStore}; use consensus_types::{sync_info::SyncInfo, timeout_2chain::TwoChainTimeoutCertificate}; -use diem_types::ledger_info::LedgerInfoWithSignatures; pub trait BlockReader: Send + Sync { /// Check if a block with the block_id exist in the BlockTree. diff --git a/consensus/src/block_storage/sync_manager.rs b/consensus/src/block_storage/sync_manager.rs index e1b5ead37f5e2..f0f05f6342f9e 100644 --- a/consensus/src/block_storage/sync_manager.rs +++ b/consensus/src/block_storage/sync_manager.rs @@ -11,6 +11,12 @@ use crate::{ }; use anyhow::bail; +use aptos_crypto::HashValue; +use aptos_logger::prelude::*; +use aptos_types::{ + account_address::AccountAddress, epoch_change::EpochChangeProof, + ledger_info::LedgerInfoWithSignatures, +}; use consensus_types::{ block::Block, block_retrieval::{BlockRetrievalRequest, BlockRetrievalStatus, MAX_BLOCKS_PER_REQUEST}, @@ -18,12 +24,6 @@ use consensus_types::{ quorum_cert::QuorumCert, sync_info::SyncInfo, }; -use diem_crypto::HashValue; -use diem_logger::prelude::*; -use diem_types::{ - account_address::AccountAddress, epoch_change::EpochChangeProof, - ledger_info::LedgerInfoWithSignatures, -}; use rand::{prelude::*, Rng}; use std::{clone::Clone, cmp::min, sync::Arc, time::Duration}; diff --git a/consensus/src/block_storage/tracing.rs b/consensus/src/block_storage/tracing.rs index 535045d7d7b70..2367e6ed968b3 100644 --- a/consensus/src/block_storage/tracing.rs +++ b/consensus/src/block_storage/tracing.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 use crate::counters; -use diem_infallible::duration_since_epoch; +use aptos_infallible::duration_since_epoch; use std::time::Duration; pub struct BlockStage; diff --git a/consensus/src/consensus_provider.rs b/consensus/src/consensus_provider.rs index 46755c8c26f73..1892435fa5c22 100644 --- a/consensus/src/consensus_provider.rs +++ b/consensus/src/consensus_provider.rs @@ -11,10 +11,10 @@ use crate::{ txn_manager::MempoolProxy, util::time_service::ClockTimeService, }; +use aptos_config::config::NodeConfig; +use aptos_logger::prelude::*; +use aptos_mempool::ConsensusRequest; use consensus_notifications::ConsensusNotificationSender; -use diem_config::config::NodeConfig; -use diem_logger::prelude::*; -use diem_mempool::ConsensusRequest; use event_notifications::ReconfigNotificationListener; use execution_correctness::ExecutionCorrectnessManager; use futures::channel::mpsc; diff --git a/consensus/src/consensusdb/consensusdb_test.rs b/consensus/src/consensusdb/consensusdb_test.rs index e10f535534087..54a73f4276fdc 100644 --- a/consensus/src/consensusdb/consensusdb_test.rs +++ b/consensus/src/consensusdb/consensusdb_test.rs @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 use super::*; +use aptos_temppath::TempPath; use consensus_types::block::block_test_utils::certificate_for_genesis; -use diem_temppath::TempPath; #[test] fn test_put_get() { diff --git a/consensus/src/consensusdb/mod.rs b/consensus/src/consensusdb/mod.rs index 9ed16ca40ba72..3fbce798f4e06 100644 --- a/consensus/src/consensusdb/mod.rs +++ b/consensus/src/consensusdb/mod.rs @@ -14,9 +14,9 @@ use crate::{ error::DbError, }; use anyhow::Result; +use aptos_crypto::HashValue; +use aptos_logger::prelude::*; use consensus_types::{block::Block, quorum_cert::QuorumCert}; -use diem_crypto::HashValue; -use diem_logger::prelude::*; use schema::{BLOCK_CF_NAME, QC_CF_NAME, SINGLE_ENTRY_CF_NAME}; use schemadb::{Options, ReadOptions, SchemaBatch, DB, DEFAULT_CF_NAME}; use std::{collections::HashMap, iter::Iterator, path::Path, time::Instant}; diff --git a/consensus/src/consensusdb/schema/block/mod.rs b/consensus/src/consensusdb/schema/block/mod.rs index f6c8c5ac6c2a1..4aeffb4fc5cbd 100644 --- a/consensus/src/consensusdb/schema/block/mod.rs +++ b/consensus/src/consensusdb/schema/block/mod.rs @@ -11,8 +11,8 @@ use super::BLOCK_CF_NAME; use anyhow::Result; +use aptos_crypto::HashValue; use consensus_types::block::Block; -use diem_crypto::HashValue; use schemadb::schema::{KeyCodec, Schema, ValueCodec}; pub struct BlockSchema; diff --git a/consensus/src/consensusdb/schema/quorum_certificate/mod.rs b/consensus/src/consensusdb/schema/quorum_certificate/mod.rs index 6bcc40f1082c4..02d192eef450d 100644 --- a/consensus/src/consensusdb/schema/quorum_certificate/mod.rs +++ b/consensus/src/consensusdb/schema/quorum_certificate/mod.rs @@ -11,8 +11,8 @@ use super::QC_CF_NAME; use anyhow::Result; +use aptos_crypto::HashValue; use consensus_types::quorum_cert::QuorumCert; -use diem_crypto::HashValue; use schemadb::{ define_schema, schema::{KeyCodec, ValueCodec}, diff --git a/consensus/src/counters.rs b/consensus/src/counters.rs index 108477e314d24..5f3a6489c72b4 100644 --- a/consensus/src/counters.rs +++ b/consensus/src/counters.rs @@ -1,7 +1,7 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_metrics::{ +use aptos_metrics::{ register_histogram, register_histogram_vec, register_int_counter, register_int_counter_vec, register_int_gauge, DurationHistogram, Histogram, HistogramVec, IntCounter, IntCounterVec, IntGauge, @@ -13,8 +13,8 @@ use once_cell::sync::Lazy; ////////////////////// /// Monitor counters, used by monitor! macro -pub static OP_COUNTERS: Lazy = - Lazy::new(|| diem_metrics::OpMetrics::new_and_registered("consensus")); +pub static OP_COUNTERS: Lazy = + Lazy::new(|| aptos_metrics::OpMetrics::new_and_registered("consensus")); pub static ERROR_COUNT: Lazy = Lazy::new(|| { register_int_gauge!( diff --git a/consensus/src/epoch_manager.rs b/consensus/src/epoch_manager.rs index 29c736496290d..f302f49bafd7d 100644 --- a/consensus/src/epoch_manager.rs +++ b/consensus/src/epoch_manager.rs @@ -28,22 +28,22 @@ use crate::{ util::time_service::TimeService, }; use anyhow::{bail, ensure, Context}; -use channel::{diem_channel, message_queues::QueueStyle}; -use consensus_types::{ - common::{Author, Round}, - epoch_retrieval::EpochRetrievalRequest, -}; -use diem_config::config::{ConsensusConfig, ConsensusProposerType, NodeConfig}; -use diem_infallible::{duration_since_epoch, Mutex}; -use diem_logger::prelude::*; -use diem_metrics::monitor; -use diem_types::{ +use aptos_config::config::{ConsensusConfig, ConsensusProposerType, NodeConfig}; +use aptos_infallible::{duration_since_epoch, Mutex}; +use aptos_logger::prelude::*; +use aptos_metrics::monitor; +use aptos_types::{ account_address::AccountAddress, epoch_change::EpochChangeProof, epoch_state::EpochState, on_chain_config::{OnChainConfigPayload, OnChainConsensusConfig, ValidatorSet}, validator_verifier::ValidatorVerifier, }; +use channel::{aptos_channel, message_queues::QueueStyle}; +use consensus_types::{ + common::{Author, Round}, + epoch_retrieval::EpochRetrievalRequest, +}; use event_notifications::ReconfigNotificationListener; use futures::{ channel::{ @@ -91,11 +91,11 @@ pub struct EpochManager { safety_rules_manager: SafetyRulesManager, reconfig_events: ReconfigNotificationListener, // channels to buffer manager - buffer_manager_msg_tx: Option>, + buffer_manager_msg_tx: Option>, buffer_manager_reset_tx: Option>, // channels to round manager round_manager_tx: Option< - diem_channel::Sender<(Author, Discriminant), (Author, VerifiedEvent)>, + aptos_channel::Sender<(Author, Discriminant), (Author, VerifiedEvent)>, >, epoch_state: Option, } @@ -296,7 +296,7 @@ impl EpochManager { } /// this function spawns the phases and a buffer manager - /// it sets `self.commit_msg_tx` to a new diem_channel::Sender and returns an OrderingStateComputer + /// it sets `self.commit_msg_tx` to a new aptos_channel::Sender and returns an OrderingStateComputer fn spawn_decoupled_execution( &mut self, safety_rules_container: Arc>, @@ -312,7 +312,7 @@ impl EpochManager { let (block_tx, block_rx) = unbounded::(); let (reset_tx, reset_rx) = unbounded::(); - let (commit_msg_tx, commit_msg_rx) = diem_channel::new::( + let (commit_msg_tx, commit_msg_rx) = aptos_channel::new::( QueueStyle::FIFO, self.config.channel_size, Some(&counters::BUFFER_MANAGER_MSGS), @@ -458,7 +458,7 @@ impl EpochManager { ); round_manager.init(last_vote).await; - let (round_manager_tx, round_manager_rx) = diem_channel::new( + let (round_manager_tx, round_manager_rx) = aptos_channel::new( QueueStyle::LIFO, 1, Some(&counters::ROUND_MANAGER_CHANNEL_MSGS), diff --git a/consensus/src/experimental/buffer.rs b/consensus/src/experimental/buffer.rs index 311978992f86c..1ec678a1c7dd5 100644 --- a/consensus/src/experimental/buffer.rs +++ b/consensus/src/experimental/buffer.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 use crate::experimental::hashable::Hashable; -use diem_crypto::HashValue; +use aptos_crypto::HashValue; use std::collections::HashMap; pub struct LinkedItem { @@ -143,7 +143,7 @@ impl Buffer { mod test { use super::Buffer; use crate::experimental::hashable::Hashable; - use diem_crypto::HashValue; + use aptos_crypto::HashValue; use std::fmt::{Debug, Formatter}; #[derive(PartialEq, Eq)] diff --git a/consensus/src/experimental/buffer_item.rs b/consensus/src/experimental/buffer_item.rs index d2eff88b35353..111d459c00984 100644 --- a/consensus/src/experimental/buffer_item.rs +++ b/consensus/src/experimental/buffer_item.rs @@ -6,20 +6,20 @@ use std::collections::BTreeMap; use anyhow::anyhow; use itertools::zip_eq; -use consensus_types::{ - common::Author, executed_block::ExecutedBlock, experimental::commit_vote::CommitVote, -}; -use diem_crypto::ed25519::Ed25519Signature; -use diem_logger::prelude::*; -use diem_types::{ +use aptos_crypto::ed25519::Ed25519Signature; +use aptos_logger::prelude::*; +use aptos_types::{ account_address::AccountAddress, block_info::BlockInfo, ledger_info::{LedgerInfo, LedgerInfoWithSignatures}, validator_verifier::ValidatorVerifier, }; +use consensus_types::{ + common::Author, executed_block::ExecutedBlock, experimental::commit_vote::CommitVote, +}; use crate::{experimental::hashable::Hashable, state_replication::StateComputerCommitCallBackType}; -use diem_crypto::HashValue; +use aptos_crypto::HashValue; fn generate_commit_proof( commit_info: &BlockInfo, diff --git a/consensus/src/experimental/buffer_manager.rs b/consensus/src/experimental/buffer_manager.rs index 5e0f11866700b..4293bb49a0ddc 100644 --- a/consensus/src/experimental/buffer_manager.rs +++ b/consensus/src/experimental/buffer_manager.rs @@ -12,12 +12,12 @@ use futures::{ }; use tokio::time::Duration; -use consensus_types::{common::Author, executed_block::ExecutedBlock}; -use diem_logger::prelude::*; -use diem_types::{ +use aptos_logger::prelude::*; +use aptos_types::{ account_address::AccountAddress, ledger_info::LedgerInfoWithSignatures, validator_verifier::ValidatorVerifier, }; +use consensus_types::{common::Author, executed_block::ExecutedBlock}; use crate::{ experimental::{ @@ -32,8 +32,8 @@ use crate::{ round_manager::VerifiedEvent, state_replication::StateComputerCommitCallBackType, }; -use diem_crypto::HashValue; -use diem_types::epoch_change::EpochChangeProof; +use aptos_crypto::HashValue; +use aptos_types::epoch_change::EpochChangeProof; use futures::channel::mpsc::unbounded; pub const BUFFER_MANAGER_RETRY_INTERVAL: u64 = 1000; @@ -80,7 +80,7 @@ pub struct BufferManager { signing_phase_rx: Receiver, commit_msg_tx: NetworkSender, - commit_msg_rx: channel::diem_channel::Receiver, + commit_msg_rx: channel::aptos_channel::Receiver, // we don't hear back from the persisting phase persisting_phase_tx: Sender, @@ -100,7 +100,7 @@ impl BufferManager { signing_phase_tx: Sender, signing_phase_rx: Receiver, commit_msg_tx: NetworkSender, - commit_msg_rx: channel::diem_channel::Receiver, + commit_msg_rx: channel::aptos_channel::Receiver, persisting_phase_tx: Sender, block_rx: UnboundedReceiver, reset_rx: UnboundedReceiver, diff --git a/consensus/src/experimental/decoupled_execution_utils.rs b/consensus/src/experimental/decoupled_execution_utils.rs index 8c7886ca98e2b..6fadd6d0ae5ec 100644 --- a/consensus/src/experimental/decoupled_execution_utils.rs +++ b/consensus/src/experimental/decoupled_execution_utils.rs @@ -14,10 +14,10 @@ use crate::{ round_manager::VerifiedEvent, state_replication::StateComputer, }; -use channel::diem_channel::Receiver; +use aptos_infallible::Mutex; +use aptos_types::{account_address::AccountAddress, validator_verifier::ValidatorVerifier}; +use channel::aptos_channel::Receiver; use consensus_types::common::Author; -use diem_infallible::Mutex; -use diem_types::{account_address::AccountAddress, validator_verifier::ValidatorVerifier}; use futures::channel::mpsc::UnboundedReceiver; use std::sync::Arc; diff --git a/consensus/src/experimental/errors.rs b/consensus/src/experimental/errors.rs index 387904b34454d..95c7157828f62 100644 --- a/consensus/src/experimental/errors.rs +++ b/consensus/src/experimental/errors.rs @@ -1,7 +1,7 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_types::block_info::BlockInfo; +use aptos_types::block_info::BlockInfo; use serde::{Deserialize, Serialize}; use thiserror::Error; diff --git a/consensus/src/experimental/execution_phase.rs b/consensus/src/experimental/execution_phase.rs index 3b13a2d7ad751..83a76550bdee1 100644 --- a/consensus/src/experimental/execution_phase.rs +++ b/consensus/src/experimental/execution_phase.rs @@ -3,9 +3,9 @@ use crate::{experimental::pipeline_phase::StatelessPipeline, state_replication::StateComputer}; use anyhow::Result; +use aptos_crypto::HashValue; use async_trait::async_trait; use consensus_types::executed_block::ExecutedBlock; -use diem_crypto::HashValue; use executor_types::Error as ExecutionError; use std::{ fmt::{Debug, Display, Formatter}, diff --git a/consensus/src/experimental/hashable.rs b/consensus/src/experimental/hashable.rs index 67516101ee90b..f08f132b48622 100644 --- a/consensus/src/experimental/hashable.rs +++ b/consensus/src/experimental/hashable.rs @@ -1,7 +1,7 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_crypto::HashValue; +use aptos_crypto::HashValue; pub trait Hashable { fn hash(&self) -> HashValue; diff --git a/consensus/src/experimental/linkedlist.rs b/consensus/src/experimental/linkedlist.rs index 1927d8f8a2112..0a14edba86bad 100644 --- a/consensus/src/experimental/linkedlist.rs +++ b/consensus/src/experimental/linkedlist.rs @@ -8,7 +8,7 @@ use std::{ cell::{Ref, RefCell, RefMut}, rc::Rc, }; -use diem_infallible::{Mutex, MutexGuard}; +use aptos_infallible::{Mutex, MutexGuard}; pub struct List { pub head: Link, diff --git a/consensus/src/experimental/ordering_state_computer.rs b/consensus/src/experimental/ordering_state_computer.rs index 8ba0c3bbae76a..03bdd3841e3ea 100644 --- a/consensus/src/experimental/ordering_state_computer.rs +++ b/consensus/src/experimental/ordering_state_computer.rs @@ -10,10 +10,10 @@ use crate::{ state_replication::{StateComputer, StateComputerCommitCallBackType}, }; use anyhow::Result; +use aptos_crypto::HashValue; +use aptos_logger::prelude::*; +use aptos_types::ledger_info::LedgerInfoWithSignatures; use consensus_types::{block::Block, executed_block::ExecutedBlock}; -use diem_crypto::HashValue; -use diem_logger::prelude::*; -use diem_types::ledger_info::LedgerInfoWithSignatures; use executor_types::{Error as ExecutionError, StateComputeResult}; use fail::fail_point; use futures::{ diff --git a/consensus/src/experimental/persisting_phase.rs b/consensus/src/experimental/persisting_phase.rs index 524d34da4d6df..f5dbf8b970c87 100644 --- a/consensus/src/experimental/persisting_phase.rs +++ b/consensus/src/experimental/persisting_phase.rs @@ -10,9 +10,9 @@ use crate::{ experimental::pipeline_phase::StatelessPipeline, state_replication::{StateComputer, StateComputerCommitCallBackType}, }; +use aptos_types::ledger_info::LedgerInfoWithSignatures; use async_trait::async_trait; use consensus_types::executed_block::ExecutedBlock; -use diem_types::ledger_info::LedgerInfoWithSignatures; use executor_types::Error; /// [ This class is used when consensus.decoupled = true ] diff --git a/consensus/src/experimental/signing_phase.rs b/consensus/src/experimental/signing_phase.rs index 899e65b764451..bcd93ed9f64f7 100644 --- a/consensus/src/experimental/signing_phase.rs +++ b/consensus/src/experimental/signing_phase.rs @@ -10,10 +10,10 @@ use std::{ use crate::{ experimental::pipeline_phase::StatelessPipeline, metrics_safety_rules::MetricsSafetyRules, }; +use aptos_crypto::ed25519::Ed25519Signature; +use aptos_infallible::Mutex; +use aptos_types::ledger_info::{LedgerInfo, LedgerInfoWithSignatures}; use async_trait::async_trait; -use diem_crypto::ed25519::Ed25519Signature; -use diem_infallible::Mutex; -use diem_types::ledger_info::{LedgerInfo, LedgerInfoWithSignatures}; use safety_rules::Error; /// [ This class is used when consensus.decoupled = true ] diff --git a/consensus/src/experimental/tests/buffer_manager_tests.rs b/consensus/src/experimental/tests/buffer_manager_tests.rs index f6f9a1cb176ed..d3f4f9ccaa2fa 100644 --- a/consensus/src/experimental/tests/buffer_manager_tests.rs +++ b/consensus/src/experimental/tests/buffer_manager_tests.rs @@ -23,23 +23,23 @@ use crate::{ RandomComputeResultStateComputer, }, }; -use channel::{diem_channel, message_queues::QueueStyle}; -use consensus_types::{ - block::block_test_utils::certificate_for_genesis, executed_block::ExecutedBlock, - vote_proposal::MaybeSignedVoteProposal, -}; -use diem_crypto::{ +use aptos_crypto::{ ed25519::Ed25519PrivateKey, hash::ACCUMULATOR_PLACEHOLDER_HASH, HashValue, Uniform, }; -use diem_infallible::Mutex; -use diem_secure_storage::Storage; -use diem_types::{ +use aptos_infallible::Mutex; +use aptos_secure_storage::Storage; +use aptos_types::{ account_address::AccountAddress, ledger_info::LedgerInfo, validator_signer::ValidatorSigner, validator_verifier::{random_validator_verifier, ValidatorVerifier}, waypoint::Waypoint, }; +use channel::{aptos_channel, message_queues::QueueStyle}; +use consensus_types::{ + block::block_test_utils::certificate_for_genesis, executed_block::ExecutedBlock, + vote_proposal::MaybeSignedVoteProposal, +}; use futures::{channel::oneshot, FutureExt, SinkExt, StreamExt}; use itertools::enumerate; use network::{ @@ -54,7 +54,7 @@ pub fn prepare_buffer_manager() -> ( BufferManager, Sender, Sender, - diem_channel::Sender, + aptos_channel::Sender, channel::Receiver>, PipelinePhase, PipelinePhase, @@ -76,7 +76,7 @@ pub fn prepare_buffer_manager() -> ( Waypoint::new_epoch_boundary(&LedgerInfo::mock_genesis(Some(validator_set))).unwrap(); let safety_storage = PersistentSafetyStorage::initialize( - Storage::from(diem_secure_storage::InMemoryStorage::new()), + Storage::from(aptos_secure_storage::InMemoryStorage::new()), signer.author(), signer.private_key().clone(), Ed25519PrivateKey::generate_for_testing(), @@ -90,8 +90,8 @@ pub fn prepare_buffer_manager() -> ( let mut safety_rules = MetricsSafetyRules::new(safety_rules_manager.client(), storage); safety_rules.perform_initialize().unwrap(); - let (network_reqs_tx, _network_reqs_rx) = diem_channel::new(QueueStyle::FIFO, 8, None); - let (connection_reqs_tx, _) = diem_channel::new(QueueStyle::FIFO, 8, None); + let (network_reqs_tx, _network_reqs_rx) = aptos_channel::new(QueueStyle::FIFO, 8, None); + let (connection_reqs_tx, _) = aptos_channel::new(QueueStyle::FIFO, 8, None); let network_sender = ConsensusNetworkSender::new( PeerManagerRequestSender::new(network_reqs_tx), @@ -102,7 +102,7 @@ pub fn prepare_buffer_manager() -> ( let network = NetworkSender::new(author, network_sender, self_loop_tx, validators.clone()); let (msg_tx, msg_rx) = - diem_channel::new::(QueueStyle::FIFO, channel_size, None); + aptos_channel::new::(QueueStyle::FIFO, channel_size, None); let (result_tx, result_rx) = create_channel::(); let (reset_tx, _) = create_channel::(); @@ -155,7 +155,7 @@ pub fn prepare_buffer_manager() -> ( pub fn launch_buffer_manager() -> ( Sender, Sender, - diem_channel::Sender, + aptos_channel::Sender, channel::Receiver>, HashValue, Runtime, @@ -200,7 +200,7 @@ pub fn launch_buffer_manager() -> ( async fn loopback_commit_vote( self_loop_rx: &mut channel::Receiver>, - msg_tx: &diem_channel::Sender, + msg_tx: &aptos_channel::Sender, verifier: &ValidatorVerifier, ) { match self_loop_rx.next().await { diff --git a/consensus/src/experimental/tests/execution_phase_tests.rs b/consensus/src/experimental/tests/execution_phase_tests.rs index 41b0ac1314bc8..7e9eaf409747c 100644 --- a/consensus/src/experimental/tests/execution_phase_tests.rs +++ b/consensus/src/experimental/tests/execution_phase_tests.rs @@ -3,13 +3,13 @@ use std::sync::Arc; +use aptos_crypto::HashValue; +use aptos_types::{ledger_info::LedgerInfo, validator_verifier::random_validator_verifier}; use consensus_types::{ block::{block_test_utils::certificate_for_genesis, Block}, executed_block::ExecutedBlock, quorum_cert::QuorumCert, }; -use diem_crypto::HashValue; -use diem_types::{ledger_info::LedgerInfo, validator_verifier::random_validator_verifier}; use executor_types::{Error, StateComputeResult}; use crate::{ diff --git a/consensus/src/experimental/tests/signing_phase_tests.rs b/consensus/src/experimental/tests/signing_phase_tests.rs index cdb26ce367595..60376e44b5524 100644 --- a/consensus/src/experimental/tests/signing_phase_tests.rs +++ b/consensus/src/experimental/tests/signing_phase_tests.rs @@ -16,8 +16,8 @@ use crate::{ }, test_utils::consensus_runtime, }; -use diem_crypto::HashValue; -use diem_types::{ +use aptos_crypto::HashValue; +use aptos_types::{ block_info::BlockInfo, ledger_info::{LedgerInfo, LedgerInfoWithSignatures}, validator_signer::ValidatorSigner, diff --git a/consensus/src/experimental/tests/test_utils.rs b/consensus/src/experimental/tests/test_utils.rs index a5c96da0a18fb..f39703ec61d7c 100644 --- a/consensus/src/experimental/tests/test_utils.rs +++ b/consensus/src/experimental/tests/test_utils.rs @@ -2,24 +2,24 @@ // SPDX-License-Identifier: Apache-2.0 use crate::{metrics_safety_rules::MetricsSafetyRules, test_utils::MockStorage}; -use consensus_types::{ - block::block_test_utils::certificate_for_genesis, common::Round, executed_block::ExecutedBlock, - quorum_cert::QuorumCert, vote_proposal::MaybeSignedVoteProposal, -}; -use diem_crypto::{ +use aptos_crypto::{ ed25519::{Ed25519PrivateKey, Ed25519Signature}, hash::ACCUMULATOR_PLACEHOLDER_HASH, HashValue, Uniform, }; -use diem_infallible::Mutex; -use diem_secure_storage::Storage; -use diem_types::{ +use aptos_infallible::Mutex; +use aptos_secure_storage::Storage; +use aptos_types::{ account_address::AccountAddress, ledger_info::{LedgerInfo, LedgerInfoWithSignatures}, validator_signer::ValidatorSigner, validator_verifier::random_validator_verifier, waypoint::Waypoint, }; +use consensus_types::{ + block::block_test_utils::certificate_for_genesis, common::Round, executed_block::ExecutedBlock, + quorum_cert::QuorumCert, vote_proposal::MaybeSignedVoteProposal, +}; use executor_types::StateComputeResult; use safety_rules::{ test_utils::{make_proposal_with_parent, make_proposal_with_qc}, @@ -39,7 +39,7 @@ pub fn prepare_safety_rules() -> (Arc>, Vec) -> u64 { // state = SHA-3-256(state) - *state = diem_crypto::HashValue::sha3_256_of(state).to_vec(); + *state = aptos_crypto::HashValue::sha3_256_of(state).to_vec(); let mut temp = [0u8; 8]; copy_slice_to_vec(&state[..8], &mut temp).expect("next failed"); // return state[0..8] diff --git a/consensus/src/liveness/rotating_proposer_test.rs b/consensus/src/liveness/rotating_proposer_test.rs index ea8ad6606486b..5a17a2758d130 100644 --- a/consensus/src/liveness/rotating_proposer_test.rs +++ b/consensus/src/liveness/rotating_proposer_test.rs @@ -4,8 +4,8 @@ use crate::liveness::{ proposer_election::ProposerElection, rotating_proposer_election::RotatingProposer, }; +use aptos_types::validator_signer::ValidatorSigner; use consensus_types::block::{block_test_utils::certificate_for_genesis, Block}; -use diem_types::validator_signer::ValidatorSigner; #[test] fn test_rotating_proposer() { diff --git a/consensus/src/liveness/round_proposer_test.rs b/consensus/src/liveness/round_proposer_test.rs index 4045d6d5db304..f1c25644682ac 100644 --- a/consensus/src/liveness/round_proposer_test.rs +++ b/consensus/src/liveness/round_proposer_test.rs @@ -4,8 +4,8 @@ use crate::liveness::{ proposer_election::ProposerElection, round_proposer_election::RoundProposer, }; +use aptos_types::validator_signer::ValidatorSigner; use consensus_types::block::{block_test_utils::certificate_for_genesis, Block}; -use diem_types::validator_signer::ValidatorSigner; use consensus_types::common::{Author, Round}; use std::collections::HashMap; diff --git a/consensus/src/liveness/round_state.rs b/consensus/src/liveness/round_state.rs index 02892f8140ec0..5c33cd2fdd46f 100644 --- a/consensus/src/liveness/round_state.rs +++ b/consensus/src/liveness/round_state.rs @@ -6,9 +6,9 @@ use crate::{ pending_votes::{PendingVotes, VoteReceptionResult}, util::time_service::{SendTask, TimeService}, }; +use aptos_logger::{prelude::*, Schema}; +use aptos_types::validator_verifier::ValidatorVerifier; use consensus_types::{common::Round, sync_info::SyncInfo, vote::Vote}; -use diem_logger::{prelude::*, Schema}; -use diem_types::validator_verifier::ValidatorVerifier; use futures::future::AbortHandle; use serde::Serialize; use std::{fmt, sync::Arc, time::Duration}; diff --git a/consensus/src/liveness/round_state_test.rs b/consensus/src/liveness/round_state_test.rs index 11789b9bcd207..51a2ada79228a 100644 --- a/consensus/src/liveness/round_state_test.rs +++ b/consensus/src/liveness/round_state_test.rs @@ -8,15 +8,15 @@ use crate::{ util::mock_time_service::SimulatedTimeService, }; +use aptos_crypto::HashValue; +use aptos_types::{ + block_info::BlockInfo, + ledger_info::{LedgerInfo, LedgerInfoWithSignatures}, +}; use consensus_types::{ common::Round, quorum_cert::QuorumCert, sync_info::SyncInfo, timeout::Timeout, timeout_certificate::TimeoutCertificate, vote_data::VoteData, }; -use diem_crypto::HashValue; -use diem_types::{ - block_info::BlockInfo, - ledger_info::{LedgerInfo, LedgerInfoWithSignatures}, -}; use futures::StreamExt; use std::{collections::BTreeMap, sync::Arc, time::Duration}; diff --git a/consensus/src/logging.rs b/consensus/src/logging.rs index 3f5a98cb723f7..747629cad13b2 100644 --- a/consensus/src/logging.rs +++ b/consensus/src/logging.rs @@ -1,9 +1,9 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 +use aptos_logger::Schema; +use aptos_types::block_info::Round; use consensus_types::common::Author; -use diem_logger::Schema; -use diem_types::block_info::Round; use serde::Serialize; #[derive(Schema)] diff --git a/consensus/src/metrics_safety_rules.rs b/consensus/src/metrics_safety_rules.rs index 0de1a0085782f..fc07828763658 100644 --- a/consensus/src/metrics_safety_rules.rs +++ b/consensus/src/metrics_safety_rules.rs @@ -2,6 +2,13 @@ // SPDX-License-Identifier: Apache-2.0 use crate::persistent_liveness_storage::PersistentLivenessStorage; +use aptos_crypto::ed25519::Ed25519Signature; +use aptos_logger::prelude::info; +use aptos_metrics::monitor; +use aptos_types::{ + epoch_change::EpochChangeProof, + ledger_info::{LedgerInfo, LedgerInfoWithSignatures}, +}; use consensus_types::{ block_data::BlockData, timeout::Timeout, @@ -9,13 +16,6 @@ use consensus_types::{ vote::Vote, vote_proposal::MaybeSignedVoteProposal, }; -use diem_crypto::ed25519::Ed25519Signature; -use diem_logger::prelude::info; -use diem_metrics::monitor; -use diem_types::{ - epoch_change::EpochChangeProof, - ledger_info::{LedgerInfo, LedgerInfoWithSignatures}, -}; use safety_rules::{ConsensusState, Error, TSafetyRules}; use std::sync::Arc; @@ -148,6 +148,11 @@ impl TSafetyRules for MetricsSafetyRules { #[cfg(test)] mod tests { use crate::{metrics_safety_rules::MetricsSafetyRules, test_utils::EmptyStorage}; + use aptos_crypto::ed25519::Ed25519Signature; + use aptos_types::{ + epoch_change::EpochChangeProof, + ledger_info::{LedgerInfo, LedgerInfoWithSignatures}, + }; use claim::{assert_matches, assert_ok}; use consensus_types::{ block_data::BlockData, @@ -156,11 +161,6 @@ mod tests { vote::Vote, vote_proposal::MaybeSignedVoteProposal, }; - use diem_crypto::ed25519::Ed25519Signature; - use diem_types::{ - epoch_change::EpochChangeProof, - ledger_info::{LedgerInfo, LedgerInfoWithSignatures}, - }; use safety_rules::{ConsensusState, Error, TSafetyRules}; pub struct MockSafetyRules { @@ -245,7 +245,7 @@ mod tests { #[test] fn test_perform_initialize_ok() { - ::diem_logger::Logger::init_for_testing(); + ::aptos_logger::Logger::init_for_testing(); let (_, mock_storage) = EmptyStorage::start_for_testing(); let mock_safety_rules = MockSafetyRules::new(0, 10, Ok(())); let mut metric_safety_rules = @@ -255,7 +255,7 @@ mod tests { #[test] fn test_perform_initialize_error() { - ::diem_logger::Logger::init_for_testing(); + ::aptos_logger::Logger::init_for_testing(); let (_, mock_storage) = EmptyStorage::start_for_testing(); let mock_safety_rules = MockSafetyRules::new( 0, diff --git a/consensus/src/network.rs b/consensus/src/network.rs index a7f91284b25f7..ef5157992d0f8 100644 --- a/consensus/src/network.rs +++ b/consensus/src/network.rs @@ -7,8 +7,14 @@ use crate::{ network_interface::{ConsensusMsg, ConsensusNetworkEvents, ConsensusNetworkSender}, }; use anyhow::{anyhow, ensure}; +use aptos_logger::prelude::*; +use aptos_metrics::monitor; +use aptos_types::{ + account_address::AccountAddress, epoch_change::EpochChangeProof, + ledger_info::LedgerInfoWithSignatures, validator_verifier::ValidatorVerifier, +}; use bytes::Bytes; -use channel::{self, diem_channel, message_queues::QueueStyle}; +use channel::{self, aptos_channel, message_queues::QueueStyle}; use consensus_types::{ block_retrieval::{BlockRetrievalRequest, BlockRetrievalResponse, MAX_BLOCKS_PER_REQUEST}, common::Author, @@ -16,12 +22,6 @@ use consensus_types::{ sync_info::SyncInfo, vote_msg::VoteMsg, }; -use diem_logger::prelude::*; -use diem_metrics::monitor; -use diem_types::{ - account_address::AccountAddress, epoch_change::EpochChangeProof, - ledger_info::LedgerInfoWithSignatures, validator_verifier::ValidatorVerifier, -}; use futures::{channel::oneshot, stream::select, SinkExt, Stream, StreamExt}; use network::{ protocols::{ @@ -48,11 +48,11 @@ pub struct IncomingBlockRetrievalRequest { /// Will be returned by the NetworkTask upon startup. pub struct NetworkReceivers { /// Provide a LIFO buffer for each (Author, MessageType) key - pub consensus_messages: diem_channel::Receiver< + pub consensus_messages: aptos_channel::Receiver< (AccountAddress, Discriminant), (AccountAddress, ConsensusMsg), >, - pub block_retrieval: diem_channel::Receiver, + pub block_retrieval: aptos_channel::Receiver, } /// Implements the actual networking support for all consensus messaging. @@ -197,11 +197,11 @@ impl NetworkSender { } pub struct NetworkTask { - consensus_messages_tx: diem_channel::Sender< + consensus_messages_tx: aptos_channel::Sender< (AccountAddress, Discriminant), (AccountAddress, ConsensusMsg), >, - block_retrieval_tx: diem_channel::Sender, + block_retrieval_tx: aptos_channel::Sender, all_events: Box> + Send + Unpin>, } @@ -212,8 +212,8 @@ impl NetworkTask { self_receiver: channel::Receiver>, ) -> (NetworkTask, NetworkReceivers) { let (consensus_messages_tx, consensus_messages) = - diem_channel::new(QueueStyle::LIFO, 1, Some(&counters::CONSENSUS_CHANNEL_MSGS)); - let (block_retrieval_tx, block_retrieval) = diem_channel::new( + aptos_channel::new(QueueStyle::LIFO, 1, Some(&counters::CONSENSUS_CHANNEL_MSGS)); + let (block_retrieval_tx, block_retrieval) = aptos_channel::new( QueueStyle::LIFO, 1, Some(&counters::BLOCK_RETRIEVAL_CHANNEL_MSGS), diff --git a/consensus/src/network_interface.rs b/consensus/src/network_interface.rs index 386237c83f635..b2eed31344d19 100644 --- a/consensus/src/network_interface.rs +++ b/consensus/src/network_interface.rs @@ -5,8 +5,11 @@ use crate::counters; use anyhow::anyhow; +use aptos_config::network_id::{NetworkId, PeerNetworkId}; +use aptos_logger::prelude::*; +use aptos_types::{epoch_change::EpochChangeProof, PeerId}; use async_trait::async_trait; -use channel::{diem_channel, message_queues::QueueStyle}; +use channel::{aptos_channel, message_queues::QueueStyle}; use consensus_types::{ block_retrieval::{BlockRetrievalRequest, BlockRetrievalResponse}, epoch_retrieval::EpochRetrievalRequest, @@ -15,9 +18,6 @@ use consensus_types::{ sync_info::SyncInfo, vote_msg::VoteMsg, }; -use diem_config::network_id::{NetworkId, PeerNetworkId}; -use diem_logger::prelude::*; -use diem_types::{epoch_change::EpochChangeProof, PeerId}; use network::{ application::storage::PeerMetadataStorage, constants::NETWORK_CHANNEL_SIZE, @@ -100,7 +100,7 @@ pub fn network_endpoint_config() -> AppConfig { let protos = RPC.iter().chain(DIRECT_SEND.iter()).copied(); AppConfig::p2p( protos, - diem_channel::Config::new(NETWORK_CHANNEL_SIZE) + aptos_channel::Config::new(NETWORK_CHANNEL_SIZE) .queue_style(QueueStyle::LIFO) .counters(&counters::PENDING_CONSENSUS_NETWORK_EVENTS), ) diff --git a/consensus/src/network_tests.rs b/consensus/src/network_tests.rs index 6fc1e351f4d9b..83b3fff311762 100644 --- a/consensus/src/network_tests.rs +++ b/consensus/src/network_tests.rs @@ -6,7 +6,10 @@ use crate::{ network_interface::{ConsensusMsg, ConsensusNetworkEvents, ConsensusNetworkSender}, test_utils::{self, consensus_runtime, placeholder_ledger_info, timed_block_on}, }; -use channel::{self, diem_channel, message_queues::QueueStyle}; +use aptos_config::network_id::NetworkId; +use aptos_infallible::{Mutex, RwLock}; +use aptos_types::{block_info::BlockInfo, PeerId}; +use channel::{self, aptos_channel, message_queues::QueueStyle}; use consensus_types::{ block::{block_test_utils::certificate_for_genesis, Block}, common::Author, @@ -16,9 +19,6 @@ use consensus_types::{ vote_data::VoteData, vote_msg::VoteMsg, }; -use diem_config::network_id::NetworkId; -use diem_infallible::{Mutex, RwLock}; -use diem_types::{block_info::BlockInfo, PeerId}; use futures::{channel::mpsc, SinkExt, StreamExt}; use network::{ application::storage::PeerMetadataStorage, @@ -65,7 +65,9 @@ pub struct NetworkPlayground { /// `ConsensusNetworkImpl`. /// node_consensus_txs: Arc< - Mutex>>, + Mutex< + HashMap>, + >, >, /// Nodes' outbound handlers forward their outbound non-rpc messages to this /// queue. @@ -117,13 +119,13 @@ impl NetworkPlayground { async fn start_node_outbound_handler( drop_config: Arc>, src_twin_id: TwinId, - mut network_reqs_rx: diem_channel::Receiver<(PeerId, ProtocolId), PeerManagerRequest>, + mut network_reqs_rx: aptos_channel::Receiver<(PeerId, ProtocolId), PeerManagerRequest>, mut outbound_msgs_tx: mpsc::Sender<(TwinId, PeerManagerRequest)>, node_consensus_txs: Arc< Mutex< HashMap< TwinId, - diem_channel::Sender<(PeerId, ProtocolId), PeerManagerNotification>, + aptos_channel::Sender<(PeerId, ProtocolId), PeerManagerNotification>, >, >, >, @@ -184,11 +186,11 @@ impl NetworkPlayground { twin_id: TwinId, // The `Sender` of inbound network events. The `Receiver` end of this // queue is usually wrapped in a `ConsensusNetworkEvents` adapter. - consensus_tx: diem_channel::Sender<(PeerId, ProtocolId), PeerManagerNotification>, + consensus_tx: aptos_channel::Sender<(PeerId, ProtocolId), PeerManagerNotification>, // The `Receiver` of outbound network events this node sends. The // `Sender` side of this queue is usually wrapped in a // `ConsensusNetworkSender` adapter. - network_reqs_rx: diem_channel::Receiver<(PeerId, ProtocolId), PeerManagerRequest>, + network_reqs_rx: aptos_channel::Receiver<(PeerId, ProtocolId), PeerManagerRequest>, conn_mgr_reqs_rx: channel::Receiver, ) { self.node_consensus_txs.lock().insert(twin_id, consensus_tx); @@ -477,13 +479,13 @@ impl DropConfigRound { mod tests { use super::*; use crate::network::NetworkTask; + use aptos_config::network_id::NetworkId; + use aptos_crypto::HashValue; + use aptos_types::validator_verifier::random_validator_verifier; use bytes::Bytes; use consensus_types::block_retrieval::{ BlockRetrievalRequest, BlockRetrievalResponse, BlockRetrievalStatus, }; - use diem_config::network_id::NetworkId; - use diem_crypto::HashValue; - use diem_types::validator_verifier::random_validator_verifier; use futures::{channel::oneshot, future}; use network::{ application::storage::PeerMetadataStorage, protocols::direct_send::Message, @@ -560,9 +562,9 @@ mod tests { let peer_metadata_storage = PeerMetadataStorage::new(&[NetworkId::Validator]); for (peer_id, peer) in peers.iter().enumerate() { - let (network_reqs_tx, network_reqs_rx) = diem_channel::new(QueueStyle::FIFO, 8, None); - let (connection_reqs_tx, _) = diem_channel::new(QueueStyle::FIFO, 8, None); - let (consensus_tx, consensus_rx) = diem_channel::new(QueueStyle::FIFO, 8, None); + let (network_reqs_tx, network_reqs_rx) = aptos_channel::new(QueueStyle::FIFO, 8, None); + let (connection_reqs_tx, _) = aptos_channel::new(QueueStyle::FIFO, 8, None); + let (consensus_tx, consensus_rx) = aptos_channel::new(QueueStyle::FIFO, 8, None); let (_conn_mgr_reqs_tx, conn_mgr_reqs_rx) = channel::new_test(8); let (_, conn_status_rx) = conn_notifs_channel::new(); add_peer_to_storage( @@ -657,9 +659,9 @@ mod tests { let peer_metadata_storage = PeerMetadataStorage::new(&[NetworkId::Validator]); for (peer_id, peer) in peers.iter().enumerate() { - let (network_reqs_tx, network_reqs_rx) = diem_channel::new(QueueStyle::FIFO, 8, None); - let (connection_reqs_tx, _) = diem_channel::new(QueueStyle::FIFO, 8, None); - let (consensus_tx, consensus_rx) = diem_channel::new(QueueStyle::FIFO, 8, None); + let (network_reqs_tx, network_reqs_rx) = aptos_channel::new(QueueStyle::FIFO, 8, None); + let (connection_reqs_tx, _) = aptos_channel::new(QueueStyle::FIFO, 8, None); + let (consensus_tx, consensus_rx) = aptos_channel::new(QueueStyle::FIFO, 8, None); let (_conn_mgr_reqs_tx, conn_mgr_reqs_rx) = channel::new_test(8); let (_, conn_status_rx) = conn_notifs_channel::new(); let mut network_sender = ConsensusNetworkSender::new( @@ -748,9 +750,10 @@ mod tests { #[test] fn test_bad_message() { - let (peer_mgr_notifs_tx, peer_mgr_notifs_rx) = diem_channel::new(QueueStyle::FIFO, 8, None); + let (peer_mgr_notifs_tx, peer_mgr_notifs_rx) = + aptos_channel::new(QueueStyle::FIFO, 8, None); let (connection_notifs_tx, connection_notifs_rx) = - diem_channel::new(QueueStyle::FIFO, 8, None); + aptos_channel::new(QueueStyle::FIFO, 8, None); let consensus_network_events = ConsensusNetworkEvents::new(peer_mgr_notifs_rx, connection_notifs_rx); let (self_sender, self_receiver) = channel::new_test(8); diff --git a/consensus/src/pending_votes.rs b/consensus/src/pending_votes.rs index 16e6dd4e0c4a1..e8841285b11fe 100644 --- a/consensus/src/pending_votes.rs +++ b/consensus/src/pending_votes.rs @@ -7,16 +7,16 @@ //! when enough votes (or timeout votes) have been observed. //! Votes are automatically dropped when the structure goes out of scope. +use aptos_crypto::{hash::CryptoHash, HashValue}; +use aptos_logger::prelude::*; +use aptos_types::{ + ledger_info::LedgerInfoWithSignatures, + validator_verifier::{ValidatorVerifier, VerifyError}, +}; use consensus_types::{ common::Author, quorum_cert::QuorumCert, timeout_2chain::TwoChainTimeoutCertificate, timeout_certificate::TimeoutCertificate, vote::Vote, }; -use diem_crypto::{hash::CryptoHash, HashValue}; -use diem_logger::prelude::*; -use diem_types::{ - ledger_info::LedgerInfoWithSignatures, - validator_verifier::{ValidatorVerifier, VerifyError}, -}; use std::{ collections::{BTreeMap, HashMap}, fmt, @@ -262,14 +262,14 @@ impl fmt::Display for PendingVotes { #[cfg(test)] mod tests { use super::{PendingVotes, VoteReceptionResult}; - use consensus_types::{ - block::block_test_utils::certificate_for_genesis, vote::Vote, vote_data::VoteData, - }; - use diem_crypto::HashValue; - use diem_types::{ + use aptos_crypto::HashValue; + use aptos_types::{ block_info::BlockInfo, ledger_info::LedgerInfo, validator_verifier::random_validator_verifier, }; + use consensus_types::{ + block::block_test_utils::certificate_for_genesis, vote::Vote, vote_data::VoteData, + }; /// Creates a random ledger info for epoch 1 and round 1. fn random_ledger_info() -> LedgerInfo { @@ -288,7 +288,7 @@ mod tests { #[test] /// Verify that votes are properly aggregated to QC based on their LedgerInfo digest fn test_qc_aggregation() { - ::diem_logger::Logger::init_for_testing(); + ::aptos_logger::Logger::init_for_testing(); // set up 4 validators let (signers, validator) = random_validator_verifier(4, Some(2), false); @@ -354,7 +354,7 @@ mod tests { #[test] /// Verify that votes are properly aggregated to TC based on their rounds fn test_tc_aggregation() { - ::diem_logger::Logger::init_for_testing(); + ::aptos_logger::Logger::init_for_testing(); // set up 4 validators let (signers, validator) = random_validator_verifier(4, Some(2), false); @@ -405,7 +405,7 @@ mod tests { #[test] fn test_2chain_tc_aggregation() { - ::diem_logger::Logger::init_for_testing(); + ::aptos_logger::Logger::init_for_testing(); // set up 4 validators let (signers, validator) = random_validator_verifier(4, Some(2), false); diff --git a/consensus/src/persistent_liveness_storage.rs b/consensus/src/persistent_liveness_storage.rs index c026c4782ddd9..b1196e4a5cfc5 100644 --- a/consensus/src/persistent_liveness_storage.rs +++ b/consensus/src/persistent_liveness_storage.rs @@ -3,19 +3,19 @@ use crate::{consensusdb::ConsensusDB, epoch_manager::LivenessStorageData, error::DbError}; use anyhow::{format_err, Context, Result}; +use aptos_config::config::NodeConfig; +use aptos_crypto::{ed25519::Ed25519Signature, HashValue}; +use aptos_logger::prelude::*; +use aptos_types::{ + epoch_change::EpochChangeProof, + ledger_info::{LedgerInfo, LedgerInfoWithSignatures}, + transaction::Version, +}; use consensus_types::{ block::Block, common::Author, quorum_cert::QuorumCert, timeout_2chain::TwoChainTimeoutCertificate, timeout_certificate::TimeoutCertificate, vote::Vote, vote_data::VoteData, }; -use diem_config::config::NodeConfig; -use diem_crypto::{ed25519::Ed25519Signature, HashValue}; -use diem_logger::prelude::*; -use diem_types::{ - epoch_change::EpochChangeProof, - ledger_info::{LedgerInfo, LedgerInfoWithSignatures}, - transaction::Version, -}; use executor::components::apply_chunk_output::IntoLedgerView; use serde::Deserialize; use std::{cmp::max, collections::HashSet, sync::Arc}; @@ -57,7 +57,7 @@ pub trait PersistentLivenessStorage: Send + Sync { /// ValidatorVerifier. fn retrieve_epoch_change_proof(&self, version: u64) -> Result; - /// Returns a handle of the diemdb. + /// Returns a handle of the aptosdb. fn diem_db(&self) -> Arc; } @@ -166,7 +166,7 @@ impl RootMetadata { #[cfg(any(test, feature = "fuzzing"))] pub fn new_empty() -> Self { - Self::new(0, *diem_crypto::hash::ACCUMULATOR_PLACEHOLDER_HASH, vec![]) + Self::new(0, *aptos_crypto::hash::ACCUMULATOR_PLACEHOLDER_HASH, vec![]) } } diff --git a/consensus/src/round_manager.rs b/consensus/src/round_manager.rs index 28e1f192b800a..9341358abe44f 100644 --- a/consensus/src/round_manager.rs +++ b/consensus/src/round_manager.rs @@ -21,7 +21,14 @@ use crate::{ persistent_liveness_storage::PersistentLivenessStorage, }; use anyhow::{bail, ensure, Context, Result}; -use channel::diem_channel; +use aptos_infallible::{checked, Mutex}; +use aptos_logger::prelude::*; +use aptos_metrics::monitor; +use aptos_types::{ + epoch_state::EpochState, on_chain_config::OnChainConsensusConfig, + validator_verifier::ValidatorVerifier, +}; +use channel::aptos_channel; use consensus_types::{ block::Block, block_retrieval::{BlockRetrievalResponse, BlockRetrievalStatus}, @@ -35,13 +42,6 @@ use consensus_types::{ vote::Vote, vote_msg::VoteMsg, }; -use diem_infallible::{checked, Mutex}; -use diem_logger::prelude::*; -use diem_metrics::monitor; -use diem_types::{ - epoch_state::EpochState, on_chain_config::OnChainConsensusConfig, - validator_verifier::ValidatorVerifier, -}; use fail::fail_point; use futures::{channel::oneshot, FutureExt, StreamExt}; #[cfg(test)] @@ -829,7 +829,7 @@ impl RoundManager { /// Mainloop of processing messages. pub async fn start( mut self, - mut event_rx: diem_channel::Receiver< + mut event_rx: aptos_channel::Receiver< (Author, Discriminant), (Author, VerifiedEvent), >, diff --git a/consensus/src/round_manager_fuzzing.rs b/consensus/src/round_manager_fuzzing.rs index f71f683a0951c..aa8c6a8a42529 100644 --- a/consensus/src/round_manager_fuzzing.rs +++ b/consensus/src/round_manager_fuzzing.rs @@ -16,10 +16,8 @@ use crate::{ test_utils::{EmptyStateComputer, MockStorage, MockTransactionManager}, util::{mock_time_service::SimulatedTimeService, time_service::TimeService}, }; -use channel::{self, diem_channel, message_queues::QueueStyle}; -use consensus_types::proposal_msg::ProposalMsg; -use diem_infallible::Mutex; -use diem_types::{ +use aptos_infallible::Mutex; +use aptos_types::{ epoch_change::EpochChangeProof, epoch_state::EpochState, ledger_info::{LedgerInfo, LedgerInfoWithSignatures}, @@ -28,6 +26,8 @@ use diem_types::{ validator_signer::ValidatorSigner, validator_verifier::ValidatorVerifier, }; +use channel::{self, aptos_channel, message_queues::QueueStyle}; +use consensus_types::proposal_msg::ProposalMsg; use futures::{channel::mpsc, executor::block_on}; use network::{ peer_manager::{ConnectionRequestSender, PeerManagerRequestSender}, @@ -112,8 +112,8 @@ fn create_node_for_fuzzing() -> RoundManager { safety_rules.initialize(&proof).unwrap(); // TODO: mock channels - let (network_reqs_tx, _network_reqs_rx) = diem_channel::new(QueueStyle::FIFO, 8, None); - let (connection_reqs_tx, _) = diem_channel::new(QueueStyle::FIFO, 8, None); + let (network_reqs_tx, _network_reqs_rx) = aptos_channel::new(QueueStyle::FIFO, 8, None); + let (connection_reqs_tx, _) = aptos_channel::new(QueueStyle::FIFO, 8, None); let network_sender = ConsensusNetworkSender::new( PeerManagerRequestSender::new(network_reqs_tx), ConnectionRequestSender::new(connection_reqs_tx), diff --git a/consensus/src/round_manager_test.rs b/consensus/src/round_manager_test.rs index 35b563b42c0dd..664bf32f4cdf7 100644 --- a/consensus/src/round_manager_test.rs +++ b/consensus/src/round_manager_test.rs @@ -21,7 +21,19 @@ use crate::{ }, util::time_service::{ClockTimeService, TimeService}, }; -use channel::{self, diem_channel, message_queues::QueueStyle}; +use aptos_config::network_id::NetworkId; +use aptos_crypto::{ed25519::Ed25519PrivateKey, HashValue, Uniform}; +use aptos_infallible::Mutex; +use aptos_secure_storage::Storage; +use aptos_types::{ + epoch_state::EpochState, + ledger_info::{LedgerInfo, LedgerInfoWithSignatures}, + on_chain_config::OnChainConsensusConfig, + validator_signer::ValidatorSigner, + validator_verifier::random_validator_verifier, + waypoint::Waypoint, +}; +use channel::{self, aptos_channel, message_queues::QueueStyle}; use consensus_types::{ block::{ block_test_utils::{certificate_for_genesis, gen_test_certificate}, @@ -35,18 +47,6 @@ use consensus_types::{ timeout_certificate::TimeoutCertificate, vote_msg::VoteMsg, }; -use diem_config::network_id::NetworkId; -use diem_crypto::{ed25519::Ed25519PrivateKey, HashValue, Uniform}; -use diem_infallible::Mutex; -use diem_secure_storage::Storage; -use diem_types::{ - epoch_state::EpochState, - ledger_info::{LedgerInfo, LedgerInfoWithSignatures}, - on_chain_config::OnChainConsensusConfig, - validator_signer::ValidatorSigner, - validator_verifier::random_validator_verifier, - waypoint::Waypoint, -}; use futures::{ channel::{mpsc, oneshot}, executor::block_on, @@ -119,7 +119,7 @@ impl NodeSetup { let (initial_data, storage) = MockStorage::start_for_testing((&validators).into()); let safety_storage = PersistentSafetyStorage::initialize( - Storage::from(diem_secure_storage::InMemoryStorage::new()), + Storage::from(aptos_secure_storage::InMemoryStorage::new()), signer.author(), signer.private_key().clone(), Ed25519PrivateKey::generate_for_testing(), @@ -157,9 +157,9 @@ impl NodeSetup { verifier: storage.get_validator_set().into(), }; let validators = epoch_state.verifier.clone(); - let (network_reqs_tx, network_reqs_rx) = diem_channel::new(QueueStyle::FIFO, 8, None); - let (connection_reqs_tx, _) = diem_channel::new(QueueStyle::FIFO, 8, None); - let (consensus_tx, consensus_rx) = diem_channel::new(QueueStyle::FIFO, 8, None); + let (network_reqs_tx, network_reqs_rx) = aptos_channel::new(QueueStyle::FIFO, 8, None); + let (connection_reqs_tx, _) = aptos_channel::new(QueueStyle::FIFO, 8, None); + let (consensus_tx, consensus_rx) = aptos_channel::new(QueueStyle::FIFO, 8, None); let (_conn_mgr_reqs_tx, conn_mgr_reqs_rx) = channel::new_test(8); let (_, conn_status_rx) = conn_notifs_channel::new(); let mut network_sender = ConsensusNetworkSender::new( @@ -890,7 +890,7 @@ fn safety_rules_crash() { fn reset_safety_rules(node: &mut NodeSetup) { let safety_storage = PersistentSafetyStorage::initialize( - Storage::from(diem_secure_storage::InMemoryStorage::new()), + Storage::from(aptos_secure_storage::InMemoryStorage::new()), node.signer.author(), node.signer.private_key().clone(), Ed25519PrivateKey::generate_for_testing(), diff --git a/consensus/src/state_computer.rs b/consensus/src/state_computer.rs index 9f4254f5a3240..6085b9c53ad76 100644 --- a/consensus/src/state_computer.rs +++ b/consensus/src/state_computer.rs @@ -7,14 +7,14 @@ use crate::{ state_replication::{StateComputer, StateComputerCommitCallBackType, TxnManager}, }; use anyhow::Result; -use consensus_notifications::ConsensusNotificationSender; -use consensus_types::{block::Block, executed_block::ExecutedBlock}; -use diem_crypto::HashValue; -use diem_logger::prelude::*; -use diem_metrics::monitor; -use diem_types::{ +use aptos_crypto::HashValue; +use aptos_logger::prelude::*; +use aptos_metrics::monitor; +use aptos_types::{ contract_event::ContractEvent, ledger_info::LedgerInfoWithSignatures, transaction::Transaction, }; +use consensus_notifications::ConsensusNotificationSender; +use consensus_types::{block::Block, executed_block::ExecutedBlock}; use execution_correctness::ExecutionCorrectness; use executor_types::{Error as ExecutionError, StateComputeResult}; use fail::fail_point; diff --git a/consensus/src/state_replication.rs b/consensus/src/state_replication.rs index dae4c1dfa403e..6fb236294b4be 100644 --- a/consensus/src/state_replication.rs +++ b/consensus/src/state_replication.rs @@ -3,9 +3,9 @@ use crate::error::{MempoolError, StateSyncError}; use anyhow::Result; +use aptos_crypto::HashValue; +use aptos_types::ledger_info::LedgerInfoWithSignatures; use consensus_types::{block::Block, common::Payload, executed_block::ExecutedBlock}; -use diem_crypto::HashValue; -use diem_types::ledger_info::LedgerInfoWithSignatures; use executor_types::{Error as ExecutionError, StateComputeResult}; use futures::future::BoxFuture; use std::sync::Arc; diff --git a/consensus/src/test_utils/mock_state_computer.rs b/consensus/src/test_utils/mock_state_computer.rs index 9c6f89c8ab6f4..075e1c8bf8bd0 100644 --- a/consensus/src/test_utils/mock_state_computer.rs +++ b/consensus/src/test_utils/mock_state_computer.rs @@ -7,11 +7,11 @@ use crate::{ test_utils::mock_storage::MockStorage, }; use anyhow::{format_err, Result}; +use aptos_crypto::HashValue; +use aptos_infallible::Mutex; +use aptos_logger::prelude::*; +use aptos_types::ledger_info::LedgerInfoWithSignatures; use consensus_types::{block::Block, common::Payload, executed_block::ExecutedBlock}; -use diem_crypto::HashValue; -use diem_infallible::Mutex; -use diem_logger::prelude::*; -use diem_types::ledger_info::LedgerInfoWithSignatures; use executor_types::{Error, StateComputeResult}; use futures::channel::mpsc; use std::{collections::HashMap, sync::Arc}; diff --git a/consensus/src/test_utils/mock_storage.rs b/consensus/src/test_utils/mock_storage.rs index 6c727776411e4..b46c457825046 100644 --- a/consensus/src/test_utils/mock_storage.rs +++ b/consensus/src/test_utils/mock_storage.rs @@ -8,17 +8,17 @@ use crate::{ }, }; use anyhow::Result; -use consensus_types::{ - block::Block, quorum_cert::QuorumCert, timeout_2chain::TwoChainTimeoutCertificate, - timeout_certificate::TimeoutCertificate, vote::Vote, -}; -use diem_crypto::HashValue; -use diem_infallible::Mutex; -use diem_types::{ +use aptos_crypto::HashValue; +use aptos_infallible::Mutex; +use aptos_types::{ epoch_change::EpochChangeProof, ledger_info::{LedgerInfo, LedgerInfoWithSignatures}, on_chain_config::ValidatorSet, }; +use consensus_types::{ + block::Block, quorum_cert::QuorumCert, timeout_2chain::TwoChainTimeoutCertificate, + timeout_certificate::TimeoutCertificate, vote::Vote, +}; use std::{ collections::{BTreeMap, HashMap}, sync::Arc, diff --git a/consensus/src/test_utils/mock_txn_manager.rs b/consensus/src/test_utils/mock_txn_manager.rs index fd47552dea2ac..c708db6041fbb 100644 --- a/consensus/src/test_utils/mock_txn_manager.rs +++ b/consensus/src/test_utils/mock_txn_manager.rs @@ -3,15 +3,15 @@ use crate::{error::MempoolError, state_replication::TxnManager, txn_manager::MempoolProxy}; use anyhow::Result; +use aptos_mempool::ConsensusRequest; +use aptos_types::{ + transaction::TransactionStatus, + vm_status::{KeptVMStatus, StatusCode}, +}; use consensus_types::{ block::{block_test_utils::random_payload, Block}, common::Payload, }; -use diem_mempool::ConsensusRequest; -use diem_types::{ - transaction::TransactionStatus, - vm_status::{KeptVMStatus, StatusCode}, -}; use executor_types::StateComputeResult; use futures::{channel::mpsc, future::BoxFuture}; use rand::Rng; diff --git a/consensus/src/test_utils/mod.rs b/consensus/src/test_utils/mod.rs index f9de17e792576..80d65ef678765 100644 --- a/consensus/src/test_utils/mod.rs +++ b/consensus/src/test_utils/mod.rs @@ -2,6 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 use crate::block_storage::{BlockReader, BlockStore}; +use aptos_crypto::HashValue; +use aptos_logger::Level; +use aptos_types::{ledger_info::LedgerInfo, validator_signer::ValidatorSigner}; use consensus_types::{ block::{block_test_utils::certificate_for_genesis, Block}, common::Round, @@ -9,9 +12,6 @@ use consensus_types::{ quorum_cert::QuorumCert, sync_info::SyncInfo, }; -use diem_crypto::HashValue; -use diem_logger::Level; -use diem_types::{ledger_info::LedgerInfo, validator_signer::ValidatorSigner}; use std::{future::Future, sync::Arc, time::Duration}; use tokio::{runtime, time::timeout}; @@ -21,8 +21,8 @@ mod mock_storage; mod mock_txn_manager; use crate::util::mock_time_service::SimulatedTimeService; +use aptos_types::block_info::BlockInfo; use consensus_types::{block::block_test_utils::gen_test_certificate, common::Payload}; -use diem_types::block_info::BlockInfo; pub use mock_state_computer::{ EmptyStateComputer, MockStateComputer, RandomComputeResultStateComputer, }; @@ -190,7 +190,7 @@ fn nocapture() -> bool { pub fn consensus_runtime() -> runtime::Runtime { if nocapture() { - ::diem_logger::Logger::new().level(Level::Debug).init(); + ::aptos_logger::Logger::new().level(Level::Debug).init(); } runtime::Builder::new_multi_thread() diff --git a/consensus/src/twins/basic_twins_test.rs b/consensus/src/twins/basic_twins_test.rs index 83ad4a11abbc5..fbe881a8ae6a9 100644 --- a/consensus/src/twins/basic_twins_test.rs +++ b/consensus/src/twins/basic_twins_test.rs @@ -7,8 +7,8 @@ use crate::{ test_utils::{consensus_runtime, timed_block_on}, twins::twins_node::SMRNode, }; +use aptos_config::config::ConsensusProposerType::{FixedProposer, RotatingProposer, RoundProposer}; use consensus_types::{block::Block, common::Round}; -use diem_config::config::ConsensusProposerType::{FixedProposer, RotatingProposer, RoundProposer}; use futures::StreamExt; use std::collections::HashMap; diff --git a/consensus/src/twins/twins_node.rs b/consensus/src/twins/twins_node.rs index 8710443d186fd..91fad6f4465e0 100644 --- a/consensus/src/twins/twins_node.rs +++ b/consensus/src/twins/twins_node.rs @@ -10,9 +10,7 @@ use crate::{ test_utils::{MockStateComputer, MockStorage, MockTransactionManager}, util::time_service::ClockTimeService, }; -use channel::{self, diem_channel, message_queues::QueueStyle}; -use consensus_types::common::{Author, Payload, Round}; -use diem_config::{ +use aptos_config::{ config::{ ConsensusProposerType::{self, RoundProposer}, NodeConfig, WaypointConfig, @@ -20,13 +18,15 @@ use diem_config::{ generator::{self, ValidatorSwarm}, network_id::NetworkId, }; -use diem_mempool::mocks::MockSharedMempool; -use diem_types::{ +use aptos_mempool::mocks::MockSharedMempool; +use aptos_types::{ ledger_info::LedgerInfoWithSignatures, on_chain_config::{OnChainConfig, OnChainConfigPayload, ValidatorSet}, validator_info::ValidatorInfo, waypoint::Waypoint, }; +use channel::{self, aptos_channel, message_queues::QueueStyle}; +use consensus_types::common::{Author, Payload, Round}; use event_notifications::{ReconfigNotification, ReconfigNotificationListener}; use futures::channel::mpsc; use network::{ @@ -62,9 +62,9 @@ impl SMRNode { storage: Arc, twin_id: TwinId, ) -> Self { - let (network_reqs_tx, network_reqs_rx) = diem_channel::new(QueueStyle::FIFO, 8, None); - let (connection_reqs_tx, _) = diem_channel::new(QueueStyle::FIFO, 8, None); - let (consensus_tx, consensus_rx) = diem_channel::new(QueueStyle::FIFO, 8, None); + let (network_reqs_tx, network_reqs_rx) = aptos_channel::new(QueueStyle::FIFO, 8, None); + let (connection_reqs_tx, _) = aptos_channel::new(QueueStyle::FIFO, 8, None); + let (consensus_tx, consensus_rx) = aptos_channel::new(QueueStyle::FIFO, 8, None); let (_conn_mgr_reqs_tx, conn_mgr_reqs_rx) = channel::new_test(8); let (_, conn_notifs_channel) = conn_notifs_channel::new(); let mut network_sender = ConsensusNetworkSender::new( @@ -88,7 +88,7 @@ impl SMRNode { let txn_manager = Arc::new(MockTransactionManager::new(Some( consensus_to_mempool_sender, ))); - let (reconfig_sender, reconfig_events) = diem_channel::new(QueueStyle::LIFO, 1, None); + let (reconfig_sender, reconfig_events) = aptos_channel::new(QueueStyle::LIFO, 1, None); let reconfig_listener = ReconfigNotificationListener { notification_receiver: reconfig_events, }; diff --git a/consensus/src/txn_manager.rs b/consensus/src/txn_manager.rs index 42f12d34f7920..b47af6b995fde 100644 --- a/consensus/src/txn_manager.rs +++ b/consensus/src/txn_manager.rs @@ -3,11 +3,11 @@ use crate::{error::MempoolError, state_replication::TxnManager}; use anyhow::{format_err, Result}; +use aptos_logger::prelude::*; +use aptos_mempool::{ConsensusRequest, ConsensusResponse, TransactionSummary}; +use aptos_metrics::monitor; +use aptos_types::transaction::TransactionStatus; use consensus_types::{block::Block, common::Payload}; -use diem_logger::prelude::*; -use diem_mempool::{ConsensusRequest, ConsensusResponse, TransactionSummary}; -use diem_metrics::monitor; -use diem_types::transaction::TransactionStatus; use executor_types::StateComputeResult; use fail::fail_point; use futures::{ diff --git a/consensus/src/util/mock_time_service.rs b/consensus/src/util/mock_time_service.rs index fdbff8ee4816a..9bdcffd9906e7 100644 --- a/consensus/src/util/mock_time_service.rs +++ b/consensus/src/util/mock_time_service.rs @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 use crate::util::time_service::{ScheduledTask, TimeService}; -use diem_infallible::Mutex; -use diem_logger::prelude::*; +use aptos_infallible::Mutex; +use aptos_logger::prelude::*; use futures::future::AbortHandle; use std::{sync::Arc, time::Duration}; diff --git a/consensus/src/util/time_service.rs b/consensus/src/util/time_service.rs index 69282c831f872..04f0aa64abfbf 100644 --- a/consensus/src/util/time_service.rs +++ b/consensus/src/util/time_service.rs @@ -1,7 +1,7 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_logger::prelude::*; +use aptos_logger::prelude::*; use futures::{ future::{AbortHandle, Abortable}, Future, FutureExt, SinkExt, @@ -123,7 +123,7 @@ impl TimeService for ClockTimeService { } fn get_current_timestamp(&self) -> Duration { - diem_infallible::duration_since_epoch() + aptos_infallible::duration_since_epoch() } fn sleep(&self, t: Duration) { diff --git a/crates/diem-bitvec/Cargo.toml b/crates/aptos-bitvec/Cargo.toml similarity index 87% rename from crates/diem-bitvec/Cargo.toml rename to crates/aptos-bitvec/Cargo.toml index 4e9e100211060..500395b964e3f 100644 --- a/crates/diem-bitvec/Cargo.toml +++ b/crates/aptos-bitvec/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "diem-bitvec" +name = "aptos-bitvec" version = "0.1.0" authors = ["Diem Association "] description = "Diem safe bitvec implementation" @@ -10,7 +10,7 @@ publish = false edition = "2018" [dependencies] -diem-workspace-hack = { version = "0.1", path = "../diem-workspace-hack" } +aptos-workspace-hack = { version = "0.1", path = "../aptos-workspace-hack" } proptest = { version = "1.0.0", default-features = true, optional = true } proptest-derive = { version = "0.3.0", optional = true } serde = { version = "1.0.124", features = ["derive"] } diff --git a/crates/diem-bitvec/src/lib.rs b/crates/aptos-bitvec/src/lib.rs similarity index 99% rename from crates/diem-bitvec/src/lib.rs rename to crates/aptos-bitvec/src/lib.rs index 9fc87a7b01148..c23f61b77e8ce 100644 --- a/crates/diem-bitvec/src/lib.rs +++ b/crates/aptos-bitvec/src/lib.rs @@ -41,7 +41,7 @@ const MAX_BUCKETS: usize = 32; /// /// # Examples: /// ``` -/// use diem_bitvec::BitVec; +/// use aptos_bitvec::BitVec; /// use std::ops::BitAnd; /// /// let mut bv = BitVec::default(); diff --git a/crates/diem-crypto-derive/Cargo.toml b/crates/aptos-crypto-derive/Cargo.toml similarity index 70% rename from crates/diem-crypto-derive/Cargo.toml rename to crates/aptos-crypto-derive/Cargo.toml index 58baea5beda8f..9f2ec26eee3b6 100644 --- a/crates/diem-crypto-derive/Cargo.toml +++ b/crates/aptos-crypto-derive/Cargo.toml @@ -1,8 +1,8 @@ [package] -name = "diem-crypto-derive" +name = "aptos-crypto-derive" version = "0.0.3" authors = ["Diem Association "] -description = "Diem custom derives for `diem-crypto`" +description = "Diem custom derives for `aptos-crypto`" repository = "https://github.com/diem/diem" homepage = "https://diem.com" license = "Apache-2.0" @@ -16,7 +16,7 @@ proc-macro = true syn = { version = "1.0.64", features = ["derive"] } quote = "1.0.9" proc-macro2 = "1.0.24" -diem-workspace-hack = { version = "0.1", path = "../diem-workspace-hack" } +aptos-workspace-hack = { version = "0.1", path = "../aptos-workspace-hack" } [dev-dependencies] anyhow = "1.0.52" diff --git a/crates/diem-crypto-derive/src/hasher.rs b/crates/aptos-crypto-derive/src/hasher.rs similarity index 100% rename from crates/diem-crypto-derive/src/hasher.rs rename to crates/aptos-crypto-derive/src/hasher.rs diff --git a/crates/diem-crypto-derive/src/lib.rs b/crates/aptos-crypto-derive/src/lib.rs similarity index 91% rename from crates/diem-crypto-derive/src/lib.rs rename to crates/aptos-crypto-derive/src/lib.rs index 54b5b37301577..1c323bcc7c2fb 100644 --- a/crates/diem-crypto-derive/src/lib.rs +++ b/crates/aptos-crypto-derive/src/lib.rs @@ -9,11 +9,11 @@ //! - the `SilentDebug` and SilentDisplay macros are meant to be used on private key types, and //! elide their input for confidentiality. //! - the `Deref` macro helps derive the canonical instances on new types. -//! - the derive macros for `diem_crypto::traits`, namely `ValidCryptoMaterial`, `PublicKey`, `PrivateKey`, +//! - the derive macros for `aptos_crypto::traits`, namely `ValidCryptoMaterial`, `PublicKey`, `PrivateKey`, //! `VerifyingKey`, `SigningKey` and `Signature` are meant to be derived on simple unions of types //! implementing these traits. -//! - the derive macro for `diem_crypto::hash::CryptoHasher`, which defines -//! the domain-separation hasher structures described in `diem_crypto::hash` +//! - the derive macro for `aptos_crypto::hash::CryptoHasher`, which defines +//! the domain-separation hasher structures described in `aptos_crypto::hash` //! (look there for details). This derive macro has for sole difference that it //! automatically picks a unique salt for you, using the Serde name. For a container `Foo`, //! this is usually equivalent to: @@ -51,12 +51,12 @@ //! //! ```ignore //! # #[macro_use] extern crate crypto-derive; -//! use diem_crypto::{ +//! use aptos_crypto::{ //! hash::HashValue, //! bls12381::{BLS12381PrivateKey, BLS12381PublicKey, BLS12381Signature}, //! ed25519::{Ed25519PrivateKey, Ed25519PublicKey, Ed25519Signature}, //! }; -//! use diem_crypto_derive::{ +//! use aptos_crypto_derive::{ //! SilentDebug, PrivateKey, PublicKey, Signature, SigningKey, ValidCryptoMaterial, VerifyingKey, //! }; //! @@ -319,7 +319,7 @@ pub fn derive_enum_signature(input: TokenStream) -> TokenStream { } // There is a unit test for this logic in the crypto crate, at -// diem_crypto::unit_tests::cryptohasher — you may have to modify it if you +// aptos_crypto::unit_tests::cryptohasher — you may have to modify it if you // edit the below. #[proc_macro_derive(CryptoHasher)] pub fn hasher_dispatch(input: TokenStream) -> TokenStream { @@ -351,21 +351,21 @@ pub fn hasher_dispatch(input: TokenStream) -> TokenStream { let out = quote!( /// Cryptographic hasher for an BCS-serializable #item #[derive(Clone)] - pub struct #hasher_name(diem_crypto::hash::DefaultHasher); + pub struct #hasher_name(aptos_crypto::hash::DefaultHasher); - static #static_seed_name: diem_crypto::_once_cell::sync::OnceCell<[u8; 32]> = diem_crypto::_once_cell::sync::OnceCell::new(); + static #static_seed_name: aptos_crypto::_once_cell::sync::OnceCell<[u8; 32]> = aptos_crypto::_once_cell::sync::OnceCell::new(); impl #hasher_name { fn new() -> Self { - let name = diem_crypto::_serde_name::trace_name::<#type_name #param>() + let name = aptos_crypto::_serde_name::trace_name::<#type_name #param>() .expect("The `CryptoHasher` macro only applies to structs and enums"); #hasher_name( - diem_crypto::hash::DefaultHasher::new(&name.as_bytes())) + aptos_crypto::hash::DefaultHasher::new(&name.as_bytes())) } } - static #static_hasher_name: diem_crypto::_once_cell::sync::Lazy<#hasher_name> = - diem_crypto::_once_cell::sync::Lazy::new(|| #hasher_name::new()); + static #static_hasher_name: aptos_crypto::_once_cell::sync::Lazy<#hasher_name> = + aptos_crypto::_once_cell::sync::Lazy::new(|| #hasher_name::new()); impl std::default::Default for #hasher_name @@ -375,12 +375,12 @@ pub fn hasher_dispatch(input: TokenStream) -> TokenStream { } } - impl diem_crypto::hash::CryptoHasher for #hasher_name { + impl aptos_crypto::hash::CryptoHasher for #hasher_name { fn seed() -> &'static [u8; 32] { #static_seed_name.get_or_init(|| { - let name = diem_crypto::_serde_name::trace_name::<#type_name #param>() + let name = aptos_crypto::_serde_name::trace_name::<#type_name #param>() .expect("The `CryptoHasher` macro only applies to structs and enums.").as_bytes(); - diem_crypto::hash::DefaultHasher::prefixed_hash(&name) + aptos_crypto::hash::DefaultHasher::prefixed_hash(&name) }) } @@ -388,14 +388,14 @@ pub fn hasher_dispatch(input: TokenStream) -> TokenStream { self.0.update(bytes); } - fn finish(self) -> diem_crypto::hash::HashValue { + fn finish(self) -> aptos_crypto::hash::HashValue { self.0.finish() } } impl std::io::Write for #hasher_name { fn write(&mut self, bytes: &[u8]) -> std::io::Result { - use diem_crypto::hash::CryptoHasher; + use aptos_crypto::hash::CryptoHasher; self.0.update(bytes); Ok(bytes.len()) @@ -421,11 +421,11 @@ pub fn bcs_crypto_hash_dispatch(input: TokenStream) -> TokenStream { let generics = add_trait_bounds(ast.generics); let (impl_generics, ty_generics, where_clause) = generics.split_for_impl(); let out = quote!( - impl #impl_generics diem_crypto::hash::CryptoHash for #name #ty_generics #where_clause { + impl #impl_generics aptos_crypto::hash::CryptoHash for #name #ty_generics #where_clause { type Hasher = #hasher_name; - fn hash(&self) -> diem_crypto::hash::HashValue { - use diem_crypto::hash::CryptoHasher; + fn hash(&self) -> aptos_crypto::hash::HashValue { + use aptos_crypto::hash::CryptoHasher; let mut state = Self::Hasher::default(); bcs::serialize_into(&mut state, &self).expect(#error_msg); diff --git a/crates/diem-crypto-derive/src/unions.rs b/crates/aptos-crypto-derive/src/unions.rs similarity index 89% rename from crates/diem-crypto-derive/src/unions.rs rename to crates/aptos-crypto-derive/src/unions.rs index 425369cd0c7b9..16811fe3df74f 100644 --- a/crates/diem-crypto-derive/src/unions.rs +++ b/crates/aptos-crypto-derive/src/unions.rs @@ -60,7 +60,7 @@ pub fn impl_enum_tryfrom(name: &Ident, variants: &DataEnum) -> proc_macro2::Toke quote! { impl core::convert::TryFrom<&[u8]> for #name { - type Error = diem_crypto::CryptoMaterialError; + type Error = aptos_crypto::CryptoMaterialError; fn try_from(bytes: &[u8]) -> std::result::Result<#name, Self::Error> { #try_chain } @@ -88,7 +88,7 @@ pub fn impl_enum_valid_crypto_material(name: &Ident, variants: &DataEnum) -> Tok try_from.extend(quote! { - impl diem_crypto::ValidCryptoMaterial for #name { + impl aptos_crypto::ValidCryptoMaterial for #name { fn to_bytes(&self) -> Vec { match self { #to_bytes_arms @@ -153,7 +153,7 @@ pub fn impl_enum_publickey( } }; res.extend(quote! { - impl diem_crypto::PublicKey for #name { + impl aptos_crypto::PublicKey for #name { type PrivateKeyMaterial = #pkt; } }); @@ -167,7 +167,7 @@ pub fn impl_enum_privatekey( ) -> TokenStream { let pkt: syn::Type = public_key_type.parse().unwrap(); let res = quote! { - impl diem_crypto::PrivateKey for #name { + impl aptos_crypto::PrivateKey for #name { type PublicKeyMaterial = #pkt; } }; @@ -183,11 +183,11 @@ pub fn impl_enum_verifyingkey( let pkt: syn::Type = private_key_type.parse().unwrap(); let st: syn::Type = signature_type.parse().unwrap(); let res = quote! { - impl diem_crypto::VerifyingKey for #name { + impl aptos_crypto::VerifyingKey for #name { type SigningKeyMaterial = #pkt; type SignatureMaterial = #st; } - impl diem_crypto::private::Sealed for #name {} + impl aptos_crypto::private::Sealed for #name {} }; res.into() } @@ -214,11 +214,11 @@ pub fn impl_enum_signingkey( }); } let res = quote! { - impl diem_crypto::SigningKey for #name { + impl aptos_crypto::SigningKey for #name { type VerifyingKeyMaterial = #pkt; type SignatureMaterial = #st; - fn sign(&self, message: &T) -> Self::SignatureMaterial { + fn sign(&self, message: &T) -> Self::SignatureMaterial { match self { #match_struct_arms } @@ -231,7 +231,7 @@ pub fn impl_enum_signingkey( } } } - impl diem_crypto::private::Sealed for #name {} + impl aptos_crypto::private::Sealed for #name {} }; res.into() } @@ -271,24 +271,24 @@ pub fn impl_enum_signature( res.extend(quote! { - impl diem_crypto::Signature for #name { + impl aptos_crypto::Signature for #name { type VerifyingKeyMaterial = #pub_kt; type SigningKeyMaterial = #priv_kt; - fn verify(&self, message: &T, public_key: &Self::VerifyingKeyMaterial) -> std::result::Result<(), diem_crypto::error::Error> { + fn verify(&self, message: &T, public_key: &Self::VerifyingKeyMaterial) -> std::result::Result<(), aptos_crypto::error::Error> { match (self, public_key) { #match_struct_arms - _ => diem_crypto::error::bail!( + _ => aptos_crypto::error::bail!( "provided the wrong alternative in {:?}!", (self, public_key) ), } } - fn verify_arbitrary_msg(&self, message: &[u8], public_key: &Self::VerifyingKeyMaterial) -> std::result::Result<(), diem_crypto::error::Error> { + fn verify_arbitrary_msg(&self, message: &[u8], public_key: &Self::VerifyingKeyMaterial) -> std::result::Result<(), aptos_crypto::error::Error> { match (self, public_key) { #match_arms - _ => diem_crypto::error::bail!( + _ => aptos_crypto::error::bail!( "provided the wrong alternative in {:?}!", (self, public_key) ), @@ -302,7 +302,7 @@ pub fn impl_enum_signature( } } - impl diem_crypto::private::Sealed for #name {} + impl aptos_crypto::private::Sealed for #name {} }); res.into() } diff --git a/crates/diem-crypto/Cargo.toml b/crates/aptos-crypto/Cargo.toml similarity index 90% rename from crates/diem-crypto/Cargo.toml rename to crates/aptos-crypto/Cargo.toml index 1f5d11410d7c1..d49acfc340a48 100644 --- a/crates/diem-crypto/Cargo.toml +++ b/crates/aptos-crypto/Cargo.toml @@ -1,8 +1,8 @@ [package] -name = "diem-crypto" +name = "aptos-crypto" version = "0.0.3" authors = ["Diem Association "] -description = "Diem diem-crypto" +description = "Diem aptos-crypto" repository = "https://github.com/diem/diem" homepage = "https://diem.com" license = "Apache-2.0" @@ -32,9 +32,9 @@ thiserror = "1.0.24" tiny-keccak = { version = "2.0.2", features = ["sha3"] } x25519-dalek = { version = "0.1.0", package = "x25519-dalek-fiat", default-features = false, features = ["std"] } aes-gcm = "0.8.0" -diem-crypto-derive = { path = "../diem-crypto-derive", version = "0.0.3" } +aptos-crypto-derive = { path = "../aptos-crypto-derive", version = "0.0.3" } bcs = "0.1.2" -diem-workspace-hack = { version = "0.1", path = "../diem-workspace-hack" } +aptos-workspace-hack = { version = "0.1", path = "../aptos-workspace-hack" } [dev-dependencies] bitvec = "0.19.4" diff --git a/crates/diem-crypto/README.md b/crates/aptos-crypto/README.md similarity index 100% rename from crates/diem-crypto/README.md rename to crates/aptos-crypto/README.md diff --git a/crates/diem-crypto/benches/ed25519.rs b/crates/aptos-crypto/benches/ed25519.rs similarity index 92% rename from crates/diem-crypto/benches/ed25519.rs rename to crates/aptos-crypto/benches/ed25519.rs index 401662f59f248..6789ce00bd4fc 100644 --- a/crates/diem-crypto/benches/ed25519.rs +++ b/crates/aptos-crypto/benches/ed25519.rs @@ -6,14 +6,14 @@ extern crate criterion; use criterion::Criterion; -use diem_crypto_derive::{BCSCryptoHash, CryptoHasher}; +use aptos_crypto_derive::{BCSCryptoHash, CryptoHasher}; use rand::{prelude::ThreadRng, thread_rng}; use serde::{Deserialize, Serialize}; #[derive(Debug, CryptoHasher, BCSCryptoHash, Serialize, Deserialize)] pub struct TestDiemCrypto(pub String); -use diem_crypto::{ +use aptos_crypto::{ ed25519::{Ed25519PrivateKey, Ed25519PublicKey, Ed25519Signature}, traits::{Signature, SigningKey, Uniform}, }; diff --git a/crates/diem-crypto/benches/noise.rs b/crates/aptos-crypto/benches/noise.rs similarity index 99% rename from crates/diem-crypto/benches/noise.rs rename to crates/aptos-crypto/benches/noise.rs index 964e12278bfe1..ac9e5b00dee63 100644 --- a/crates/diem-crypto/benches/noise.rs +++ b/crates/aptos-crypto/benches/noise.rs @@ -13,7 +13,7 @@ use criterion::{Criterion, Throughput}; use rand::SeedableRng; use std::convert::TryFrom as _; -use diem_crypto::{ +use aptos_crypto::{ noise::{handshake_init_msg_len, handshake_resp_msg_len, NoiseConfig, AES_GCM_TAGLEN}, test_utils::TEST_SEED, x25519, Uniform as _, ValidCryptoMaterial as _, diff --git a/crates/diem-crypto/src/compat.rs b/crates/aptos-crypto/src/compat.rs similarity index 100% rename from crates/diem-crypto/src/compat.rs rename to crates/aptos-crypto/src/compat.rs diff --git a/crates/diem-crypto/src/ed25519.rs b/crates/aptos-crypto/src/ed25519.rs similarity index 99% rename from crates/diem-crypto/src/ed25519.rs rename to crates/aptos-crypto/src/ed25519.rs index be6e0e4ad1dd9..5999c764b2d13 100644 --- a/crates/diem-crypto/src/ed25519.rs +++ b/crates/aptos-crypto/src/ed25519.rs @@ -9,8 +9,8 @@ //! # Examples //! //! ``` -//! use diem_crypto_derive::{CryptoHasher, BCSCryptoHash}; -//! use diem_crypto::{ +//! use aptos_crypto_derive::{CryptoHasher, BCSCryptoHash}; +//! use aptos_crypto::{ //! ed25519::*, //! traits::{Signature, SigningKey, Uniform}, //! }; @@ -36,8 +36,8 @@ use crate::{ traits::*, }; use anyhow::{anyhow, Result}; +use aptos_crypto_derive::{DeserializeKey, SerializeKey, SilentDebug, SilentDisplay}; use core::convert::TryFrom; -use diem_crypto_derive::{DeserializeKey, SerializeKey, SilentDebug, SilentDisplay}; use mirai_annotations::*; use serde::Serialize; use std::{cmp::Ordering, fmt}; diff --git a/crates/diem-crypto/src/error.rs b/crates/aptos-crypto/src/error.rs similarity index 100% rename from crates/diem-crypto/src/error.rs rename to crates/aptos-crypto/src/error.rs diff --git a/crates/diem-crypto/src/hash.rs b/crates/aptos-crypto/src/hash.rs similarity index 98% rename from crates/diem-crypto/src/hash.rs rename to crates/aptos-crypto/src/hash.rs index c53c1e94d5d56..daf1af5a4f2aa 100644 --- a/crates/diem-crypto/src/hash.rs +++ b/crates/aptos-crypto/src/hash.rs @@ -37,10 +37,10 @@ //! # Quick Start //! //! To obtain a `hash()` method for any new type `MyNewStruct`, it is (strongly) recommended to -//! use the derive macros of `serde` and `diem_crypto_derive` as follows: +//! use the derive macros of `serde` and `aptos_crypto_derive` as follows: //! ``` -//! use diem_crypto::hash::CryptoHash; -//! use diem_crypto_derive::{CryptoHasher, BCSCryptoHash}; +//! use aptos_crypto::hash::CryptoHash; +//! use aptos_crypto_derive::{CryptoHasher, BCSCryptoHash}; //! use serde::{Deserialize, Serialize}; //! #[derive(Serialize, Deserialize, CryptoHasher, BCSCryptoHash)] //! struct MyNewStruct { /*...*/ } @@ -63,7 +63,7 @@ //! use the derive macro [`CryptoHasher`](https://doc.rust-lang.org/reference/procedural-macros.html). //! //! ``` -//! use diem_crypto_derive::CryptoHasher; +//! use aptos_crypto_derive::CryptoHasher; //! use serde::Deserialize; //! #[derive(Deserialize, CryptoHasher)] //! #[serde(rename = "OptionalCustomSerdeName")] @@ -92,7 +92,7 @@ //! **IMPORTANT:** Do NOT use this for new code unless you know what you are doing. //! //! ``` -//! use diem_crypto::hash::{CryptoHasher, TestOnlyHasher}; +//! use aptos_crypto::hash::{CryptoHasher, TestOnlyHasher}; //! //! let mut hasher = TestOnlyHasher::default(); //! hasher.update("Test message".as_bytes()); @@ -674,7 +674,7 @@ pub static GENESIS_BLOCK_ID: Lazy = Lazy::new(|| { /// /// # Example /// ``` -/// use diem_crypto::hash::TestOnlyHash; +/// use aptos_crypto::hash::TestOnlyHash; /// /// b"hello world".test_only_hash(); /// ``` diff --git a/crates/diem-crypto/src/hkdf.rs b/crates/aptos-crypto/src/hkdf.rs similarity index 99% rename from crates/diem-crypto/src/hkdf.rs rename to crates/aptos-crypto/src/hkdf.rs index 8fde9655e1ec8..9e26de425e3d4 100644 --- a/crates/diem-crypto/src/hkdf.rs +++ b/crates/aptos-crypto/src/hkdf.rs @@ -58,7 +58,7 @@ //! Run HKDF extract-then-expand so as to return 64 bytes, using 'salt', 'seed' and 'info' as //! inputs. //! ``` -//! use diem_crypto::hkdf::Hkdf; +//! use aptos_crypto::hkdf::Hkdf; //! use sha2::Sha256; //! //! // some bytes required for this example. diff --git a/crates/diem-crypto/src/lib.rs b/crates/aptos-crypto/src/lib.rs similarity index 95% rename from crates/diem-crypto/src/lib.rs rename to crates/aptos-crypto/src/lib.rs index 8d6d34650abfc..583edc11b0d46 100644 --- a/crates/diem-crypto/src/lib.rs +++ b/crates/aptos-crypto/src/lib.rs @@ -3,7 +3,7 @@ #![forbid(unsafe_code)] #![deny(missing_docs)] -//! This feature gets turned on only if diem-crypto is compiled via MIRAI in a nightly build. +//! This feature gets turned on only if aptos-crypto is compiled via MIRAI in a nightly build. #![cfg_attr(mirai, allow(incomplete_features), feature(const_generics))] //! A library supplying various cryptographic primitives diff --git a/crates/diem-crypto/src/multi_ed25519.rs b/crates/aptos-crypto/src/multi_ed25519.rs similarity index 99% rename from crates/diem-crypto/src/multi_ed25519.rs rename to crates/aptos-crypto/src/multi_ed25519.rs index 53157be154af1..8dc718821e314 100644 --- a/crates/diem-crypto/src/multi_ed25519.rs +++ b/crates/aptos-crypto/src/multi_ed25519.rs @@ -15,8 +15,8 @@ use crate::{ traits::*, }; use anyhow::{anyhow, Result}; +use aptos_crypto_derive::{DeserializeKey, SerializeKey, SilentDebug, SilentDisplay}; use core::convert::TryFrom; -use diem_crypto_derive::{DeserializeKey, SerializeKey, SilentDebug, SilentDisplay}; use mirai_annotations::*; use rand::Rng; use serde::Serialize; diff --git a/crates/diem-crypto/src/noise.rs b/crates/aptos-crypto/src/noise.rs similarity index 99% rename from crates/diem-crypto/src/noise.rs rename to crates/aptos-crypto/src/noise.rs index 7c9eeba669a97..529405dba7ad3 100644 --- a/crates/diem-crypto/src/noise.rs +++ b/crates/aptos-crypto/src/noise.rs @@ -13,10 +13,10 @@ //! Usage example: //! //! ``` -//! use diem_crypto::{noise, x25519, traits::*}; +//! use aptos_crypto::{noise, x25519, traits::*}; //! use rand::prelude::*; //! -//! # fn main() -> Result<(), diem_crypto::noise::NoiseError> { +//! # fn main() -> Result<(), aptos_crypto::noise::NoiseError> { //! let mut rng = rand::thread_rng(); //! let initiator_static = x25519::PrivateKey::generate(&mut rng); //! let responder_static = x25519::PrivateKey::generate(&mut rng); diff --git a/crates/diem-crypto/src/tags.rs b/crates/aptos-crypto/src/tags.rs similarity index 82% rename from crates/diem-crypto/src/tags.rs rename to crates/aptos-crypto/src/tags.rs index 6a0875ec5ee3f..40f742ec26e48 100644 --- a/crates/diem-crypto/src/tags.rs +++ b/crates/aptos-crypto/src/tags.rs @@ -1,14 +1,14 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -//! This module provides definitions of tag types to be used by MIRAI analyzing diem-crypto. -//! This module gets compiled only if the diem-crypto is compiled via MIRAI in a debug build. +//! This module provides definitions of tag types to be used by MIRAI analyzing aptos-crypto. +//! This module gets compiled only if the aptos-crypto is compiled via MIRAI in a debug build. use mirai_annotations::*; /// A MIRAI tag type that tracks if a public key is checked to protect against invalid point /// attacks, small subgroup attacks, and typos. This tag type is only used at compilation time. -/// This type should only be accessible inside diem-crypto. +/// This type should only be accessible inside aptos-crypto. pub type ValidatedPublicKeyTag = ValidatedPublicKeyTagKind; /// A generic tag type intended to only be used by ValidatedPublicKeyTag diff --git a/crates/diem-crypto/src/test_utils.rs b/crates/aptos-crypto/src/test_utils.rs similarity index 100% rename from crates/diem-crypto/src/test_utils.rs rename to crates/aptos-crypto/src/test_utils.rs diff --git a/crates/diem-crypto/src/traits.rs b/crates/aptos-crypto/src/traits.rs similarity index 100% rename from crates/diem-crypto/src/traits.rs rename to crates/aptos-crypto/src/traits.rs diff --git a/crates/diem-crypto/src/unit_tests/bcs_test.rs b/crates/aptos-crypto/src/unit_tests/bcs_test.rs similarity index 100% rename from crates/diem-crypto/src/unit_tests/bcs_test.rs rename to crates/aptos-crypto/src/unit_tests/bcs_test.rs diff --git a/crates/diem-crypto/src/unit_tests/compat_test.rs b/crates/aptos-crypto/src/unit_tests/compat_test.rs similarity index 100% rename from crates/diem-crypto/src/unit_tests/compat_test.rs rename to crates/aptos-crypto/src/unit_tests/compat_test.rs diff --git a/crates/diem-crypto/src/unit_tests/compilation/cross_test.rs b/crates/aptos-crypto/src/unit_tests/compilation/cross_test.rs similarity index 92% rename from crates/diem-crypto/src/unit_tests/compilation/cross_test.rs rename to crates/aptos-crypto/src/unit_tests/compilation/cross_test.rs index f6879e8d8604f..a044206ea6457 100644 --- a/crates/diem-crypto/src/unit_tests/compilation/cross_test.rs +++ b/crates/aptos-crypto/src/unit_tests/compilation/cross_test.rs @@ -1,13 +1,13 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_crypto::{ +use aptos_crypto::{ ed25519::{Ed25519PrivateKey, Ed25519PublicKey}, multi_ed25519::{MultiEd25519PrivateKey, MultiEd25519PublicKey}, test_utils::KeyPair, traits::*, }; -use diem_crypto_derive::{CryptoHasher, BCSCryptoHash}; +use aptos_crypto_derive::{CryptoHasher, BCSCryptoHash}; use rand::{prelude::ThreadRng, thread_rng}; use serde::{Deserialize, Serialize}; diff --git a/crates/diem-crypto/src/unit_tests/compilation/cross_test_trait_obj.rs b/crates/aptos-crypto/src/unit_tests/compilation/cross_test_trait_obj.rs similarity index 83% rename from crates/diem-crypto/src/unit_tests/compilation/cross_test_trait_obj.rs rename to crates/aptos-crypto/src/unit_tests/compilation/cross_test_trait_obj.rs index 7fc26c79dcba9..b9e61a21af789 100644 --- a/crates/diem-crypto/src/unit_tests/compilation/cross_test_trait_obj.rs +++ b/crates/aptos-crypto/src/unit_tests/compilation/cross_test_trait_obj.rs @@ -1,7 +1,7 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_crypto::traits::*; +use aptos_crypto::traits::*; fn main() { let mut l: Vec> = vec![]; diff --git a/crates/diem-crypto/src/unit_tests/compilation/cross_test_trait_obj_pub.rs b/crates/aptos-crypto/src/unit_tests/compilation/cross_test_trait_obj_pub.rs similarity index 83% rename from crates/diem-crypto/src/unit_tests/compilation/cross_test_trait_obj_pub.rs rename to crates/aptos-crypto/src/unit_tests/compilation/cross_test_trait_obj_pub.rs index 5b2b86a6588b7..c24d33254152e 100644 --- a/crates/diem-crypto/src/unit_tests/compilation/cross_test_trait_obj_pub.rs +++ b/crates/aptos-crypto/src/unit_tests/compilation/cross_test_trait_obj_pub.rs @@ -1,7 +1,7 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_crypto::traits::*; +use aptos_crypto::traits::*; fn main() { let mut l: Vec> = vec![]; diff --git a/crates/diem-crypto/src/unit_tests/compilation/cross_test_trait_obj_sig.rs b/crates/aptos-crypto/src/unit_tests/compilation/cross_test_trait_obj_sig.rs similarity index 83% rename from crates/diem-crypto/src/unit_tests/compilation/cross_test_trait_obj_sig.rs rename to crates/aptos-crypto/src/unit_tests/compilation/cross_test_trait_obj_sig.rs index 7fc26c79dcba9..b9e61a21af789 100644 --- a/crates/diem-crypto/src/unit_tests/compilation/cross_test_trait_obj_sig.rs +++ b/crates/aptos-crypto/src/unit_tests/compilation/cross_test_trait_obj_sig.rs @@ -1,7 +1,7 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_crypto::traits::*; +use aptos_crypto::traits::*; fn main() { let mut l: Vec> = vec![]; diff --git a/crates/diem-crypto/src/unit_tests/compilation/small_kdf.rs b/crates/aptos-crypto/src/unit_tests/compilation/small_kdf.rs similarity index 65% rename from crates/diem-crypto/src/unit_tests/compilation/small_kdf.rs rename to crates/aptos-crypto/src/unit_tests/compilation/small_kdf.rs index 02ec4f439e32b..fc115939adaf2 100644 --- a/crates/diem-crypto/src/unit_tests/compilation/small_kdf.rs +++ b/crates/aptos-crypto/src/unit_tests/compilation/small_kdf.rs @@ -3,6 +3,6 @@ fn main() { // Test for ripemd160, output_length < 256 - let ripemd = diem_crypto::hkdf::Hkdf::::extract(None, &[]); + let ripemd = aptos_crypto::hkdf::Hkdf::::extract(None, &[]); assert!(ripemd.is_ok()); } diff --git a/crates/diem-crypto/src/unit_tests/cross_test.rs b/crates/aptos-crypto/src/unit_tests/cross_test.rs similarity index 98% rename from crates/diem-crypto/src/unit_tests/cross_test.rs rename to crates/aptos-crypto/src/unit_tests/cross_test.rs index 445c1f456d97d..1ce91811a8d0f 100644 --- a/crates/diem-crypto/src/unit_tests/cross_test.rs +++ b/crates/aptos-crypto/src/unit_tests/cross_test.rs @@ -3,7 +3,7 @@ // This is necessary for the derive macros which rely on being used in a // context where the crypto crate is external -use crate as diem_crypto; +use crate as aptos_crypto; use crate::{ ed25519::{Ed25519PrivateKey, Ed25519PublicKey, Ed25519Signature}, multi_ed25519::{MultiEd25519PrivateKey, MultiEd25519PublicKey, MultiEd25519Signature}, @@ -11,7 +11,7 @@ use crate::{ traits::*, }; -use diem_crypto_derive::{ +use aptos_crypto_derive::{ PrivateKey, PublicKey, Signature, SigningKey, SilentDebug, ValidCryptoMaterial, VerifyingKey, }; use proptest::prelude::*; diff --git a/crates/diem-crypto/src/unit_tests/cryptohasher.rs b/crates/aptos-crypto/src/unit_tests/cryptohasher.rs similarity index 97% rename from crates/diem-crypto/src/unit_tests/cryptohasher.rs rename to crates/aptos-crypto/src/unit_tests/cryptohasher.rs index 66bdc230827ac..f01d81b5dc560 100644 --- a/crates/diem-crypto/src/unit_tests/cryptohasher.rs +++ b/crates/aptos-crypto/src/unit_tests/cryptohasher.rs @@ -3,12 +3,12 @@ //! Test file for the procedural macros CryptoHasher and BCSCryptoHash. -use crate as diem_crypto; +use crate as aptos_crypto; use crate::{ hash::{CryptoHash, CryptoHasher, DIEM_HASH_PREFIX}, HashValue, }; -use diem_crypto_derive::{BCSCryptoHash, CryptoHasher}; +use aptos_crypto_derive::{BCSCryptoHash, CryptoHasher}; use serde::{Deserialize, Serialize}; use tiny_keccak::{Hasher, Sha3}; diff --git a/crates/diem-crypto/src/unit_tests/ed25519_test.rs b/crates/aptos-crypto/src/unit_tests/ed25519_test.rs similarity index 99% rename from crates/diem-crypto/src/unit_tests/ed25519_test.rs rename to crates/aptos-crypto/src/unit_tests/ed25519_test.rs index ba9b69296b932..908988f74b2b8 100644 --- a/crates/diem-crypto/src/unit_tests/ed25519_test.rs +++ b/crates/aptos-crypto/src/unit_tests/ed25519_test.rs @@ -1,7 +1,7 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use crate as diem_crypto; +use crate as aptos_crypto; use crate::{ ed25519::{ Ed25519PrivateKey, Ed25519PublicKey, Ed25519Signature, ED25519_PRIVATE_KEY_LENGTH, @@ -18,7 +18,7 @@ use core::{ }; use ed25519_dalek::ed25519::signature::{Signature as _, Verifier as _}; -use diem_crypto_derive::{BCSCryptoHash, CryptoHasher}; +use aptos_crypto_derive::{BCSCryptoHash, CryptoHasher}; use digest::Digest; use proptest::{collection::vec, prelude::*}; use serde::{Deserialize, Serialize}; diff --git a/crates/diem-crypto/src/unit_tests/hash_test.rs b/crates/aptos-crypto/src/unit_tests/hash_test.rs similarity index 100% rename from crates/diem-crypto/src/unit_tests/hash_test.rs rename to crates/aptos-crypto/src/unit_tests/hash_test.rs diff --git a/crates/diem-crypto/src/unit_tests/hkdf_test.rs b/crates/aptos-crypto/src/unit_tests/hkdf_test.rs similarity index 100% rename from crates/diem-crypto/src/unit_tests/hkdf_test.rs rename to crates/aptos-crypto/src/unit_tests/hkdf_test.rs diff --git a/crates/diem-crypto/src/unit_tests/mod.rs b/crates/aptos-crypto/src/unit_tests/mod.rs similarity index 100% rename from crates/diem-crypto/src/unit_tests/mod.rs rename to crates/aptos-crypto/src/unit_tests/mod.rs diff --git a/crates/diem-crypto/src/unit_tests/multi_ed25519_test.rs b/crates/aptos-crypto/src/unit_tests/multi_ed25519_test.rs similarity index 100% rename from crates/diem-crypto/src/unit_tests/multi_ed25519_test.rs rename to crates/aptos-crypto/src/unit_tests/multi_ed25519_test.rs diff --git a/crates/diem-crypto/src/unit_tests/noise_test.rs b/crates/aptos-crypto/src/unit_tests/noise_test.rs similarity index 100% rename from crates/diem-crypto/src/unit_tests/noise_test.rs rename to crates/aptos-crypto/src/unit_tests/noise_test.rs diff --git a/crates/diem-crypto/src/validatable.rs b/crates/aptos-crypto/src/validatable.rs similarity index 100% rename from crates/diem-crypto/src/validatable.rs rename to crates/aptos-crypto/src/validatable.rs diff --git a/crates/diem-crypto/src/x25519.rs b/crates/aptos-crypto/src/x25519.rs similarity index 96% rename from crates/diem-crypto/src/x25519.rs rename to crates/aptos-crypto/src/x25519.rs index 7410e2e0aaaf0..4d40e472acf26 100644 --- a/crates/diem-crypto/src/x25519.rs +++ b/crates/aptos-crypto/src/x25519.rs @@ -10,7 +10,7 @@ //! # Examples //! //! ``` -//! use diem_crypto::{x25519, Uniform, test_utils::TEST_SEED}; +//! use aptos_crypto::{x25519, Uniform, test_utils::TEST_SEED}; //! use rand::{rngs::StdRng, SeedableRng}; //! //! // Derive an X25519 private key for testing. @@ -19,8 +19,8 @@ //! let public_key = private_key.public_key(); //! //! // Deserialize an hexadecimal private or public key -//! use diem_crypto::traits::ValidCryptoMaterialStringExt; -//! # fn main() -> Result<(), diem_crypto::traits::CryptoMaterialError> { +//! use aptos_crypto::traits::ValidCryptoMaterialStringExt; +//! # fn main() -> Result<(), aptos_crypto::traits::CryptoMaterialError> { //! let private_key = "404acc8ec6a0f18df7359a6ee7823f19dd95616b10fed8bdb0de030e891b945a"; //! let private_key = x25519::PrivateKey::from_encoded_string(&private_key)?; //! let public_key = "080e287879c918794170e258bfaddd75acac5b3e350419044655e4983a487120"; @@ -34,7 +34,7 @@ use crate::{ traits::{self, CryptoMaterialError, ValidCryptoMaterial, ValidCryptoMaterialStringExt}, x25519, }; -use diem_crypto_derive::{DeserializeKey, SerializeKey, SilentDebug, SilentDisplay}; +use aptos_crypto_derive::{DeserializeKey, SerializeKey, SilentDebug, SilentDisplay}; use rand::{CryptoRng, RngCore}; use std::convert::{TryFrom, TryInto}; diff --git a/crates/diem-crypto/test_vectors/noise_cacophony.txt b/crates/aptos-crypto/test_vectors/noise_cacophony.txt similarity index 100% rename from crates/diem-crypto/test_vectors/noise_cacophony.txt rename to crates/aptos-crypto/test_vectors/noise_cacophony.txt diff --git a/crates/diem-documentation-tool/Cargo.toml b/crates/aptos-documentation-tool/Cargo.toml similarity index 84% rename from crates/diem-documentation-tool/Cargo.toml rename to crates/aptos-documentation-tool/Cargo.toml index e85340bcecf4a..2e9040ce1eae6 100644 --- a/crates/diem-documentation-tool/Cargo.toml +++ b/crates/aptos-documentation-tool/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "diem-documentation-tool" +name = "aptos-documentation-tool" version = "0.1.0" authors = ["Diem Association "] description = "Diem transaction-builder" @@ -17,7 +17,7 @@ anyhow = "1.0.52" regex = "1.4.3" structopt = "0.3.21" once_cell = "1.7.2" -diem-workspace-hack = { version = "0.1", path = "../diem-workspace-hack" } +aptos-workspace-hack = { version = "0.1", path = "../aptos-workspace-hack" } [dev-dependencies] serde = { version = "1.0.124", features = ["derive"] } diff --git a/crates/diem-documentation-tool/src/lib.rs b/crates/aptos-documentation-tool/src/lib.rs similarity index 100% rename from crates/diem-documentation-tool/src/lib.rs rename to crates/aptos-documentation-tool/src/lib.rs diff --git a/crates/diem-documentation-tool/src/main.rs b/crates/aptos-documentation-tool/src/main.rs similarity index 95% rename from crates/diem-documentation-tool/src/main.rs rename to crates/aptos-documentation-tool/src/main.rs index 2a11827300916..474574c8f0401 100644 --- a/crates/diem-documentation-tool/src/main.rs +++ b/crates/aptos-documentation-tool/src/main.rs @@ -4,10 +4,10 @@ //! # Tool to help maintaining diem specifications. //! //! '''bash -//! cargo run -p diem-documentation-tool -- --help +//! cargo run -p aptos-documentation-tool -- --help //! ''' -use diem_documentation_tool as diem_doc; +use aptos_documentation_tool as diem_doc; use serde_reflection::Registry; use std::{collections::BTreeMap, path::PathBuf}; use structopt::StructOpt; diff --git a/crates/diem-documentation-tool/tests/update.rs b/crates/aptos-documentation-tool/tests/update.rs similarity index 97% rename from crates/diem-documentation-tool/tests/update.rs rename to crates/aptos-documentation-tool/tests/update.rs index c42d933a0a92b..37d287449615c 100644 --- a/crates/diem-documentation-tool/tests/update.rs +++ b/crates/aptos-documentation-tool/tests/update.rs @@ -1,7 +1,7 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_documentation_tool as diem_doc; +use aptos_documentation_tool as diem_doc; use serde::Deserialize; use serde_reflection::{Samples, Tracer, TracerConfig}; diff --git a/crates/diem-faucet/Cargo.toml b/crates/aptos-faucet/Cargo.toml similarity index 64% rename from crates/diem-faucet/Cargo.toml rename to crates/aptos-faucet/Cargo.toml index 6265892845bf2..f5a36f7f17310 100644 --- a/crates/diem-faucet/Cargo.toml +++ b/crates/aptos-faucet/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "diem-faucet" +name = "aptos-faucet" version = "0.1.0" authors = ["Diem Association "] description = "Diem Testnet utility services" @@ -24,15 +24,15 @@ url = "2.2.2" warp = "0.3.2" generate-key = { path = "../../config/generate-key" } -diem-crypto = { path = "../diem-crypto" } -diem-logger = { path = "../../crates/diem-logger" } -diem-rest-client = { path = "../../crates/diem-rest-client" } -diem-sdk = { path = "../../sdk" } -diem-workspace-hack = { version = "0.1", path = "../diem-workspace-hack" } +aptos-crypto = { path = "../aptos-crypto" } +aptos-logger = { path = "../../crates/aptos-logger" } +aptos-rest-client = { path = "../../crates/aptos-rest-client" } +aptos-sdk = { path = "../../sdk" } +aptos-workspace-hack = { version = "0.1", path = "../aptos-workspace-hack" } [dev-dependencies] serde_json = "1.0.64" tempfile = "3.2.0" -diem-config = { path = "../../config" } -diem-infallible = { path = "../../crates/diem-infallible" } +aptos-config = { path = "../../config" } +aptos-infallible = { path = "../../crates/aptos-infallible" } diff --git a/crates/diem-faucet/README.md b/crates/aptos-faucet/README.md similarity index 95% rename from crates/diem-faucet/README.md rename to crates/aptos-faucet/README.md index a5907d11f2286..5f476735c1ace 100644 --- a/crates/diem-faucet/README.md +++ b/crates/aptos-faucet/README.md @@ -38,7 +38,7 @@ If no query param `return_txns` or it is not "true", server returns an unsigned Nominally, this number can be used for looking up the submitted transaction. However, under load, this number may be shared by multiple transactions. Set query param `return_txns`, server will response all transactions for creating and funding your account. -The respond HTTP body is hex encoded bytes of BCS encoded `Vec`. +The respond HTTP body is hex encoded bytes of BCS encoded `Vec`. Decode Example ([source](https://diem.github.io/client-sdk-python/diem/testnet.html#diem.testnet.Faucet)): @@ -48,7 +48,7 @@ Decode Example ([source](https://diem.github.io/client-sdk-python/diem/testnet.h txns = [] for i in range(length): - txns.push(de.deserialize_any(diem_types.SignedTransaction)) + txns.push(de.deserialize_any(aptos_types.SignedTransaction)) ``` diff --git a/crates/diem-faucet/src/lib.rs b/crates/aptos-faucet/src/lib.rs similarity index 96% rename from crates/diem-faucet/src/lib.rs rename to crates/aptos-faucet/src/lib.rs index ff22a1de83b2b..086858937f68f 100644 --- a/crates/diem-faucet/src/lib.rs +++ b/crates/aptos-faucet/src/lib.rs @@ -11,20 +11,20 @@ //! Launch faucet service local and connect to Testnet: //! //! ```bash -//! cargo run -p diem-faucet -- -a 127.0.0.1 -p 8080 -c TESTNET \ +//! cargo run -p aptos-faucet -- -a 127.0.0.1 -p 8080 -c TESTNET \ //! -m -s https://testnet.diem.com/v1 //! ``` //! //! Check help doc for options details: //! //! ```bash -//! cargo run -p diem-faucet -- -h +//! cargo run -p aptos-faucet -- -h //! ``` use anyhow::{anyhow, Result}; -use diem_logger::info; -use diem_rest_client::Client; -use diem_sdk::{ +use aptos_logger::info; +use aptos_rest_client::Client; +use aptos_sdk::{ transaction_builder::{Currency, TransactionFactory}, types::{ account_address::AccountAddress, @@ -81,7 +81,7 @@ pub fn routes( ) -> impl Filter + Clone { let mint = mint::mint_routes(service.clone()); let accounts = accounts_routes(service); - let health = warp::path!("-" / "healthy").map(|| "diem-faucet:ok"); + let health = warp::path!("-" / "healthy").map(|| "aptos-faucet:ok"); health .or(mint) diff --git a/crates/diem-faucet/src/main.rs b/crates/aptos-faucet/src/main.rs similarity index 96% rename from crates/diem-faucet/src/main.rs rename to crates/aptos-faucet/src/main.rs index 15b8e6ccee43a..d86b3f1cdaa61 100644 --- a/crates/diem-faucet/src/main.rs +++ b/crates/aptos-faucet/src/main.rs @@ -1,8 +1,8 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_logger::info; -use diem_sdk::types::{ +use aptos_logger::info; +use aptos_sdk::types::{ account_config::{testnet_dd_account_address, treasury_compliance_account_address}, chain_id::ChainId, LocalAccount, @@ -44,7 +44,7 @@ struct Args { #[tokio::main] async fn main() { let args = Args::from_args(); - diem_logger::Logger::new().init(); + aptos_logger::Logger::new().init(); let address: std::net::SocketAddr = format!("{}:{}", args.address, args.port) .parse() @@ -65,7 +65,7 @@ async fn main() { generate_key::load_key(&args.mint_key_file_path), 0, ); - let service = Arc::new(diem_faucet::Service::new( + let service = Arc::new(aptos_faucet::Service::new( args.server_url, args.chain_id, treasury_account, @@ -73,22 +73,24 @@ async fn main() { )); info!("[faucet]: running on: {}", address); - warp::serve(diem_faucet::routes(service)).run(address).await; + warp::serve(aptos_faucet::routes(service)) + .run(address) + .await; } #[cfg(test)] mod tests { - use diem_crypto::hash::HashValue; - use diem_faucet::{routes, Service}; - use diem_infallible::RwLock; - use diem_rest_client::{ - diem_api_types::{ + use aptos_crypto::hash::HashValue; + use aptos_faucet::{routes, Service}; + use aptos_infallible::RwLock; + use aptos_rest_client::{ + aptos_api_types::{ AccountData, DirectWriteSet, LedgerInfo, PendingTransaction, Response, TransactionPayload as TransactionPayloadData, WriteSet, WriteSetPayload, }, FaucetClient, }; - use diem_sdk::{ + use aptos_sdk::{ transaction_builder::stdlib::{ScriptCall, ScriptFunctionCall}, types::{ account_address::AccountAddress, @@ -146,7 +148,7 @@ mod tests { let chain_id = ChainId::test(); - let accounts = AccountStates::new(diem_infallible::RwLock::new(HashMap::new())); + let accounts = AccountStates::new(aptos_infallible::RwLock::new(HashMap::new())); accounts .write() .insert(testnet_dd_account_address(), AccountState::new(100000)); @@ -212,7 +214,7 @@ mod tests { last_txn.lock().unwrap().as_ref().map_or_else( || Err(warp::reject()), |txn| { - let info = diem_rest_client::diem_api_types::TransactionInfo { + let info = aptos_rest_client::aptos_api_types::TransactionInfo { version: 0.into(), hash: HashValue::zero().into(), state_root_hash: HashValue::zero().into(), @@ -222,7 +224,7 @@ mod tests { vm_status: "Executed".to_string(), accumulator_root_hash: HashValue::zero().into(), }; - let serializable_txn: diem_rest_client::diem_api_types::Transaction = ( + let serializable_txn: aptos_rest_client::aptos_api_types::Transaction = ( txn.as_signed_user_txn().unwrap(), info, dummy_payload(), @@ -328,7 +330,7 @@ mod tests { .reply(&filter) .await; assert_eq!(resp.status(), 200); - assert_eq!(resp.body(), "diem-faucet:ok"); + assert_eq!(resp.body(), "aptos-faucet:ok"); } #[tokio::test] diff --git a/crates/diem-faucet/src/mint.rs b/crates/aptos-faucet/src/mint.rs similarity index 99% rename from crates/diem-faucet/src/mint.rs rename to crates/aptos-faucet/src/mint.rs index 9d1a6d92864a9..d4d949dd44c07 100644 --- a/crates/diem-faucet/src/mint.rs +++ b/crates/aptos-faucet/src/mint.rs @@ -3,8 +3,8 @@ use crate::Service; use anyhow::Result; -use diem_logger::prelude::warn; -use diem_sdk::{ +use aptos_logger::prelude::warn; +use aptos_sdk::{ transaction_builder::Currency, types::{ account_address::AccountAddress, diff --git a/crates/diem-id-generator/Cargo.toml b/crates/aptos-id-generator/Cargo.toml similarity index 56% rename from crates/diem-id-generator/Cargo.toml rename to crates/aptos-id-generator/Cargo.toml index bcab11bae8d53..d7455dc54f768 100644 --- a/crates/diem-id-generator/Cargo.toml +++ b/crates/aptos-id-generator/Cargo.toml @@ -1,8 +1,8 @@ [package] -name = "diem-id-generator" +name = "aptos-id-generator" version = "0.1.0" authors = ["Diem Association "] -description = "Diem diem-id-generator. A common id generator for Diem" +description = "Diem aptos-id-generator. A common id generator for Diem" repository = "https://github.com/diem/diem" homepage = "https://diem.com" license = "Apache-2.0" @@ -10,4 +10,4 @@ publish = false edition = "2018" [dependencies] -diem-workspace-hack = { version = "0.1", path = "../diem-workspace-hack" } +aptos-workspace-hack = { version = "0.1", path = "../aptos-workspace-hack" } diff --git a/crates/diem-id-generator/src/lib.rs b/crates/aptos-id-generator/src/lib.rs similarity index 100% rename from crates/diem-id-generator/src/lib.rs rename to crates/aptos-id-generator/src/lib.rs diff --git a/crates/diem-infallible/Cargo.toml b/crates/aptos-infallible/Cargo.toml similarity index 61% rename from crates/diem-infallible/Cargo.toml rename to crates/aptos-infallible/Cargo.toml index d0daca1ea7a8f..8919cbf37680c 100644 --- a/crates/diem-infallible/Cargo.toml +++ b/crates/aptos-infallible/Cargo.toml @@ -1,8 +1,8 @@ [package] -name = "diem-infallible" +name = "aptos-infallible" version = "0.1.0" authors = ["Diem Association "] -description = "Diem diem-infallible" +description = "Diem aptos-infallible" repository = "https://github.com/diem/diem" homepage = "https://diem.com" license = "Apache-2.0" @@ -10,4 +10,4 @@ publish = false edition = "2018" [dependencies] -diem-workspace-hack = { version = "0.1", path = "../diem-workspace-hack" } +aptos-workspace-hack = { version = "0.1", path = "../aptos-workspace-hack" } diff --git a/crates/diem-infallible/src/lib.rs b/crates/aptos-infallible/src/lib.rs similarity index 100% rename from crates/diem-infallible/src/lib.rs rename to crates/aptos-infallible/src/lib.rs diff --git a/crates/diem-infallible/src/math.rs b/crates/aptos-infallible/src/math.rs similarity index 98% rename from crates/diem-infallible/src/math.rs rename to crates/aptos-infallible/src/math.rs index 7ce1447d32e51..6cf916b63ed06 100644 --- a/crates/diem-infallible/src/math.rs +++ b/crates/aptos-infallible/src/math.rs @@ -7,7 +7,7 @@ /// # Examples /// /// ``` -///# use crate::diem_infallible::checked; +///# use crate::aptos_infallible::checked; /// let a: i64 = 1; /// let b: i64 = 2; /// let c: i64 = 3; diff --git a/crates/diem-infallible/src/mutex.rs b/crates/aptos-infallible/src/mutex.rs similarity index 100% rename from crates/diem-infallible/src/mutex.rs rename to crates/aptos-infallible/src/mutex.rs diff --git a/crates/diem-infallible/src/nonzero.rs b/crates/aptos-infallible/src/nonzero.rs similarity index 100% rename from crates/diem-infallible/src/nonzero.rs rename to crates/aptos-infallible/src/nonzero.rs diff --git a/crates/diem-infallible/src/rwlock.rs b/crates/aptos-infallible/src/rwlock.rs similarity index 100% rename from crates/diem-infallible/src/rwlock.rs rename to crates/aptos-infallible/src/rwlock.rs diff --git a/crates/diem-infallible/src/time.rs b/crates/aptos-infallible/src/time.rs similarity index 100% rename from crates/diem-infallible/src/time.rs rename to crates/aptos-infallible/src/time.rs diff --git a/crates/diem-log-derive/Cargo.toml b/crates/aptos-log-derive/Cargo.toml similarity index 77% rename from crates/diem-log-derive/Cargo.toml rename to crates/aptos-log-derive/Cargo.toml index 514f7bb6d4d13..6ff084b10bb21 100644 --- a/crates/diem-log-derive/Cargo.toml +++ b/crates/aptos-log-derive/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "diem-log-derive" +name = "aptos-log-derive" version = "0.1.0" authors = ["Diem Association "] repository = "https://github.com/diem/diem" @@ -12,7 +12,7 @@ edition = "2018" proc-macro = true [dependencies] -diem-workspace-hack = { version = "0.1", path = "../diem-workspace-hack" } +aptos-workspace-hack = { version = "0.1", path = "../aptos-workspace-hack" } syn = { version = "1.0.64", features = ["extra-traits"] } quote = "1.0.9" proc-macro2 = "1.0.24" diff --git a/crates/diem-log-derive/src/lib.rs b/crates/aptos-log-derive/src/lib.rs similarity index 92% rename from crates/diem-log-derive/src/lib.rs rename to crates/aptos-log-derive/src/lib.rs index cc12c8350d8d1..d0b6903e3f3bf 100644 --- a/crates/diem-log-derive/src/lib.rs +++ b/crates/aptos-log-derive/src/lib.rs @@ -63,10 +63,10 @@ pub fn derive(input: TokenStream) -> TokenStream { // Calls to visit_pair let visitor = format_ident!("visitor"); - let from_serde = quote! { ::diem_logger::Value::from_serde }; - let from_display = quote! { ::diem_logger::Value::from_display }; - let from_debug = quote! { ::diem_logger::Value::from_debug }; - let key_new = quote! { ::diem_logger::Key::new }; + let from_serde = quote! { ::aptos_logger::Value::from_serde }; + let from_display = quote! { ::aptos_logger::Value::from_display }; + let from_debug = quote! { ::aptos_logger::Value::from_debug }; + let key_new = quote! { ::aptos_logger::Key::new }; let visits = fields.iter().map(|f| { let ident = f.ident.as_ref().unwrap(); let ident_str = ident.to_string(); @@ -95,8 +95,8 @@ pub fn derive(input: TokenStream) -> TokenStream { #(#setters)* } - impl #impl_generics ::diem_logger::Schema for #name #ty_generics #where_clause { - fn visit(&self, visitor: &mut dyn ::diem_logger::Visitor) { + impl #impl_generics ::aptos_logger::Schema for #name #ty_generics #where_clause { + fn visit(&self, visitor: &mut dyn ::aptos_logger::Visitor) { #(#visits)* } } diff --git a/crates/diem-logger/Cargo.toml b/crates/aptos-logger/Cargo.toml similarity index 64% rename from crates/diem-logger/Cargo.toml rename to crates/aptos-logger/Cargo.toml index 1403d7dbcd011..0831f462c416e 100644 --- a/crates/diem-logger/Cargo.toml +++ b/crates/aptos-logger/Cargo.toml @@ -1,8 +1,8 @@ [package] -name = "diem-logger" +name = "aptos-logger" version = "0.1.0" authors = ["Diem Association "] -description = "Diem diem-logger" +description = "Diem aptos-logger" repository = "https://github.com/diem/diem" homepage = "https://diem.com" license = "Apache-2.0" @@ -10,15 +10,15 @@ publish = false edition = "2018" # Do NOT add any inter-project dependencies. -# This is to avoid ever having a circular dependency with the diem-logger crate. +# This is to avoid ever having a circular dependency with the aptos-logger crate. [dependencies] backtrace = { version = "0.3", features = ["serde"] } chrono = "0.4.19" erased-serde = "0.3.13" hostname = "0.3.1" -diem-log-derive = { path = "../diem-log-derive" } -diem-infallible = { path = "../diem-infallible" } -diem-workspace-hack = { version = "0.1", path = "../diem-workspace-hack" } +aptos-log-derive = { path = "../aptos-log-derive" } +aptos-infallible = { path = "../aptos-infallible" } +aptos-workspace-hack = { version = "0.1", path = "../aptos-workspace-hack" } once_cell = "1.7.2" serde = { version = "1.0.124", features = ["derive"] } serde_json = "1.0.64" diff --git a/crates/diem-logger/src/diem_logger.rs b/crates/aptos-logger/src/aptos_logger.rs similarity index 99% rename from crates/diem-logger/src/diem_logger.rs rename to crates/aptos-logger/src/aptos_logger.rs index 0d172fd594897..f5451197cb1ad 100644 --- a/crates/diem-logger/src/diem_logger.rs +++ b/crates/aptos-logger/src/aptos_logger.rs @@ -13,9 +13,9 @@ use crate::{ struct_log::TcpWriter, Event, Filter, Key, Level, LevelFilter, Metadata, }; +use aptos_infallible::RwLock; use backtrace::Backtrace; use chrono::{SecondsFormat, Utc}; -use diem_infallible::RwLock; use once_cell::sync::Lazy; use serde::Serialize; use std::{ @@ -525,7 +525,7 @@ impl Writer for FileWriter { /// Converts a record into a string representation: /// UNIX_TIMESTAMP LOG_LEVEL [thread_name] FILE:LINE MESSAGE JSON_DATA /// Example: -/// 2020-03-07 05:03:03 INFO [thread_name] common/diem-logger/src/lib.rs:261 Hello { "world": true } +/// 2020-03-07 05:03:03 INFO [thread_name] common/aptos-logger/src/lib.rs:261 Hello { "world": true } fn default_format(entry: &LogEntry) -> Result { use std::fmt::Write; diff --git a/crates/diem-logger/src/counters.rs b/crates/aptos-logger/src/counters.rs similarity index 100% rename from crates/diem-logger/src/counters.rs rename to crates/aptos-logger/src/counters.rs diff --git a/crates/diem-logger/src/event.rs b/crates/aptos-logger/src/event.rs similarity index 100% rename from crates/diem-logger/src/event.rs rename to crates/aptos-logger/src/event.rs diff --git a/crates/diem-logger/src/filter.rs b/crates/aptos-logger/src/filter.rs similarity index 100% rename from crates/diem-logger/src/filter.rs rename to crates/aptos-logger/src/filter.rs diff --git a/crates/diem-logger/src/kv.rs b/crates/aptos-logger/src/kv.rs similarity index 99% rename from crates/diem-logger/src/kv.rs rename to crates/aptos-logger/src/kv.rs index 8e4d6a30600e1..80ccedc7c08cb 100644 --- a/crates/diem-logger/src/kv.rs +++ b/crates/aptos-logger/src/kv.rs @@ -5,7 +5,7 @@ //! //! Example: //! ``` -//! use diem_logger::info; +//! use aptos_logger::info; //! info!( //! key = "value" //! ); diff --git a/crates/diem-logger/src/lib.rs b/crates/aptos-logger/src/lib.rs similarity index 94% rename from crates/diem-logger/src/lib.rs rename to crates/aptos-logger/src/lib.rs index 181e6ed89c79b..43c8ce0a2b1dc 100644 --- a/crates/diem-logger/src/lib.rs +++ b/crates/aptos-logger/src/lib.rs @@ -13,7 +13,7 @@ //! The below examples do no type checking for structured log fields, and instead just serialize //! whatever is given. //! ``` -//! use diem_logger::info; +//! use aptos_logger::info; //! //! let world = "world!"; //! @@ -51,7 +51,7 @@ //! trait for the struct as well as providing setters for all fields. //! //! ``` -//! use diem_logger::{info, Schema}; +//! use aptos_logger::{info, Schema}; //! //! #[derive(Schema)] //! struct LogSchema<'a> { @@ -111,7 +111,7 @@ //! `SampleRate` determines how often the sampled statement will occur. //! //! ``` -//! use diem_logger::{info, sample, sample::{SampleRate, Sampling}}; +//! use aptos_logger::{info, sample, sample::{SampleRate, Sampling}}; //! use std::time::Duration; //! //! // Sampled based on frequency of events, log only every 2 logs @@ -126,7 +126,7 @@ //! done by using the `Logger` type: //! //! ``` -//! use diem_logger::{Level, Logger}; +//! use aptos_logger::{Level, Logger}; //! //! Logger::builder().level(Level::Info).build(); //! ``` @@ -135,16 +135,15 @@ pub mod prelude { pub use crate::{ - debug, - diem_logger::FileWriter, - error, info, sample, + aptos_logger::FileWriter, + debug, error, info, sample, sample::{SampleRate, Sampling}, security::SecurityEvent, trace, warn, }; } -mod diem_logger; +mod aptos_logger; mod event; mod filter; mod kv; @@ -157,7 +156,7 @@ pub mod tracing_adapter; mod security; mod struct_log; -pub use crate::diem_logger::{ +pub use crate::aptos_logger::{ DiemLogger, DiemLogger as Logger, DiemLoggerBuilder, Writer, CHANNEL_SIZE, }; pub use event::Event; @@ -165,7 +164,7 @@ pub use filter::{Filter, LevelFilter}; pub use logger::flush; pub use metadata::{Level, Metadata}; -pub use diem_log_derive::Schema; +pub use aptos_log_derive::Schema; pub use kv::{Key, KeyValue, Schema, Value, Visitor}; pub use security::SecurityEvent; diff --git a/crates/diem-logger/src/logger.rs b/crates/aptos-logger/src/logger.rs similarity index 100% rename from crates/diem-logger/src/logger.rs rename to crates/aptos-logger/src/logger.rs diff --git a/crates/diem-logger/src/macros.rs b/crates/aptos-logger/src/macros.rs similarity index 100% rename from crates/diem-logger/src/macros.rs rename to crates/aptos-logger/src/macros.rs diff --git a/crates/diem-logger/src/metadata.rs b/crates/aptos-logger/src/metadata.rs similarity index 100% rename from crates/diem-logger/src/metadata.rs rename to crates/aptos-logger/src/metadata.rs diff --git a/crates/diem-logger/src/sample.rs b/crates/aptos-logger/src/sample.rs similarity index 100% rename from crates/diem-logger/src/sample.rs rename to crates/aptos-logger/src/sample.rs diff --git a/crates/diem-logger/src/security.rs b/crates/aptos-logger/src/security.rs similarity index 97% rename from crates/diem-logger/src/security.rs rename to crates/aptos-logger/src/security.rs index 44c572ed481e4..8f52305e468f3 100644 --- a/crates/diem-logger/src/security.rs +++ b/crates/aptos-logger/src/security.rs @@ -8,7 +8,7 @@ //! TODO: This likely belongs outside of the logging crate //! //! ``` -//! use diem_logger::{error, SecurityEvent}; +//! use aptos_logger::{error, SecurityEvent}; //! //! error!( //! SecurityEvent::InvalidRetrievedBlock, diff --git a/crates/diem-logger/src/struct_log.rs b/crates/aptos-logger/src/struct_log.rs similarity index 100% rename from crates/diem-logger/src/struct_log.rs rename to crates/aptos-logger/src/struct_log.rs diff --git a/crates/diem-logger/src/tracing_adapter.rs b/crates/aptos-logger/src/tracing_adapter.rs similarity index 96% rename from crates/diem-logger/src/tracing_adapter.rs rename to crates/aptos-logger/src/tracing_adapter.rs index 8bdde6b9fbb83..f311288ace8f1 100644 --- a/crates/diem-logger/src/tracing_adapter.rs +++ b/crates/aptos-logger/src/tracing_adapter.rs @@ -10,7 +10,7 @@ use tracing::{ }; use tracing_subscriber::{layer::Context, registry::LookupSpan, Layer}; -/// A layer that translates tracing events into diem-logger events. +/// A layer that translates tracing events into aptos-logger events. pub struct TracingToDiemLoggerLayer; fn translate_level(level: &Level) -> Option { @@ -151,7 +151,7 @@ where Some(metadata) => metadata, None => { dl::warn!( - "[tracing-to-diem-logger] failed to translate event due to unknown level {:?}", + "[tracing-to-aptos-logger] failed to translate event due to unknown level {:?}", event.metadata().level() ); return; diff --git a/crates/diem-logger/tests/derive.rs b/crates/aptos-logger/tests/derive.rs similarity index 96% rename from crates/diem-logger/tests/derive.rs rename to crates/aptos-logger/tests/derive.rs index 0d678b1e3d178..cb0f82cf04dd7 100644 --- a/crates/diem-logger/tests/derive.rs +++ b/crates/aptos-logger/tests/derive.rs @@ -1,7 +1,7 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_log_derive::Schema; +use aptos_log_derive::Schema; #[test] fn simple() { @@ -87,5 +87,5 @@ fn error_trait_object() { .debug_error(&debug_error) .display_error(&display_error); - ::diem_logger::info!(t); + ::aptos_logger::info!(t); } diff --git a/crates/diem-logger/tests/logger.rs b/crates/aptos-logger/tests/logger.rs similarity index 92% rename from crates/diem-logger/tests/logger.rs rename to crates/aptos-logger/tests/logger.rs index f40335899d387..a08293dac97cb 100644 --- a/crates/diem-logger/tests/logger.rs +++ b/crates/aptos-logger/tests/logger.rs @@ -1,8 +1,8 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_infallible::RwLock; -use diem_logger::{info, DiemLogger, Writer}; +use aptos_infallible::RwLock; +use aptos_logger::{info, DiemLogger, Writer}; use std::sync::Arc; #[derive(Default)] diff --git a/crates/diem-logger/tests/logger_custom_format.rs b/crates/aptos-logger/tests/logger_custom_format.rs similarity index 93% rename from crates/diem-logger/tests/logger_custom_format.rs rename to crates/aptos-logger/tests/logger_custom_format.rs index 0c8ae6fd49230..fa8dbf40fe488 100644 --- a/crates/diem-logger/tests/logger_custom_format.rs +++ b/crates/aptos-logger/tests/logger_custom_format.rs @@ -1,8 +1,8 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_infallible::RwLock; -use diem_logger::{info, DiemLogger, Writer}; +use aptos_infallible::RwLock; +use aptos_logger::{info, DiemLogger, Writer}; use std::sync::Arc; #[derive(Default)] diff --git a/crates/diem-logger/tests/remote.rs b/crates/aptos-logger/tests/remote.rs similarity index 93% rename from crates/diem-logger/tests/remote.rs rename to crates/aptos-logger/tests/remote.rs index c352620c00bd7..7ae6a58478997 100644 --- a/crates/diem-logger/tests/remote.rs +++ b/crates/aptos-logger/tests/remote.rs @@ -1,7 +1,7 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_logger::{debug, error, trace, DiemLogger, Level}; +use aptos_logger::{debug, error, trace, DiemLogger, Level}; use serde::Deserialize; use std::{ io::{BufRead, BufReader}, @@ -27,7 +27,7 @@ fn remote_end_to_end() { error!("Hello"); trace!("Hello"); debug!("Hello"); - diem_logger::flush(); + aptos_logger::flush(); }); let (stream, _) = listener.accept().unwrap(); diff --git a/crates/diem-logger/tests/tracing_translation_tests.rs b/crates/aptos-logger/tests/tracing_translation_tests.rs similarity index 96% rename from crates/diem-logger/tests/tracing_translation_tests.rs rename to crates/aptos-logger/tests/tracing_translation_tests.rs index 276162a03f533..6d0f52b5d6851 100644 --- a/crates/diem-logger/tests/tracing_translation_tests.rs +++ b/crates/aptos-logger/tests/tracing_translation_tests.rs @@ -1,8 +1,8 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_infallible::RwLock; -use diem_logger::{DiemLogger, Writer}; +use aptos_infallible::RwLock; +use aptos_logger::{DiemLogger, Writer}; use std::sync::Arc; use tracing::Level; diff --git a/crates/diem-metrics-core/Cargo.toml b/crates/aptos-metrics-core/Cargo.toml similarity index 66% rename from crates/diem-metrics-core/Cargo.toml rename to crates/aptos-metrics-core/Cargo.toml index bff4e71b1ef71..f535225249d51 100644 --- a/crates/diem-metrics-core/Cargo.toml +++ b/crates/aptos-metrics-core/Cargo.toml @@ -1,8 +1,8 @@ [package] -name = "diem-metrics-core" +name = "aptos-metrics-core" version = "0.1.0" authors = ["Diem Association "] -description = "Diem diem-metrics-core" +description = "Diem aptos-metrics-core" repository = "https://github.com/diem/diem" homepage = "https://diem.com" license = "Apache-2.0" @@ -10,5 +10,5 @@ publish = false edition = "2018" [dependencies] -diem-workspace-hack = { version = "0.1", path = "../diem-workspace-hack" } +aptos-workspace-hack = { version = "0.1", path = "../aptos-workspace-hack" } prometheus = { version = "0.12.0", default-features = false } diff --git a/crates/diem-metrics-core/src/lib.rs b/crates/aptos-metrics-core/src/lib.rs similarity index 100% rename from crates/diem-metrics-core/src/lib.rs rename to crates/aptos-metrics-core/src/lib.rs diff --git a/crates/diem-metrics/Cargo.toml b/crates/aptos-metrics/Cargo.toml similarity index 68% rename from crates/diem-metrics/Cargo.toml rename to crates/aptos-metrics/Cargo.toml index 4d081afea97d0..a1527c09fcd8a 100644 --- a/crates/diem-metrics/Cargo.toml +++ b/crates/aptos-metrics/Cargo.toml @@ -1,8 +1,8 @@ [package] -name = "diem-metrics" +name = "aptos-metrics" version = "0.1.0" authors = ["Diem Association "] -description = "Diem diem-metrics" +description = "Diem aptos-metrics" repository = "https://github.com/diem/diem" homepage = "https://diem.com" license = "Apache-2.0" @@ -18,9 +18,9 @@ prometheus = { version = "0.12.0", default-features = false } serde_json = "1.0.64" tokio = { version = "1.8.1", features = ["full"] } -diem-logger = { path = "../../crates/diem-logger" } -diem-metrics-core = { path = "../diem-metrics-core" } -diem-workspace-hack = { version = "0.1", path = "../diem-workspace-hack" } +aptos-logger = { path = "../../crates/aptos-logger" } +aptos-metrics-core = { path = "../aptos-metrics-core" } +aptos-workspace-hack = { version = "0.1", path = "../aptos-workspace-hack" } [dev-dependencies] rusty-fork = "0.3.0" diff --git a/crates/diem-metrics/build.rs b/crates/aptos-metrics/build.rs similarity index 100% rename from crates/diem-metrics/build.rs rename to crates/aptos-metrics/build.rs diff --git a/crates/diem-metrics/src/json_encoder.rs b/crates/aptos-metrics/src/json_encoder.rs similarity index 100% rename from crates/diem-metrics/src/json_encoder.rs rename to crates/aptos-metrics/src/json_encoder.rs diff --git a/crates/diem-metrics/src/json_metrics.rs b/crates/aptos-metrics/src/json_metrics.rs similarity index 100% rename from crates/diem-metrics/src/json_metrics.rs rename to crates/aptos-metrics/src/json_metrics.rs diff --git a/crates/diem-metrics/src/lib.rs b/crates/aptos-metrics/src/lib.rs similarity index 97% rename from crates/diem-metrics/src/lib.rs rename to crates/aptos-metrics/src/lib.rs index b5d8ee20cad17..d670a0bbbf222 100644 --- a/crates/diem-metrics/src/lib.rs +++ b/crates/aptos-metrics/src/lib.rs @@ -59,20 +59,20 @@ pub use op_counters::{DurationHistogram, OpMetrics}; mod unit_tests; // Re-export counter types from prometheus crate -pub use diem_metrics_core::{ +pub use aptos_metrics_core::{ register_histogram, register_histogram_vec, register_int_counter, register_int_counter_vec, register_int_gauge, register_int_gauge_vec, Histogram, HistogramTimer, HistogramVec, IntCounter, IntCounterVec, IntGauge, IntGaugeVec, }; -use diem_logger::prelude::*; +use aptos_logger::prelude::*; use once_cell::sync::Lazy; use prometheus::proto::MetricType; use std::collections::HashMap; pub static NUM_METRICS: Lazy = Lazy::new(|| { register_int_counter_vec!( - "diem_metrics", + "aptos_metrics", "Number of metrics in certain states", &["type"] ) @@ -80,7 +80,7 @@ pub static NUM_METRICS: Lazy = Lazy::new(|| { }); pub fn gather_metrics() -> Vec { - let metric_families = diem_metrics_core::gather(); + let metric_families = aptos_metrics_core::gather(); let mut total: u64 = 0; let mut families_over_1000: u64 = 0; diff --git a/crates/diem-metrics/src/metric_server.rs b/crates/aptos-metrics/src/metric_server.rs similarity index 98% rename from crates/diem-metrics/src/metric_server.rs rename to crates/aptos-metrics/src/metric_server.rs index f58d2878adf0a..547028ab8c065 100644 --- a/crates/diem-metrics/src/metric_server.rs +++ b/crates/aptos-metrics/src/metric_server.rs @@ -67,7 +67,7 @@ async fn serve_metrics(req: Request) -> Result, hyper::Erro let mut resp = Response::new(Body::empty()); match (req.method(), req.uri().path()) { (&Method::GET, "/-/healthy") => { - *resp.body_mut() = Body::from("diem-node:ok"); + *resp.body_mut() = Body::from("aptos-node:ok"); } (&Method::GET, "/metrics") => { //Prometheus server expects metrics to be on host:port/metrics @@ -82,7 +82,7 @@ async fn serve_metrics(req: Request) -> Result, hyper::Erro *resp.body_mut() = Body::from(encoded_metrics); } (&Method::GET, "/counters") => { - // Json encoded diem_metrics; + // Json encoded aptos_metrics; let encoder = JsonEncoder; let buffer = encode_metrics(encoder, &[]); *resp.body_mut() = Body::from(buffer); diff --git a/crates/diem-metrics/src/op_counters.rs b/crates/aptos-metrics/src/op_counters.rs similarity index 100% rename from crates/diem-metrics/src/op_counters.rs rename to crates/aptos-metrics/src/op_counters.rs diff --git a/crates/diem-metrics/src/public_metrics.rs b/crates/aptos-metrics/src/public_metrics.rs similarity index 100% rename from crates/diem-metrics/src/public_metrics.rs rename to crates/aptos-metrics/src/public_metrics.rs diff --git a/crates/diem-metrics/src/unit_tests/lib_test.rs b/crates/aptos-metrics/src/unit_tests/lib_test.rs similarity index 100% rename from crates/diem-metrics/src/unit_tests/lib_test.rs rename to crates/aptos-metrics/src/unit_tests/lib_test.rs diff --git a/crates/diem-metrics/src/unit_tests/mod.rs b/crates/aptos-metrics/src/unit_tests/mod.rs similarity index 100% rename from crates/diem-metrics/src/unit_tests/mod.rs rename to crates/aptos-metrics/src/unit_tests/mod.rs diff --git a/crates/diem-proptest-helpers/Cargo.toml b/crates/aptos-proptest-helpers/Cargo.toml similarity index 75% rename from crates/diem-proptest-helpers/Cargo.toml rename to crates/aptos-proptest-helpers/Cargo.toml index ff66b1297c3b0..8445f29eca170 100644 --- a/crates/diem-proptest-helpers/Cargo.toml +++ b/crates/aptos-proptest-helpers/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "diem-proptest-helpers" +name = "aptos-proptest-helpers" version = "0.1.0" authors = ["Diem Association "] description = "Diem proptest helpers" @@ -11,6 +11,6 @@ edition = "2018" [dependencies] crossbeam = "0.8.0" -diem-workspace-hack = { version = "0.1", path = "../diem-workspace-hack" } +aptos-workspace-hack = { version = "0.1", path = "../aptos-workspace-hack" } proptest = "1.0.0" proptest-derive = "0.3.0" diff --git a/crates/diem-proptest-helpers/proptest-regressions/unit_tests/growing_subset_tests.txt b/crates/aptos-proptest-helpers/proptest-regressions/unit_tests/growing_subset_tests.txt similarity index 100% rename from crates/diem-proptest-helpers/proptest-regressions/unit_tests/growing_subset_tests.txt rename to crates/aptos-proptest-helpers/proptest-regressions/unit_tests/growing_subset_tests.txt diff --git a/crates/diem-proptest-helpers/proptest-regressions/unit_tests/repeat_vec_tests.txt b/crates/aptos-proptest-helpers/proptest-regressions/unit_tests/repeat_vec_tests.txt similarity index 100% rename from crates/diem-proptest-helpers/proptest-regressions/unit_tests/repeat_vec_tests.txt rename to crates/aptos-proptest-helpers/proptest-regressions/unit_tests/repeat_vec_tests.txt diff --git a/crates/diem-proptest-helpers/src/growing_subset.rs b/crates/aptos-proptest-helpers/src/growing_subset.rs similarity index 98% rename from crates/diem-proptest-helpers/src/growing_subset.rs rename to crates/aptos-proptest-helpers/src/growing_subset.rs index ac9679d655d4d..35000bb34958c 100644 --- a/crates/diem-proptest-helpers/src/growing_subset.rs +++ b/crates/aptos-proptest-helpers/src/growing_subset.rs @@ -15,7 +15,7 @@ use std::iter::FromIterator; /// # Examples /// /// ``` -/// use diem_proptest_helpers::GrowingSubset; +/// use aptos_proptest_helpers::GrowingSubset; /// let items = vec![(1, "a"), (3, "c"), (2, "b"), (2, "d")]; /// let mut subset: GrowingSubset<_, _> = items.into_iter().collect(); /// diff --git a/crates/diem-proptest-helpers/src/lib.rs b/crates/aptos-proptest-helpers/src/lib.rs similarity index 98% rename from crates/diem-proptest-helpers/src/lib.rs rename to crates/aptos-proptest-helpers/src/lib.rs index 13ff2814f84ad..3387f38e43561 100644 --- a/crates/diem-proptest-helpers/src/lib.rs +++ b/crates/aptos-proptest-helpers/src/lib.rs @@ -32,7 +32,7 @@ use std::{ /// /// ``` /// use proptest::prelude::*; -/// use diem_proptest_helpers::with_stack_size; +/// use aptos_proptest_helpers::with_stack_size; /// /// with_stack_size(4 * 1024 * 1024, || proptest!(|(x in 0usize..128)| { /// // assertions go here diff --git a/crates/diem-proptest-helpers/src/repeat_vec.rs b/crates/aptos-proptest-helpers/src/repeat_vec.rs similarity index 98% rename from crates/diem-proptest-helpers/src/repeat_vec.rs rename to crates/aptos-proptest-helpers/src/repeat_vec.rs index 900c8dde5a6ff..c12a20cbba8d0 100644 --- a/crates/diem-proptest-helpers/src/repeat_vec.rs +++ b/crates/aptos-proptest-helpers/src/repeat_vec.rs @@ -18,7 +18,7 @@ use std::iter; /// # Examples /// /// ``` -/// use diem_proptest_helpers::RepeatVec; +/// use aptos_proptest_helpers::RepeatVec; /// /// let mut repeat_vec = RepeatVec::new(); /// repeat_vec.extend("a", 10); // logically, insert "a" 10 times @@ -33,7 +33,7 @@ use std::iter; /// The data structure doesn't care about whether the inserted items are equal or not. /// /// ``` -/// use diem_proptest_helpers::RepeatVec; +/// use aptos_proptest_helpers::RepeatVec; /// /// let mut repeat_vec = RepeatVec::new(); /// repeat_vec.extend("a", 10); // logically, insert "a" 10 times @@ -78,7 +78,7 @@ impl RepeatVec { /// # Examples /// /// ``` - /// use diem_proptest_helpers::RepeatVec; + /// use aptos_proptest_helpers::RepeatVec; /// /// let mut repeat_vec = RepeatVec::new(); /// diff --git a/crates/diem-proptest-helpers/src/unit_tests.rs b/crates/aptos-proptest-helpers/src/unit_tests.rs similarity index 100% rename from crates/diem-proptest-helpers/src/unit_tests.rs rename to crates/aptos-proptest-helpers/src/unit_tests.rs diff --git a/crates/diem-proptest-helpers/src/unit_tests/growing_subset_tests.rs b/crates/aptos-proptest-helpers/src/unit_tests/growing_subset_tests.rs similarity index 100% rename from crates/diem-proptest-helpers/src/unit_tests/growing_subset_tests.rs rename to crates/aptos-proptest-helpers/src/unit_tests/growing_subset_tests.rs diff --git a/crates/diem-proptest-helpers/src/unit_tests/pick_idx_tests.rs b/crates/aptos-proptest-helpers/src/unit_tests/pick_idx_tests.rs similarity index 100% rename from crates/diem-proptest-helpers/src/unit_tests/pick_idx_tests.rs rename to crates/aptos-proptest-helpers/src/unit_tests/pick_idx_tests.rs diff --git a/crates/diem-proptest-helpers/src/unit_tests/repeat_vec_tests.rs b/crates/aptos-proptest-helpers/src/unit_tests/repeat_vec_tests.rs similarity index 100% rename from crates/diem-proptest-helpers/src/unit_tests/repeat_vec_tests.rs rename to crates/aptos-proptest-helpers/src/unit_tests/repeat_vec_tests.rs diff --git a/crates/diem-proptest-helpers/src/value_generator.rs b/crates/aptos-proptest-helpers/src/value_generator.rs similarity index 100% rename from crates/diem-proptest-helpers/src/value_generator.rs rename to crates/aptos-proptest-helpers/src/value_generator.rs diff --git a/crates/diem-rate-limiter/Cargo.toml b/crates/aptos-rate-limiter/Cargo.toml similarity index 60% rename from crates/diem-rate-limiter/Cargo.toml rename to crates/aptos-rate-limiter/Cargo.toml index 7887ce085db5f..aceff02519ba1 100644 --- a/crates/diem-rate-limiter/Cargo.toml +++ b/crates/aptos-rate-limiter/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "diem-rate-limiter" +name = "aptos-rate-limiter" version = "0.1.0" authors = ["Diem Association "] description = "Diem implementation for rate limiter" @@ -10,10 +10,10 @@ publish = false edition = "2018" [dependencies] -diem-infallible = { path= "../../crates/diem-infallible" } -diem-workspace-hack = { version = "0.1", path = "../diem-workspace-hack" } -diem-logger = { path = "../../crates/diem-logger" } -diem-metrics = { path = "../../crates/diem-metrics" } +aptos-infallible = { path= "../../crates/aptos-infallible" } +aptos-workspace-hack = { version = "0.1", path = "../aptos-workspace-hack" } +aptos-logger = { path = "../../crates/aptos-logger" } +aptos-metrics = { path = "../../crates/aptos-metrics" } futures = "0.3.12" pin-project = "1.0.5" tokio = { version = "1.8.1", features = ["full"] } diff --git a/crates/diem-rate-limiter/src/async_lib.rs b/crates/aptos-rate-limiter/src/async_lib.rs similarity index 99% rename from crates/diem-rate-limiter/src/async_lib.rs rename to crates/aptos-rate-limiter/src/async_lib.rs index 865a54e31e55e..16e0fc107318e 100644 --- a/crates/diem-rate-limiter/src/async_lib.rs +++ b/crates/aptos-rate-limiter/src/async_lib.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 use crate::rate_limit::{Bucket, SharedBucket}; -use diem_infallible::Mutex; +use aptos_infallible::Mutex; use futures::{ io::AsyncRead, ready, diff --git a/crates/diem-rate-limiter/src/lib.rs b/crates/aptos-rate-limiter/src/lib.rs similarity index 100% rename from crates/diem-rate-limiter/src/lib.rs rename to crates/aptos-rate-limiter/src/lib.rs diff --git a/crates/diem-rate-limiter/src/main.rs b/crates/aptos-rate-limiter/src/main.rs similarity index 98% rename from crates/diem-rate-limiter/src/main.rs rename to crates/aptos-rate-limiter/src/main.rs index fb6abb2f6efd1..5dd2574a8b106 100644 --- a/crates/diem-rate-limiter/src/main.rs +++ b/crates/aptos-rate-limiter/src/main.rs @@ -1,8 +1,8 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_infallible::Mutex; -use diem_rate_limiter::{ +use aptos_infallible::Mutex; +use aptos_rate_limiter::{ async_lib::AsyncRateLimiter, rate_limit::{Bucket, SharedBucket}, }; @@ -49,7 +49,7 @@ struct RunStats { /// A main function for testing rate limiting throughput and backpressure fn main() { - diem_logger::DiemLogger::init_for_testing(); + aptos_logger::DiemLogger::init_for_testing(); println!("Starting experiments"); println!( "Bytes to test: {}, Expected Throughput(actions/s): {}, Expected Throughput(bytes/s): {}", diff --git a/crates/diem-rate-limiter/src/rate_limit.rs b/crates/aptos-rate-limiter/src/rate_limit.rs similarity index 99% rename from crates/diem-rate-limiter/src/rate_limit.rs rename to crates/aptos-rate-limiter/src/rate_limit.rs index 4e92e374775b9..fa2bd5af84c03 100644 --- a/crates/diem-rate-limiter/src/rate_limit.rs +++ b/crates/aptos-rate-limiter/src/rate_limit.rs @@ -1,9 +1,9 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_infallible::{Mutex, RwLock}; -use diem_logger::debug; -use diem_metrics::HistogramVec; +use aptos_infallible::{Mutex, RwLock}; +use aptos_logger::debug; +use aptos_metrics::HistogramVec; use std::{cmp::min, collections::HashMap, fmt::Debug, hash::Hash, sync::Arc, time::Instant}; use tokio::time::Duration; diff --git a/crates/diem-rest-client/Cargo.toml b/crates/aptos-rest-client/Cargo.toml similarity index 68% rename from crates/diem-rest-client/Cargo.toml rename to crates/aptos-rest-client/Cargo.toml index 94d8e860a04f0..35c30a02922d0 100644 --- a/crates/diem-rest-client/Cargo.toml +++ b/crates/aptos-rest-client/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "diem-rest-client" +name = "aptos-rest-client" version = "0.0.0" authors = ["Diem Association "] description = "Diem Rest client" @@ -23,9 +23,9 @@ serde_json = "1.0.64" tokio = { version = "1.8.1", features = ["full"] } url = "2.2.2" -diem-api-types = { path = "../../api/types" } -diem-crypto = { path = "../diem-crypto" } -diem-transaction-builder = { path = "../../sdk/transaction-builder" } -diem-types = { path = "../../types" } -diem-workspace-hack = { version = "0.1", path = "../diem-workspace-hack" } +aptos-api-types = { path = "../../api/types" } +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/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } diff --git a/crates/diem-rest-client/src/dpn.rs b/crates/aptos-rest-client/src/dpn.rs similarity index 88% rename from crates/diem-rest-client/src/dpn.rs rename to crates/aptos-rest-client/src/dpn.rs index 04f4d043a8a26..3c1d6a10c1ff1 100644 --- a/crates/diem-rest-client/src/dpn.rs +++ b/crates/aptos-rest-client/src/dpn.rs @@ -1,12 +1,12 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_api_types::U64; +use aptos_api_types::U64; use move_core_types::{identifier::Identifier, language_storage::StructTag}; use serde::{Deserialize, Serialize}; -pub use diem_types::account_config::{diem_root_address, BalanceResource, CORE_CODE_ADDRESS}; -pub use diem_types::on_chain_config::{ +pub use aptos_types::account_config::{aptos_root_address, BalanceResource, CORE_CODE_ADDRESS}; +pub use aptos_types::on_chain_config::{ config_struct_tag, ConfigurationResource, DiemVersion as OnChainDiemVersion, OnChainConfig, }; diff --git a/crates/diem-rest-client/src/error.rs b/crates/aptos-rest-client/src/error.rs similarity index 100% rename from crates/diem-rest-client/src/error.rs rename to crates/aptos-rest-client/src/error.rs diff --git a/crates/diem-rest-client/src/faucet.rs b/crates/aptos-rest-client/src/faucet.rs similarity index 99% rename from crates/diem-rest-client/src/faucet.rs rename to crates/aptos-rest-client/src/faucet.rs index 4f0ddc5017336..65b82fa24d9b2 100644 --- a/crates/diem-rest-client/src/faucet.rs +++ b/crates/aptos-rest-client/src/faucet.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 use crate::{error::Error, Client, Result}; -use diem_types::{ +use aptos_types::{ account_address::AccountAddress, transaction::{authenticator::AuthenticationKey, SignedTransaction}, }; diff --git a/crates/diem-rest-client/src/lib.rs b/crates/aptos-rest-client/src/lib.rs similarity index 96% rename from crates/diem-rest-client/src/lib.rs rename to crates/aptos-rest-client/src/lib.rs index b124777496819..5f076c8217392 100644 --- a/crates/diem-rest-client/src/lib.rs +++ b/crates/aptos-rest-client/src/lib.rs @@ -2,9 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 use anyhow::{anyhow, Result}; -pub use diem_api_types::{MoveModuleBytecode, PendingTransaction, Transaction}; -use diem_crypto::HashValue; -use diem_types::{account_address::AccountAddress, transaction::SignedTransaction}; +pub use aptos_api_types::{MoveModuleBytecode, PendingTransaction, Transaction}; +use aptos_crypto::HashValue; +use aptos_types::{account_address::AccountAddress, transaction::SignedTransaction}; use move_core_types::{ identifier::Identifier, language_storage::{StructTag, TypeTag}, @@ -15,7 +15,7 @@ use serde::{de::DeserializeOwned, Deserialize}; use std::time::Duration; use url::Url; -pub use diem_api_types; +pub use aptos_api_types; pub mod error; pub mod faucet; pub use faucet::FaucetClient; @@ -42,7 +42,7 @@ cfg_dpn! { } const BCS_CONTENT_TYPE: &str = "application/x.diem.signed_transaction+bcs"; -const USER_AGENT: &str = concat!("diem-client-sdk-rust / ", env!("CARGO_PKG_VERSION")); +const USER_AGENT: &str = concat!("aptos-client-sdk-rust / ", env!("CARGO_PKG_VERSION")); #[derive(Clone, Debug)] pub struct Client { @@ -96,12 +96,12 @@ impl Client { // Returns root account DiemAccount::Config resource pub async fn get_diem_version(&self) -> Result>> { - self.get_resource::>(dpn::diem_root_address(), &dpn::config_struct_tag(dpn::diem_version_identifier())).await + self.get_resource::>(dpn::aptos_root_address(), &dpn::config_struct_tag(dpn::diem_version_identifier())).await } // Returns root account DiemAccount::Configuration resource pub async fn get_epoch_configuration(&self) -> Result> { - self.get_resource::(dpn::diem_root_address(), &dpn::ConfigurationResource::struct_tag()).await + self.get_resource::(dpn::aptos_root_address(), &dpn::ConfigurationResource::struct_tag()).await } } diff --git a/crates/diem-rest-client/src/response.rs b/crates/aptos-rest-client/src/response.rs similarity index 100% rename from crates/diem-rest-client/src/response.rs rename to crates/aptos-rest-client/src/response.rs diff --git a/crates/diem-rest-client/src/state.rs b/crates/aptos-rest-client/src/state.rs similarity index 83% rename from crates/diem-rest-client/src/state.rs rename to crates/aptos-rest-client/src/state.rs index 6c2b6dd822000..e36c16226f039 100644 --- a/crates/diem-rest-client/src/state.rs +++ b/crates/aptos-rest-client/src/state.rs @@ -1,7 +1,7 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_api_types::{X_DIEM_CHAIN_ID, X_DIEM_LEDGER_TIMESTAMP, X_DIEM_LEDGER_VERSION}; +use aptos_api_types::{X_APTOS_CHAIN_ID, X_APTOS_LEDGER_TIMESTAMP, X_APTOS_LEDGER_VERSION}; #[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd)] pub struct State { @@ -13,15 +13,15 @@ pub struct State { impl State { pub fn from_headers(headers: &reqwest::header::HeaderMap) -> anyhow::Result { let maybe_chain_id = headers - .get(X_DIEM_CHAIN_ID) + .get(X_APTOS_CHAIN_ID) .and_then(|h| h.to_str().ok()) .and_then(|s| s.parse().ok()); let maybe_version = headers - .get(X_DIEM_LEDGER_VERSION) + .get(X_APTOS_LEDGER_VERSION) .and_then(|h| h.to_str().ok()) .and_then(|s| s.parse().ok()); let maybe_timestamp = headers - .get(X_DIEM_LEDGER_TIMESTAMP) + .get(X_APTOS_LEDGER_TIMESTAMP) .and_then(|h| h.to_str().ok()) .and_then(|s| s.parse().ok()); diff --git a/crates/diem-rest-client/src/types.rs b/crates/aptos-rest-client/src/types.rs similarity index 95% rename from crates/diem-rest-client/src/types.rs rename to crates/aptos-rest-client/src/types.rs index a205051baae00..a0f7c84d7f769 100644 --- a/crates/diem-rest-client/src/types.rs +++ b/crates/aptos-rest-client/src/types.rs @@ -1,8 +1,8 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_api_types::{Address, U64}; -use diem_types::transaction::authenticator::AuthenticationKey; +use aptos_api_types::{Address, U64}; +use aptos_types::transaction::authenticator::AuthenticationKey; use move_core_types::{language_storage::StructTag, parser::parse_struct_tag}; use serde::{Deserialize, Deserializer, Serialize}; use std::str::FromStr; diff --git a/crates/diem-rest-client/src/views.rs b/crates/aptos-rest-client/src/views.rs similarity index 99% rename from crates/diem-rest-client/src/views.rs rename to crates/aptos-rest-client/src/views.rs index 7afffe1e4a778..8bab310a35f91 100644 --- a/crates/diem-rest-client/src/views.rs +++ b/crates/aptos-rest-client/src/views.rs @@ -2,9 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 use anyhow::{ensure, format_err, Error, Result}; -use diem_crypto::hash::{CryptoHash, HashValue}; -use diem_transaction_builder::{error_explain, stdlib::ScriptCall}; -use diem_types::{ +use aptos_crypto::hash::{CryptoHash, HashValue}; +use aptos_transaction_builder::{error_explain, stdlib::ScriptCall}; +use aptos_types::{ account_config::{ AccountRole, AdminTransactionEvent, BalanceResource, BaseUrlRotationEvent, BurnEvent, CancelBurnEvent, ComplianceKeyRotationEvent, CreateAccountEvent, CurrencyInfoResource, @@ -600,15 +600,15 @@ impl MetadataView { } } - pub fn with_diem_root(&mut self, diem_root: &AccountState) -> Result<()> { - if let Some(vm_publishing_option) = diem_root.get_vm_publishing_option()? { + pub fn with_aptos_root(&mut self, aptos_root: &AccountState) -> Result<()> { + if let Some(vm_publishing_option) = aptos_root.get_vm_publishing_option()? { self.script_hash_allow_list = Some(vm_publishing_option.script_allow_list); self.module_publishing_allowed = Some(vm_publishing_option.is_open_module); } - if let Some(diem_version) = diem_root.get_diem_version()? { + if let Some(diem_version) = aptos_root.get_diem_version()? { self.diem_version = Some(diem_version.major); } - if let Some(limit) = diem_root.get_resource::()? { + if let Some(limit) = aptos_root.get_resource::()? { self.dual_attestation_limit = Some(limit.micro_xdx_limit); } Ok(()) @@ -1565,7 +1565,7 @@ mod tests { AccountRoleView, AccountStateWithProofView, AmountView, EventDataView, MetadataView, PreburnWithMetadataView, TransactionDataView, VMStatusView, }; - use diem_types::{contract_event::ContractEvent, event::EventKey}; + use aptos_types::{contract_event::ContractEvent, event::EventKey}; use move_core_types::language_storage::TypeTag; use serde_json::json; use std::{convert::TryInto, str::FromStr}; diff --git a/crates/diem-retrier/Cargo.toml b/crates/aptos-retrier/Cargo.toml similarity index 68% rename from crates/diem-retrier/Cargo.toml rename to crates/aptos-retrier/Cargo.toml index f1a0558cf113a..4d06e5c5a4742 100644 --- a/crates/diem-retrier/Cargo.toml +++ b/crates/aptos-retrier/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "diem-retrier" +name = "aptos-retrier" version = "0.1.0" authors = ["Diem Association "] description = "Diem implementation for retries of operations" @@ -10,6 +10,6 @@ publish = false edition = "2018" [dependencies] -diem-workspace-hack = { version = "0.1", path = "../diem-workspace-hack" } +aptos-workspace-hack = { version = "0.1", path = "../aptos-workspace-hack" } tokio = { version = "1.8.1", features = ["time"] } -diem-logger = { path = "../../crates/diem-logger"} +aptos-logger = { path = "../../crates/aptos-logger"} diff --git a/crates/diem-retrier/src/lib.rs b/crates/aptos-retrier/src/lib.rs similarity index 99% rename from crates/diem-retrier/src/lib.rs rename to crates/aptos-retrier/src/lib.rs index 5c3179f6c89ed..6d8a680b038ff 100644 --- a/crates/diem-retrier/src/lib.rs +++ b/crates/aptos-retrier/src/lib.rs @@ -3,7 +3,7 @@ #![forbid(unsafe_code)] -use diem_logger::debug; +use aptos_logger::debug; use std::{cmp::min, future::Future, pin::Pin, thread, time::Duration}; /// Given an operation retries it successfully sleeping everytime it fails diff --git a/crates/diem-temppath/Cargo.toml b/crates/aptos-temppath/Cargo.toml similarity index 65% rename from crates/diem-temppath/Cargo.toml rename to crates/aptos-temppath/Cargo.toml index f7f6d642f2786..49d4472a97d14 100644 --- a/crates/diem-temppath/Cargo.toml +++ b/crates/aptos-temppath/Cargo.toml @@ -1,8 +1,8 @@ [package] -name = "diem-temppath" +name = "aptos-temppath" version = "0.1.0" authors = ["Diem Association "] -description = "Diem diem-temppath" +description = "Diem aptos-temppath" repository = "https://github.com/diem/diem" homepage = "https://diem.com" license = "Apache-2.0" @@ -11,5 +11,5 @@ edition = "2018" [dependencies] hex = "0.4.3" -diem-workspace-hack = { version = "0.1", path = "../diem-workspace-hack" } +aptos-workspace-hack = { version = "0.1", path = "../aptos-workspace-hack" } rand = "0.8.3" diff --git a/crates/diem-temppath/src/lib.rs b/crates/aptos-temppath/src/lib.rs similarity index 100% rename from crates/diem-temppath/src/lib.rs rename to crates/aptos-temppath/src/lib.rs diff --git a/crates/diem-time-service/Cargo.toml b/crates/aptos-time-service/Cargo.toml similarity index 81% rename from crates/diem-time-service/Cargo.toml rename to crates/aptos-time-service/Cargo.toml index 1fe00e436b639..d199b5e74b3fd 100644 --- a/crates/diem-time-service/Cargo.toml +++ b/crates/aptos-time-service/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "diem-time-service" +name = "aptos-time-service" version = "0.1.0" authors = ["Diem Association "] description = "Diem Time Service" @@ -16,8 +16,8 @@ pin-project = { version = "1.0.5", optional = true } thiserror = "1.0.24" tokio = { version = "1.8.1", features = ["macros", "rt-multi-thread", "time"], optional = true } -diem-infallible = { path = "../../crates/diem-infallible" } -diem-workspace-hack = { version = "0.1", path = "../diem-workspace-hack" } +aptos-infallible = { path = "../../crates/aptos-infallible" } +aptos-workspace-hack = { version = "0.1", path = "../aptos-workspace-hack" } [dev-dependencies] futures = "0.3.12" diff --git a/crates/diem-time-service/src/interval.rs b/crates/aptos-time-service/src/interval.rs similarity index 100% rename from crates/diem-time-service/src/interval.rs rename to crates/aptos-time-service/src/interval.rs diff --git a/crates/diem-time-service/src/lib.rs b/crates/aptos-time-service/src/lib.rs similarity index 100% rename from crates/diem-time-service/src/lib.rs rename to crates/aptos-time-service/src/lib.rs diff --git a/crates/diem-time-service/src/mock.rs b/crates/aptos-time-service/src/mock.rs similarity index 99% rename from crates/diem-time-service/src/mock.rs rename to crates/aptos-time-service/src/mock.rs index 6185db47bb728..bf72cfb9227ce 100644 --- a/crates/diem-time-service/src/mock.rs +++ b/crates/aptos-time-service/src/mock.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 use crate::{Sleep, SleepTrait, TimeServiceTrait, ZERO_DURATION}; -use diem_infallible::Mutex; +use aptos_infallible::Mutex; use futures::future::Future; use std::{ cmp::max, diff --git a/crates/diem-time-service/src/real.rs b/crates/aptos-time-service/src/real.rs similarity index 96% rename from crates/diem-time-service/src/real.rs rename to crates/aptos-time-service/src/real.rs index 643f63caf9b9d..e86f1a33757a0 100644 --- a/crates/diem-time-service/src/real.rs +++ b/crates/aptos-time-service/src/real.rs @@ -33,7 +33,7 @@ impl TimeServiceTrait for RealTimeService { } fn now_unix_time(&self) -> Duration { - diem_infallible::duration_since_epoch() + aptos_infallible::duration_since_epoch() } #[cfg(any(test, feature = "async"))] diff --git a/crates/diem-time-service/src/timeout.rs b/crates/aptos-time-service/src/timeout.rs similarity index 100% rename from crates/diem-time-service/src/timeout.rs rename to crates/aptos-time-service/src/timeout.rs diff --git a/crates/diem-wallet/Cargo.toml b/crates/aptos-wallet/Cargo.toml similarity index 61% rename from crates/diem-wallet/Cargo.toml rename to crates/aptos-wallet/Cargo.toml index 37c66358842fe..1a7a2336eb3a2 100644 --- a/crates/diem-wallet/Cargo.toml +++ b/crates/aptos-wallet/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "diem-wallet" +name = "aptos-wallet" version = "0.1.0" authors = ["Diem Association "] description = "Diem wallet" @@ -19,12 +19,12 @@ pbkdf2 = "0.7.3" serde = "1.0.124" sha2 = "0.9.3" thiserror = "1.0.24" -diem-crypto = { path = "../diem-crypto", features = ["fuzzing"] } -diem-temppath = { path = "../diem-temppath" } -diem-types = { path = "../../types" } -diem-workspace-hack = { version = "0.1", path = "../diem-workspace-hack" } +aptos-crypto = { path = "../aptos-crypto", features = ["fuzzing"] } +aptos-temppath = { path = "../aptos-temppath" } +aptos-types = { path = "../../types" } +aptos-workspace-hack = { version = "0.1", path = "../aptos-workspace-hack" } mirai-annotations = "1.10.1" [features] default = [] -fuzzing = ["diem-types/fuzzing"] +fuzzing = ["aptos-types/fuzzing"] diff --git a/crates/diem-wallet/README.md b/crates/aptos-wallet/README.md similarity index 77% rename from crates/diem-wallet/README.md rename to crates/aptos-wallet/README.md index 37a37d01792f1..1f754b95325f0 100644 --- a/crates/diem-wallet/README.md +++ b/crates/aptos-wallet/README.md @@ -4,7 +4,7 @@ Diem Wallet is a pure-rust implementation of hierarchical key derivation for Sec # Overview -`diem-wallet` is a library providing hierarchical key derivation for SecretKey material in Diem. The following crate is largely inspired by [`rust-wallet`](https://github.com/rust-bitcoin/rust-wallet) with minor modifications to the key derivation function. Note that Diem makes use of the ed25519 Edwards Curve Digital Signature Algorithm (EdDSA) over the Edwards Cruve cruve25519. Therefore, BIP32-like PublicKey derivation is not possible without falling back to a traditional non-deterministic Schnorr signature algorithm. For this reason, we modified the key derivation function to a simpler alternative. +`aptos-wallet` is a library providing hierarchical key derivation for SecretKey material in Diem. The following crate is largely inspired by [`rust-wallet`](https://github.com/rust-bitcoin/rust-wallet) with minor modifications to the key derivation function. Note that Diem makes use of the ed25519 Edwards Curve Digital Signature Algorithm (EdDSA) over the Edwards Cruve cruve25519. Therefore, BIP32-like PublicKey derivation is not possible without falling back to a traditional non-deterministic Schnorr signature algorithm. For this reason, we modified the key derivation function to a simpler alternative. The `internal_macros.rs` is taken from [`rust-bitcoin`](https://github.com/rust-bitcoin/rust-bitcoin/blob/master/src/internal_macros.rs) and `mnemonic.rs` is a slightly modified version of the file with the same name from [`rust-wallet`](https://github.com/rust-bitcoin/rust-wallet/blob/master/src/mnemonic.rs), while `error.rs`, `key_factor.rs` and `wallet_library.rs` are modified to present a minimalist wallet library for the Diem Client. Note that `mnemonic.rs` from `rust-wallet` adheres to the [`BIP39`](https://github.com/bitcoin/bips/blob/master/bip-0039.mediawiki) spec. diff --git a/crates/diem-wallet/src/error.rs b/crates/aptos-wallet/src/error.rs similarity index 100% rename from crates/diem-wallet/src/error.rs rename to crates/aptos-wallet/src/error.rs diff --git a/crates/diem-wallet/src/internal_macros.rs b/crates/aptos-wallet/src/internal_macros.rs similarity index 98% rename from crates/diem-wallet/src/internal_macros.rs rename to crates/aptos-wallet/src/internal_macros.rs index b9582e209a13c..20a5eb414a1c3 100644 --- a/crates/diem-wallet/src/internal_macros.rs +++ b/crates/aptos-wallet/src/internal_macros.rs @@ -50,7 +50,7 @@ macro_rules! impl_array_newtype { #[inline] fn cmp(&self, other: &$thing) -> ::std::cmp::Ordering { // manually implement comparison to get little-endian ordering - // (we need this for our numeric diem_types; non-numeric ones shouldn't + // (we need this for our numeric aptos_types; non-numeric ones shouldn't // be ordered anyway except to put them in BTrees or whatever, and // they don't care how we order as long as we're consistent). for i in 0..$len { diff --git a/crates/diem-wallet/src/io_utils.rs b/crates/aptos-wallet/src/io_utils.rs similarity index 100% rename from crates/diem-wallet/src/io_utils.rs rename to crates/aptos-wallet/src/io_utils.rs diff --git a/crates/diem-wallet/src/key_factory.rs b/crates/aptos-wallet/src/key_factory.rs similarity index 97% rename from crates/diem-wallet/src/key_factory.rs rename to crates/aptos-wallet/src/key_factory.rs index 37d6111285e6b..499e9dcb47ea6 100644 --- a/crates/diem-wallet/src/key_factory.rs +++ b/crates/aptos-wallet/src/key_factory.rs @@ -17,15 +17,15 @@ use crate::mnemonic::Mnemonic; use anyhow::{anyhow, Result}; -use byteorder::{ByteOrder, LittleEndian}; -use diem_crypto::{ +use aptos_crypto::{ compat::Sha3_256, ed25519::{Ed25519PrivateKey, Ed25519PublicKey, Ed25519Signature}, hash::CryptoHash, hkdf::Hkdf, traits::SigningKey, }; -use diem_types::{account_address::AccountAddress, transaction::authenticator::AuthenticationKey}; +use aptos_types::{account_address::AccountAddress, transaction::authenticator::AuthenticationKey}; +use byteorder::{ByteOrder, LittleEndian}; use hmac::Hmac; use mirai_annotations::*; use pbkdf2::pbkdf2; @@ -101,7 +101,7 @@ impl ExtendedPrivKey { /// Compute the account address for this account's public key pub fn get_address(&self) -> AccountAddress { - diem_types::account_address::from_public_key(&self.get_public()) + aptos_types::account_address::from_public_key(&self.get_public()) } /// Get private key @@ -123,7 +123,7 @@ impl ExtendedPrivKey { /// /// The domain separator hash is derived automatically from a `#[derive(CryptoHasher, /// BCSCryptoHash)]` annotation, or can be declared manually in a process - /// described in `diem_crypto::hash`. + /// described in `aptos_crypto::hash`. /// pub fn sign(&self, msg: &T) -> Ed25519Signature { self.private_key.sign(msg) diff --git a/crates/diem-wallet/src/lib.rs b/crates/aptos-wallet/src/lib.rs similarity index 100% rename from crates/diem-wallet/src/lib.rs rename to crates/aptos-wallet/src/lib.rs diff --git a/crates/diem-wallet/src/mnemonic.rs b/crates/aptos-wallet/src/mnemonic.rs similarity index 99% rename from crates/diem-wallet/src/mnemonic.rs rename to crates/aptos-wallet/src/mnemonic.rs index d645888885b7e..436e8e7e9189e 100644 --- a/crates/diem-wallet/src/mnemonic.rs +++ b/crates/aptos-wallet/src/mnemonic.rs @@ -9,7 +9,7 @@ use crate::error::WalletError; use anyhow::Result; #[cfg(test)] -use diem_temppath::TempPath; +use aptos_temppath::TempPath; use mirai_annotations::*; #[cfg(test)] use rand::rngs::OsRng; diff --git a/crates/diem-wallet/src/wallet_library.rs b/crates/aptos-wallet/src/wallet_library.rs similarity index 99% rename from crates/diem-wallet/src/wallet_library.rs rename to crates/aptos-wallet/src/wallet_library.rs index fea6f6f6e4cf7..0fb3289a296ed 100644 --- a/crates/diem-wallet/src/wallet_library.rs +++ b/crates/aptos-wallet/src/wallet_library.rs @@ -18,8 +18,8 @@ use crate::{ mnemonic::Mnemonic, }; use anyhow::Result; -use diem_crypto::ed25519::Ed25519PrivateKey; -use diem_types::{ +use aptos_crypto::ed25519::Ed25519PrivateKey; +use aptos_types::{ account_address::AccountAddress, transaction::{ authenticator::AuthenticationKey, helpers::TransactionSigner, RawTransaction, diff --git a/crates/diem-workspace-hack/.gitattributes b/crates/aptos-workspace-hack/.gitattributes similarity index 100% rename from crates/diem-workspace-hack/.gitattributes rename to crates/aptos-workspace-hack/.gitattributes diff --git a/crates/diem-workspace-hack/Cargo.toml b/crates/aptos-workspace-hack/Cargo.toml similarity index 99% rename from crates/diem-workspace-hack/Cargo.toml rename to crates/aptos-workspace-hack/Cargo.toml index 090fefd1196f9..378ff3aaa198a 100644 --- a/crates/diem-workspace-hack/Cargo.toml +++ b/crates/aptos-workspace-hack/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "diem-workspace-hack" +name = "aptos-workspace-hack" version = "0.1.0" authors = ["Diem Association "] description = "Diem workspace hack" diff --git a/crates/diem-workspace-hack/README.md b/crates/aptos-workspace-hack/README.md similarity index 95% rename from crates/diem-workspace-hack/README.md rename to crates/aptos-workspace-hack/README.md index b7d9147b98b02..5e6918b23b96b 100644 --- a/crates/diem-workspace-hack/README.md +++ b/crates/aptos-workspace-hack/README.md @@ -1,4 +1,4 @@ -# diem-workspace-hack +# aptos-workspace-hack This crate is hack to unify 3rd party dependency crate features in order to have better compilation caching. Each time cargo is invoked, it computes diff --git a/crates/diem-workspace-hack/build.rs b/crates/aptos-workspace-hack/build.rs similarity index 100% rename from crates/diem-workspace-hack/build.rs rename to crates/aptos-workspace-hack/build.rs diff --git a/crates/diem-workspace-hack/src/lib.rs b/crates/aptos-workspace-hack/src/lib.rs similarity index 100% rename from crates/diem-workspace-hack/src/lib.rs rename to crates/aptos-workspace-hack/src/lib.rs diff --git a/crates/bounded-executor/Cargo.toml b/crates/bounded-executor/Cargo.toml index fdd4912d4f1bd..6187fe9edd370 100644 --- a/crates/bounded-executor/Cargo.toml +++ b/crates/bounded-executor/Cargo.toml @@ -11,7 +11,7 @@ edition = "2018" [dependencies] futures = "0.3.12" -diem-workspace-hack = { version = "0.1", path = "../diem-workspace-hack" } +aptos-workspace-hack = { version = "0.1", path = "../aptos-workspace-hack" } tokio = { version = "1.8.1", features = ["sync"] } [dev-dependencies] diff --git a/crates/channel/Cargo.toml b/crates/channel/Cargo.toml index 183f3db09bd81..92e5709847b00 100644 --- a/crates/channel/Cargo.toml +++ b/crates/channel/Cargo.toml @@ -12,10 +12,10 @@ edition = "2018" [dependencies] anyhow = "1.0.52" futures = "0.3.12" -diem-metrics = { path = "../../crates/diem-metrics" } -diem-infallible = { path = "../../crates/diem-infallible" } -diem-workspace-hack = { version = "0.1", path = "../diem-workspace-hack" } +aptos-metrics = { path = "../../crates/aptos-metrics" } +aptos-infallible = { path = "../../crates/aptos-infallible" } +aptos-workspace-hack = { version = "0.1", path = "../aptos-workspace-hack" } [dev-dependencies] -diem-types = { path = "../../types" } +aptos-types = { path = "../../types" } tokio = { version = "1.8.1", features = ["full"] } diff --git a/crates/channel/src/diem_channel.rs b/crates/channel/src/aptos_channel.rs similarity index 93% rename from crates/channel/src/diem_channel.rs rename to crates/channel/src/aptos_channel.rs index c99a22921f726..890bed352eb69 100644 --- a/crates/channel/src/diem_channel.rs +++ b/crates/channel/src/aptos_channel.rs @@ -1,16 +1,16 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -//! diem_channel provides an mpsc channel which has two ends `diem_channel::Receiver` -//! and `diem_channel::Sender` similar to existing mpsc data structures. +//! aptos_channel provides an mpsc channel which has two ends `aptos_channel::Receiver` +//! and `aptos_channel::Sender` similar to existing mpsc data structures. //! What makes it different from existing mpsc channels is that we have full control //! over how the internal queueing in the channel happens and how we schedule messages //! to be sent out from this channel. //! Internally, it uses the `PerKeyQueue` to store messages use crate::message_queues::{PerKeyQueue, QueueStyle}; use anyhow::{ensure, Result}; -use diem_infallible::{Mutex, NonZeroUsize}; -use diem_metrics::IntCounterVec; +use aptos_infallible::{Mutex, NonZeroUsize}; +use aptos_metrics::IntCounterVec; use futures::{ channel::oneshot, stream::{FusedStream, Stream}, @@ -46,13 +46,13 @@ struct SharedState { stream_terminated: bool, } -/// The sending end of the diem_channel. +/// The sending end of the aptos_channel. #[derive(Debug)] pub struct Sender { shared_state: Arc>>, } -/// The status of an element inserted into a diem_channel. If the element is successfully +/// The status of an element inserted into a aptos_channel. If the element is successfully /// dequeued, ElementStatus::Dequeued is sent to the sender. If it is dropped /// ElementStatus::Dropped is sent to the sender along with the dropped element. pub enum ElementStatus { @@ -139,7 +139,7 @@ impl Drop for Sender { } } -/// The receiving end of the diem_channel. +/// The receiving end of the aptos_channel. #[derive(Debug)] pub struct Receiver { shared_state: Arc>>, @@ -191,7 +191,7 @@ impl FusedStream for Receiver { } } -/// Configuration for a new diem_channel queue. +/// Configuration for a new aptos_channel queue. #[derive(Clone, Copy)] pub struct Config { pub queue_style: QueueStyle, @@ -200,7 +200,7 @@ pub struct Config { } impl Config { - /// The diem_channel has a "sub-queue" per key. The `max_capacity` controls + /// The aptos_channel has a "sub-queue" per key. The `max_capacity` controls /// the capacity of each "sub-queue"; when the queues exceed the max /// capacity the messages will be dropped according to the queue style/eviction /// policy. @@ -237,7 +237,7 @@ pub fn new( counters: Option<&'static IntCounterVec>, ) -> (Sender, Receiver) { let max_queue_size_per_key = - NonZeroUsize!(max_queue_size_per_key, "diem_channel cannot be of size 0"); + NonZeroUsize!(max_queue_size_per_key, "aptos_channel cannot be of size 0"); let shared_state = Arc::new(Mutex::new(SharedState { internal_queue: PerKeyQueue::new(queue_style, max_queue_size_per_key, counters), waker: None, diff --git a/crates/channel/src/diem_channel_test.rs b/crates/channel/src/aptos_channel_test.rs similarity index 88% rename from crates/channel/src/diem_channel_test.rs rename to crates/channel/src/aptos_channel_test.rs index 2af83d82982c4..150d936acaf79 100644 --- a/crates/channel/src/diem_channel_test.rs +++ b/crates/channel/src/aptos_channel_test.rs @@ -1,8 +1,8 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use crate::{diem_channel, diem_channel::ElementStatus, message_queues::QueueStyle}; -use diem_types::account_address::AccountAddress; +use crate::{aptos_channel, aptos_channel::ElementStatus, message_queues::QueueStyle}; +use aptos_types::account_address::AccountAddress; use futures::{ channel::oneshot, executor::block_on, @@ -14,7 +14,7 @@ use tokio::{runtime::Runtime, time::sleep}; #[test] fn test_send_recv_order() { - let (sender, mut receiver) = diem_channel::new(QueueStyle::FIFO, 10, None); + let (sender, mut receiver) = aptos_channel::new(QueueStyle::FIFO, 10, None); sender.push(0, 0).unwrap(); sender.push(0, 1).unwrap(); sender.push(0, 2).unwrap(); @@ -33,14 +33,14 @@ fn test_send_recv_order() { #[test] fn test_empty() { - let (_, mut receiver) = diem_channel::new::(QueueStyle::FIFO, 10, None); + let (_, mut receiver) = aptos_channel::new::(QueueStyle::FIFO, 10, None); // Ensures that there is no other value which is ready assert_eq!(receiver.select_next_some().now_or_never(), None); } #[test] fn test_waker() { - let (sender, mut receiver) = diem_channel::new(QueueStyle::FIFO, 10, None); + let (sender, mut receiver) = aptos_channel::new(QueueStyle::FIFO, 10, None); // Ensures that there is no other value which is ready assert_eq!(receiver.select_next_some().now_or_never(), None); let f1 = async move { @@ -62,7 +62,7 @@ fn test_waker() { #[test] fn test_sender_clone() { - let (sender, mut receiver) = diem_channel::new(QueueStyle::FIFO, 5, None); + let (sender, mut receiver) = aptos_channel::new(QueueStyle::FIFO, 5, None); // Ensures that there is no other value which is ready assert_eq!(receiver.select_next_some().now_or_never(), None); @@ -92,7 +92,7 @@ fn test_multiple_validators_helper( num_messages_per_validator: usize, expected_last_message: usize, ) { - let (sender, mut receiver) = diem_channel::new(queue_style, 1, None); + let (sender, mut receiver) = aptos_channel::new(queue_style, 1, None); let num_validators = 128; for message in 0..num_messages_per_validator { for validator in 0..num_validators { @@ -127,7 +127,7 @@ fn test_multiple_validators_lifo() { #[test] fn test_feedback_on_drop() { - let (sender, mut receiver) = diem_channel::new(QueueStyle::FIFO, 3, None); + let (sender, mut receiver) = aptos_channel::new(QueueStyle::FIFO, 3, None); sender.push(0, 'a').unwrap(); sender.push(0, 'b').unwrap(); let (c_status_tx, c_status_rx) = oneshot::channel(); diff --git a/crates/channel/src/lib.rs b/crates/channel/src/lib.rs index 0d585dbb16e86..ebee58291b35c 100644 --- a/crates/channel/src/lib.rs +++ b/crates/channel/src/lib.rs @@ -4,16 +4,16 @@ #![forbid(unsafe_code)] //! Provides an mpsc (multi-producer single-consumer) channel wrapped in an -//! [`IntGauge`](diem_metrics::IntGauge) that counts the number of currently +//! [`IntGauge`](aptos_metrics::IntGauge) that counts the number of currently //! queued items. While there is only one [`channel::Receiver`], there can be //! many [`channel::Sender`]s, which are also cheap to clone. //! -//! This channel differs from our other channel implementation, [`channel::diem_channel`], +//! This channel differs from our other channel implementation, [`channel::aptos_channel`], //! in that it is just a single queue (vs. different queues for different keys) //! with backpressure (senders will block if the queue is full instead of evicting //! another item in the queue) that only implements FIFO (vs. LIFO or KLAST). -use diem_metrics::IntGauge; +use aptos_metrics::IntGauge; use futures::{ channel::mpsc, sink::Sink, @@ -25,9 +25,9 @@ use std::pin::Pin; #[cfg(test)] mod test; -pub mod diem_channel; +pub mod aptos_channel; #[cfg(test)] -mod diem_channel_test; +mod aptos_channel_test; pub mod message_queues; #[cfg(test)] diff --git a/crates/channel/src/message_queues.rs b/crates/channel/src/message_queues.rs index 15b72cbbbe9b6..220195d8cf3a2 100644 --- a/crates/channel/src/message_queues.rs +++ b/crates/channel/src/message_queues.rs @@ -1,7 +1,7 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_metrics::IntCounterVec; +use aptos_metrics::IntCounterVec; use std::{ collections::{HashMap, VecDeque}, fmt::{Debug, Formatter, Result}, @@ -174,7 +174,7 @@ impl PerKeyQueue { // Remove empty per-key-queues every `POPS_PER_GC` successful dequeue // operations. // - // diem-channel never removes keys from its PerKeyQueue (without + // aptos-channel never removes keys from its PerKeyQueue (without // this logic). This works fine for the validator network, where we // have a bounded set of peers that almost never changes; however, // this does not work for servicing public clients, where we can have diff --git a/crates/channel/src/message_queues_test.rs b/crates/channel/src/message_queues_test.rs index 7fe68489b12e1..dbaff5b6e13dd 100644 --- a/crates/channel/src/message_queues_test.rs +++ b/crates/channel/src/message_queues_test.rs @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 use crate::message_queues::{PerKeyQueue, QueueStyle}; -use diem_infallible::NonZeroUsize; -use diem_types::account_address::AccountAddress; +use aptos_infallible::NonZeroUsize; +use aptos_types::account_address::AccountAddress; /// This represents a proposal message from a validator #[derive(Debug, PartialEq)] diff --git a/crates/channel/src/test.rs b/crates/channel/src/test.rs index eaf626e4fe217..1dfd2b39fd1fc 100644 --- a/crates/channel/src/test.rs +++ b/crates/channel/src/test.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 use crate as channel; -use diem_metrics::IntGauge; +use aptos_metrics::IntGauge; use futures::{ executor::block_on, task::{noop_waker, Context, Poll}, diff --git a/crates/channel/tests/many-keys-stress-test.rs b/crates/channel/tests/many-keys-stress-test.rs index 0826c757cfe7a..f12e657ca5228 100644 --- a/crates/channel/tests/many-keys-stress-test.rs +++ b/crates/channel/tests/many-keys-stress-test.rs @@ -1,7 +1,7 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use channel::{diem_channel, message_queues::QueueStyle}; +use channel::{aptos_channel, message_queues::QueueStyle}; use futures::{executor::block_on, stream::StreamExt}; use std::{ io::{Cursor, Write}, @@ -32,7 +32,7 @@ pub fn run(args: Args) { static NUM_POP: AtomicUsize = AtomicUsize::new(0); static IS_DONE: AtomicBool = AtomicBool::new(false); - let (sender, mut receiver) = diem_channel::new::<[u8; KEY_SIZE_BYTES], [u8; MSG_SIZE_BYTES]>( + let (sender, mut receiver) = aptos_channel::new::<[u8; KEY_SIZE_BYTES], [u8; MSG_SIZE_BYTES]>( QueueStyle::FIFO, args.max_queue_size, None, diff --git a/crates/crash-handler/Cargo.toml b/crates/crash-handler/Cargo.toml index ecd5d815c0b2b..766c6504089eb 100644 --- a/crates/crash-handler/Cargo.toml +++ b/crates/crash-handler/Cargo.toml @@ -13,6 +13,6 @@ edition = "2018" backtrace = "0.3.56" toml = "0.5.8" -diem-logger = { path = "../../crates/diem-logger" } -diem-workspace-hack = { version = "0.1", path = "../diem-workspace-hack" } +aptos-logger = { path = "../../crates/aptos-logger" } +aptos-workspace-hack = { version = "0.1", path = "../aptos-workspace-hack" } serde = { version = "1.0.124", features = ["derive"] } diff --git a/crates/crash-handler/src/lib.rs b/crates/crash-handler/src/lib.rs index 76e4845b14633..68a1c3c8f54cb 100644 --- a/crates/crash-handler/src/lib.rs +++ b/crates/crash-handler/src/lib.rs @@ -3,8 +3,8 @@ #![forbid(unsafe_code)] +use aptos_logger::prelude::*; use backtrace::Backtrace; -use diem_logger::prelude::*; use serde::Serialize; use std::{ panic::{self, PanicInfo}, @@ -38,7 +38,7 @@ fn handle_panic(panic_info: &PanicInfo<'_>) { error!("{}", crash_info = toml::to_string_pretty(&info).unwrap()); // Wait till the logs have been flushed - diem_logger::flush(); + aptos_logger::flush(); // Kill the process process::exit(12); diff --git a/crates/debug-interface/Cargo.toml b/crates/debug-interface/Cargo.toml index 67b634505d2ff..d688b5a9ce454 100644 --- a/crates/debug-interface/Cargo.toml +++ b/crates/debug-interface/Cargo.toml @@ -18,7 +18,7 @@ serde_json = "1.0.64" tokio = { version = "1.8.1", features = ["full"] } warp = "0.3.2" -diem-config = { path = "../../config" } -diem-logger = { path = "../../crates/diem-logger" } -diem-metrics = { path = "../../crates/diem-metrics" } -diem-workspace-hack = { version = "0.1", path = "../diem-workspace-hack" } +aptos-config = { path = "../../config" } +aptos-logger = { path = "../../crates/aptos-logger" } +aptos-metrics = { path = "../../crates/aptos-metrics" } +aptos-workspace-hack = { version = "0.1", path = "../aptos-workspace-hack" } diff --git a/crates/debug-interface/src/node_debug_service.rs b/crates/debug-interface/src/node_debug_service.rs index 326bd80596e32..b58461f86e516 100644 --- a/crates/debug-interface/src/node_debug_service.rs +++ b/crates/debug-interface/src/node_debug_service.rs @@ -3,9 +3,9 @@ //! Debug interface to access information in a specific node. -use diem_config::config::NodeConfig; -use diem_logger::{info, Filter, Logger}; -use diem_metrics::json_metrics::get_git_rev; +use aptos_config::config::NodeConfig; +use aptos_logger::{info, Filter, Logger}; +use aptos_metrics::json_metrics::get_git_rev; use serde::{Deserialize, Serialize}; use std::{net::SocketAddr, sync::Arc}; use tokio::runtime::{Builder, Runtime}; @@ -34,7 +34,7 @@ impl NodeDebugService { // GET /metrics let metrics = - warp::path("metrics").map(|| warp::reply::json(&diem_metrics::get_all_metrics())); + warp::path("metrics").map(|| warp::reply::json(&aptos_metrics::get_all_metrics())); // Post /log/filter let local_filter = { diff --git a/crates/fallible/Cargo.toml b/crates/fallible/Cargo.toml index 6783a9f37bc5c..022d0f16ea4bd 100644 --- a/crates/fallible/Cargo.toml +++ b/crates/fallible/Cargo.toml @@ -2,7 +2,7 @@ name = "fallible" version = "0.1.0" authors = ["Diem Association "] -description = "Diem diem-infallible" +description = "Diem aptos-infallible" repository = "https://github.com/diem/diem" homepage = "https://diem.com" license = "Apache-2.0" @@ -11,4 +11,4 @@ edition = "2018" [dependencies] thiserror = "1.0" -diem-workspace-hack = { version = "0.1", path = "../diem-workspace-hack" } +aptos-workspace-hack = { version = "0.1", path = "../aptos-workspace-hack" } diff --git a/crates/num-variants/Cargo.toml b/crates/num-variants/Cargo.toml index 85af0cc16c3ea..25cc192a8176a 100644 --- a/crates/num-variants/Cargo.toml +++ b/crates/num-variants/Cargo.toml @@ -13,4 +13,4 @@ proc-macro = true syn = "1.0.64" quote = "1.0.9" proc-macro2 = "1.0.24" -diem-workspace-hack = { version = "0.1", path = "../diem-workspace-hack" } +aptos-workspace-hack = { version = "0.1", path = "../aptos-workspace-hack" } diff --git a/crates/proxy/Cargo.toml b/crates/proxy/Cargo.toml index 054a22b71aa69..f97a7ae782fc2 100644 --- a/crates/proxy/Cargo.toml +++ b/crates/proxy/Cargo.toml @@ -11,4 +11,4 @@ edition = "2018" [dependencies] ipnet = "2.3" -diem-workspace-hack = { version = "0.1", path = "../diem-workspace-hack" } +aptos-workspace-hack = { version = "0.1", path = "../aptos-workspace-hack" } diff --git a/crates/short-hex-str/Cargo.toml b/crates/short-hex-str/Cargo.toml index 54ef9e7604d62..d53d1c77fb1ac 100644 --- a/crates/short-hex-str/Cargo.toml +++ b/crates/short-hex-str/Cargo.toml @@ -14,7 +14,7 @@ mirai-annotations = "1.10.1" serde = { version = "1.0.124", default-features = false } static_assertions = "1.1.0" thiserror = "1.0.24" -diem-workspace-hack = { version = "0.1", path = "../diem-workspace-hack" } +aptos-workspace-hack = { version = "0.1", path = "../aptos-workspace-hack" } [dev-dependencies] hex = "0.4.3" diff --git a/crates/swiss-knife/Cargo.toml b/crates/swiss-knife/Cargo.toml index 92d893b832ddb..3f20840f2d7f9 100644 --- a/crates/swiss-knife/Cargo.toml +++ b/crates/swiss-knife/Cargo.toml @@ -17,8 +17,8 @@ serde_json = "1.0.64" serde = { version = "1.0.124", features = ["derive"] } bcs = "0.1.2" -diem-types = { path = "../../types" } -diem-crypto = { path = "../../crates/diem-crypto" } -diem-workspace-hack = { version = "0.1", path = "../diem-workspace-hack" } +aptos-types = { path = "../../types" } +aptos-crypto = { path = "../../crates/aptos-crypto" } +aptos-workspace-hack = { version = "0.1", path = "../aptos-workspace-hack" } move-core-types = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } -diem-transaction-builder = { path = "../../sdk/transaction-builder" } +aptos-transaction-builder = { path = "../../sdk/transaction-builder" } diff --git a/crates/swiss-knife/src/helpers.rs b/crates/swiss-knife/src/helpers.rs index 3aeae6cdffffa..25b1b726ac911 100644 --- a/crates/swiss-knife/src/helpers.rs +++ b/crates/swiss-knife/src/helpers.rs @@ -1,7 +1,7 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_types::{ +use aptos_types::{ account_address::AccountAddress, account_config::{from_currency_code_string, type_tag_for_currency_code}, }; diff --git a/crates/swiss-knife/src/main.rs b/crates/swiss-knife/src/main.rs index 09facda2a0205..c04b8dc0cb962 100644 --- a/crates/swiss-knife/src/main.rs +++ b/crates/swiss-knife/src/main.rs @@ -1,14 +1,14 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_crypto::{ +use aptos_crypto::{ ed25519::{Ed25519PrivateKey, Ed25519PublicKey, Ed25519Signature}, hash::CryptoHash, test_utils::KeyPair, Signature, SigningKey, Uniform, ValidCryptoMaterialStringExt, }; -use diem_transaction_builder::stdlib as transaction_builder; -use diem_types::{ +use aptos_transaction_builder::stdlib as transaction_builder; +use aptos_types::{ chain_id::ChainId, transaction::{ authenticator::AuthenticationKey, RawTransaction, SignedTransaction, Transaction, diff --git a/crates/transaction-emitter/Cargo.toml b/crates/transaction-emitter/Cargo.toml index 8391e347b90bb..770de0864b13e 100644 --- a/crates/transaction-emitter/Cargo.toml +++ b/crates/transaction-emitter/Cargo.toml @@ -22,9 +22,9 @@ structopt = "0.3.21" termion = "1.5.6" tokio = { version = "1.8.1", features = ["full"] } -diem-rest-client = { path = "../diem-rest-client"} -diem-config = { path = "../../config" } -diem-crypto = { path = "../diem-crypto" } -diem-logger = { path = "../../crates/diem-logger" } -diem-sdk = { path = "../../sdk" } -diem-workspace-hack = { version = "0.1", path = "../diem-workspace-hack" } +aptos-rest-client = { path = "../aptos-rest-client"} +aptos-config = { path = "../../config" } +aptos-crypto = { path = "../aptos-crypto" } +aptos-logger = { path = "../../crates/aptos-logger" } +aptos-sdk = { path = "../../sdk" } +aptos-workspace-hack = { version = "0.1", path = "../aptos-workspace-hack" } diff --git a/crates/transaction-emitter/src/cluster.rs b/crates/transaction-emitter/src/cluster.rs index 0230b324f8917..07ca29a092713 100644 --- a/crates/transaction-emitter/src/cluster.rs +++ b/crates/transaction-emitter/src/cluster.rs @@ -5,17 +5,17 @@ use crate::{instance::Instance, query_sequence_numbers}; use anyhow::{format_err, Result}; -use diem_crypto::{ +use aptos_crypto::{ ed25519::{Ed25519PrivateKey, Ed25519PublicKey}, test_utils::KeyPair, Uniform, }; -use diem_rest_client::Client as RestClient; -use diem_sdk::{ +use aptos_rest_client::Client as RestClient; +use aptos_sdk::{ move_types::account_address::AccountAddress, types::{ account_config::{ - diem_root_address, testnet_dd_account_address, treasury_compliance_account_address, + aptos_root_address, testnet_dd_account_address, treasury_compliance_account_address, }, chain_id::ChainId, AccountKey, LocalAccount, @@ -98,8 +98,8 @@ impl Cluster { )) } - pub async fn load_diem_root_account(&self, client: &RestClient) -> Result { - self.load_account_with_mint_key(client, diem_root_address()) + pub async fn load_aptos_root_account(&self, client: &RestClient) -> Result { + self.load_account_with_mint_key(client, aptos_root_address()) .await } diff --git a/crates/transaction-emitter/src/instance.rs b/crates/transaction-emitter/src/instance.rs index 9f01311e78897..9ed23557fb02f 100644 --- a/crates/transaction-emitter/src/instance.rs +++ b/crates/transaction-emitter/src/instance.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 use anyhow::{format_err, Result}; -use diem_rest_client::Client as RestClient; +use aptos_rest_client::Client as RestClient; use reqwest::{Client, Url}; use std::{ fmt, diff --git a/crates/transaction-emitter/src/lib.rs b/crates/transaction-emitter/src/lib.rs index 09c8edcf582bf..f06298641976f 100644 --- a/crates/transaction-emitter/src/lib.rs +++ b/crates/transaction-emitter/src/lib.rs @@ -2,9 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 use anyhow::{format_err, Context, Result}; -use diem_logger::*; -use diem_rest_client::{views::AmountView, Client as RestClient, PendingTransaction, Response}; -use diem_sdk::{ +use aptos_logger::*; +use aptos_rest_client::{views::AmountView, Client as RestClient, PendingTransaction, Response}; +use aptos_sdk::{ move_types::account_address::AccountAddress, transaction_builder::{Currency, TransactionFactory}, types::{ @@ -39,9 +39,9 @@ pub mod atomic_histogram; pub mod cluster; pub mod instance; +use aptos_crypto::ed25519::Ed25519PrivateKey; +use aptos_sdk::types::AccountKey; use atomic_histogram::*; -use diem_crypto::ed25519::Ed25519PrivateKey; -use diem_sdk::types::AccountKey; use rand::rngs::StdRng; /// Max transactions per account in mempool diff --git a/crates/transaction-emitter/src/main.rs b/crates/transaction-emitter/src/main.rs index 8b7c286a9fcce..af466e9398f54 100644 --- a/crates/transaction-emitter/src/main.rs +++ b/crates/transaction-emitter/src/main.rs @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 use anyhow::{bail, format_err, Result}; -use diem_config::config::DEFAULT_PORT; -use diem_sdk::{ +use aptos_config::config::DEFAULT_PORT; +use aptos_sdk::{ transaction_builder::TransactionFactory, types::{chain_id::ChainId, LocalAccount}, }; diff --git a/developer-docs-site/docs/basics/basics-accounts.md b/developer-docs-site/docs/basics/basics-accounts.md index 5fc94f3c96a88..d14a3ccfe6e6b 100755 --- a/developer-docs-site/docs/basics/basics-accounts.md +++ b/developer-docs-site/docs/basics/basics-accounts.md @@ -39,14 +39,14 @@ Creating a K-of-N multisig authentication key is similar to creating a single si Every account on the DPN is created with at least two resources: -* [RoleId](https://github.com/diem/diem/blob/main/diem-move/diem-framework/core/doc/Roles.md#resource-roleid), which grants the account a single, immutable [role](basics-accounts.md#account-roles) for [access control](https://github.com/diem/dip/blob/main/dips/dip-2.md). -* [DiemAccount](https://github.com/diem/diem/blob/main/diem-move/diem-framework/core/doc/DiemAccount.md#resource-diemaccount), which holds the account’s [sequence number](/reference/glossary#sequence-number), authentication key, and event handles. +* [RoleId](https://github.com/diem/diem/blob/main/aptos-move/diem-framework/core/doc/Roles.md#resource-roleid), which grants the account a single, immutable [role](basics-accounts.md#account-roles) for [access control](https://github.com/diem/dip/blob/main/dips/dip-2.md). +* [DiemAccount](https://github.com/diem/diem/blob/main/aptos-move/diem-framework/core/doc/DiemAccount.md#resource-diemaccount), which holds the account’s [sequence number](/reference/glossary#sequence-number), authentication key, and event handles. ### Currencies The DPN supports an account transacting in different currencies. -From a standards perspective, [`Diem`](https://github.com/diem/diem/blob/main/diem-move/diem-framework/core/doc/Diem.md#resource-diem) is the Diem Blockchain equivalent of [ERC20](https://eips.ethereum.org/EIPS/eip-20). At the Move level, these are different generic instantiations of the same Diem resource type (e.g., `Diem`, `Diem`). +From a standards perspective, [`Diem`](https://github.com/diem/diem/blob/main/aptos-move/diem-framework/core/doc/Diem.md#resource-diem) is the Diem Blockchain equivalent of [ERC20](https://eips.ethereum.org/EIPS/eip-20). At the Move level, these are different generic instantiations of the same Diem resource type (e.g., `Diem`, `Diem`). `Diem` will be the currency type available at launch. @@ -54,7 +54,7 @@ From a standards perspective, [`Diem`](https://github.com/diem/diem/bl A zero balance of `Diem` is added whenever `Diem` currency is authorized for an account. -Each non-administrative account stores one or more [Balance``](https://github.com/diem/diem/blob/main/diem-move/diem-framework/core/doc/DiemAccount.md#resource-balance) resources. For each currency type that the account holds such as `Diem` or `Diem`, there will be a separate Balance resource such as Balance`>` or Balance`>`. +Each non-administrative account stores one or more [Balance``](https://github.com/diem/diem/blob/main/aptos-move/diem-framework/core/doc/DiemAccount.md#resource-balance) resources. For each currency type that the account holds such as `Diem` or `Diem`, there will be a separate Balance resource such as Balance`>` or Balance`>`. When a client sends funds of type CoinType to an account, they should: * check if the account address exists diff --git a/developer-docs-site/docs/technical-papers/move-paper.md b/developer-docs-site/docs/technical-papers/move-paper.md index 46b0f2d33ac9e..0b4ca2909736a 100755 --- a/developer-docs-site/docs/technical-papers/move-paper.md +++ b/developer-docs-site/docs/technical-papers/move-paper.md @@ -27,6 +27,6 @@ protocol in Move, including Diem coin, transaction processing, and validator man ### Downloads \ No newline at end of file diff --git a/developer-docs-site/docs/technical-papers/publication-archive.mdx b/developer-docs-site/docs/technical-papers/publication-archive.mdx index d1419e74e1a39..a4eb9aaac9cae 100755 --- a/developer-docs-site/docs/technical-papers/publication-archive.mdx +++ b/developer-docs-site/docs/technical-papers/publication-archive.mdx @@ -24,10 +24,10 @@ Z title="Move Programming Language" doc_link="/technical-papers/move-paper" versions={[ - ["2020-05-26", "/papers/diem-move-a-language-with-programmable-resources/2020-05-26.pdf"], - ["2020-04-09", "/papers/diem-move-a-language-with-programmable-resources/2020-04-09.pdf"], - ["2019-09-26", "/papers/diem-move-a-language-with-programmable-resources/2019-09-26.pdf"], - ["2019-06-18", "/papers/diem-move-a-language-with-programmable-resources/2019-06-18.pdf"], + ["2020-05-26", "/papers/aptos-move-a-language-with-programmable-resources/2020-05-26.pdf"], + ["2020-04-09", "/papers/aptos-move-a-language-with-programmable-resources/2020-04-09.pdf"], + ["2019-09-26", "/papers/aptos-move-a-language-with-programmable-resources/2019-09-26.pdf"], + ["2019-06-18", "/papers/aptos-move-a-language-with-programmable-resources/2019-06-18.pdf"], ]} /> diff --git a/developer-docs-site/docs/technical-papers/the-diem-blockchain-paper.md b/developer-docs-site/docs/technical-papers/the-aptos-blockchain-paper.md similarity index 100% rename from developer-docs-site/docs/technical-papers/the-diem-blockchain-paper.md rename to developer-docs-site/docs/technical-papers/the-aptos-blockchain-paper.md diff --git a/developer-docs-site/docs/tools/cli-reference.md b/developer-docs-site/docs/tools/cli-reference.md index 1f65ccc00486b..ce0457684fbe9 100755 --- a/developer-docs-site/docs/tools/cli-reference.md +++ b/developer-docs-site/docs/tools/cli-reference.md @@ -40,7 +40,7 @@ The options for running the CLI client command to connect to any Diem network ar |`-m | --faucet_key_file_path` |Path to the generated key-pair for the faucet account. The faucet account can be used to simulate the minting of fake Diem Coins. If not passed, a new key-pair will be generated for you and placed in a temporary directory. To manually generate a keypair, use generate_keypair: `cargo run -p generate_keypair -- -o `. | |`-f | --faucet-url` |The full URL of the host that operates a faucet service. If not passed, this will be derived from the URL parameter under the strict assumption that the URL parameter is under the (sub)domain name `client` and the corresponding faucet service is under the (sub)domain name `faucet`. | | `-u | —-url` | The full URL of the destination host for the CLI to connect to. If applicable, this should include the port number of the host’s JSON RPC server. | -| `-n | --mnemonic_file` | The file location from which to load the mnemonic word for user account address/key generation. If not passed, a new mnemonic file is generated by diem_wallet in the current directory.| +| `-n | --mnemonic_file` | The file location from which to load the mnemonic word for user account address/key generation. If not passed, a new mnemonic file is generated by aptos_wallet in the current directory.| | `-r | --sync` | If set, the client will sync with the connected node during wallet recovery. | |`--waypoint` | If set, the client will use the waypoint parameter for its initial LedgerInfo verification.| |`--waypoint_url`| The URL to retrieve the waypoint from, if the waypoint parameter is not passed. | diff --git a/developer-docs-site/docs/transactions/txns-types/txns-create-accounts-mint.md b/developer-docs-site/docs/transactions/txns-types/txns-create-accounts-mint.md index d8e0aab3c8dfa..8dc3f8bb89d43 100755 --- a/developer-docs-site/docs/transactions/txns-types/txns-create-accounts-mint.md +++ b/developer-docs-site/docs/transactions/txns-types/txns-create-accounts-mint.md @@ -32,7 +32,7 @@ If you are a Regulated VASP, and have been approved by Diem Networks as a partic Once Diem Networks creates your ParentVASP account (let’s call it Account **A**), you can create a [ChildVASP account](/reference/glossary#childvasp-account) if you wish. -To create a ChildVASP account, send the [create_child_vasp_account](https://github.com/diem/diem/blob/main/diem-move/diem-framework/script_documentation/script_documentation.md#script-create_child_vasp_account) transaction script from your **Account A** (your ParentVASP account). +To create a ChildVASP account, send the [create_child_vasp_account](https://github.com/diem/diem/blob/main/aptos-move/diem-framework/script_documentation/script_documentation.md#script-create_child_vasp_account) transaction script from your **Account A** (your ParentVASP account). With a single ParentVASP account, you can create up to 256 ChildVASP accounts. This transaction script allows you to specify: * Which currency the new account should hold, or if it should hold all known currencies. diff --git a/developer-docs-site/docs/transactions/txns-types/txns-manage-accounts.md b/developer-docs-site/docs/transactions/txns-types/txns-manage-accounts.md index 27ac9cd40cec9..7c4ace6a04d1a 100755 --- a/developer-docs-site/docs/transactions/txns-types/txns-manage-accounts.md +++ b/developer-docs-site/docs/transactions/txns-types/txns-manage-accounts.md @@ -12,21 +12,21 @@ Once an account has been created, you can use different types of transactions to If you are a Regulated VASP, you can designate one of your accounts as a recovery address account. The recovery address account should be a cold account (i.e., no transactions should be planned to be sent from that account). Use the recovery address account only for rotating the authentication key of an account that has registered itself with it and whose private key has been lost. -For this example, let's call this account **R**. To create recovery address account **R**, send a [create_recovery_address](https://github.com/diem/diem/blob/main/diem-move/diem-framework/script_documentation/script_documentation.md#function-create_recovery_address) transaction from account **R**. +For this example, let's call this account **R**. To create recovery address account **R**, send a [create_recovery_address](https://github.com/diem/diem/blob/main/aptos-move/diem-framework/script_documentation/script_documentation.md#function-create_recovery_address) transaction from account **R**. -After the recovery address **R** has been created, other accounts that belong to the VASP can register themselves with R by sending a [add_recovery_rotation_capability](https://github.com/diem/diem/blob/main/diem-move/diem-framework/script_documentation/script_documentation.md#function-add_recovery_rotation_capability) transaction and specifying the recovery address as **R**. +After the recovery address **R** has been created, other accounts that belong to the VASP can register themselves with R by sending a [add_recovery_rotation_capability](https://github.com/diem/diem/blob/main/aptos-move/diem-framework/script_documentation/script_documentation.md#function-add_recovery_rotation_capability) transaction and specifying the recovery address as **R**. ## Rotate authentication key If an account **A** wishes to update the authentication key needed to access it, it can do so by sending one of two transactions, depending on whether A has been registered with, or is, an account recovery address. -* If **A** has not registered itself with a recovery address, it can change its authentication key by sending a [rotate_authentication_key](https://github.com/diem/diem/blob/main/diem-move/diem-framework/script_documentation/script_documentation.md#function-rotate_authentication_key) transaction with its new auth key. -* If **A** is part of a recovery address, then it can rotate its key by sending a [rotate_authentication_key_with_recovery_address](https://github.com/diem/diem/blob/main/diem-move/diem-framework/script_documentation/script_documentation.md#function-rotate_authentication_key_with_recovery_address) transaction with its new authentication key, and itself as the `to_recover` address. +* If **A** has not registered itself with a recovery address, it can change its authentication key by sending a [rotate_authentication_key](https://github.com/diem/diem/blob/main/aptos-move/diem-framework/script_documentation/script_documentation.md#function-rotate_authentication_key) transaction with its new auth key. +* If **A** is part of a recovery address, then it can rotate its key by sending a [rotate_authentication_key_with_recovery_address](https://github.com/diem/diem/blob/main/aptos-move/diem-framework/script_documentation/script_documentation.md#function-rotate_authentication_key_with_recovery_address) transaction with its new authentication key, and itself as the `to_recover` address. ## Add a currency to an account -If an account **A** wants to hold a balance of Diem Coins in a currency **C** that it currently doesn’t hold, it can add a balance for **C** by sending an [add_currency_to_account](https://github.com/diem/diem/blob/main/diem-move/diem-framework/script_documentation/script_documentation.md#0x1_AccountAdministrationScripts_add_currency_to_account) transaction specifying **C** as the currency, from **A**. +If an account **A** wants to hold a balance of Diem Coins in a currency **C** that it currently doesn’t hold, it can add a balance for **C** by sending an [add_currency_to_account](https://github.com/diem/diem/blob/main/aptos-move/diem-framework/script_documentation/script_documentation.md#0x1_AccountAdministrationScripts_add_currency_to_account) transaction specifying **C** as the currency, from **A**. It’s important to note that **C** must be a recognized currency on-chain, and **A** cannot hold a balance in **C** already; otherwise, this transaction will fail to execute. diff --git a/developer-docs-site/docs/transactions/txns-types/txns-send-payment.md b/developer-docs-site/docs/transactions/txns-types/txns-send-payment.md index f186df9d127e1..76be3c3bbe3fe 100755 --- a/developer-docs-site/docs/transactions/txns-types/txns-send-payment.md +++ b/developer-docs-site/docs/transactions/txns-types/txns-send-payment.md @@ -7,7 +7,7 @@ An account can send a payment to another account by sending a transaction. ## Introduction -If an account **A** wishes to send a payment to another account **B,** it can do so by sending a [peer_to_peer_with_metadata](https://github.com/diem/diem/blob/main/diem-move/diem-framework/script_documentation/script_documentation.md#script-peer_to_peer_with_metadata) script transaction. +If an account **A** wishes to send a payment to another account **B,** it can do so by sending a [peer_to_peer_with_metadata](https://github.com/diem/diem/blob/main/aptos-move/diem-framework/script_documentation/script_documentation.md#script-peer_to_peer_with_metadata) script transaction. When a payment is made, the sender must specify: * The currency the payment is being made in @@ -28,6 +28,6 @@ Every transaction sending payments between two distinct Regulated VASP accounts ### Update dual attestation information -If a Regulated VASP wishes to update their `base_url` or `compliance_public_key`, it can do so by sending a [rotate_dual_attestation_info](https://github.com/diem/diem/blob/main/diem-move/diem-framework/script_documentation/script_documentation.md#script-rotate_dual_attestation_info) transaction. The Regulated VASP has to send this transaction from their ParentVASP account (this is the account that holds dual attestation data). For example, if a Regulated VASP wishes to change the private key they use to sign metadata for dual attestation, they can send this transaction to do so. +If a Regulated VASP wishes to update their `base_url` or `compliance_public_key`, it can do so by sending a [rotate_dual_attestation_info](https://github.com/diem/diem/blob/main/aptos-move/diem-framework/script_documentation/script_documentation.md#script-rotate_dual_attestation_info) transaction. The Regulated VASP has to send this transaction from their ParentVASP account (this is the account that holds dual attestation data). For example, if a Regulated VASP wishes to change the private key they use to sign metadata for dual attestation, they can send this transaction to do so. Once this transaction is executed, all transactions subject to dual attestation will be checked using the new `compliance_public_key`. Because of this, Regulated VASPs should be careful to communicate this change and ensure that there are no outstanding payment transactions that they have previously signed but that have not yet been committed on-chain, since these will be rejected if the `compliance_public_key` has changed. diff --git a/developer-docs-site/docs/tutorials/configure-run-public-fullnode.md b/developer-docs-site/docs/tutorials/configure-run-public-fullnode.md index bad618a86d735..35f6751db3900 100755 --- a/developer-docs-site/docs/tutorials/configure-run-public-fullnode.md +++ b/developer-docs-site/docs/tutorials/configure-run-public-fullnode.md @@ -57,11 +57,11 @@ You can configure a public FullNode in two ways: using the Diem Core source code * * Reading through the config and making any other desired changes. You can see what configurations the `public_full_node.yaml` file should have by checking the following file as an example: `docker/compose/public_full_node/public_full_node.yaml` -4. Run the diem-node using `cargo run -p diem-node --release -- -f ./public_full_node.yaml` +4. Run the aptos-node using `cargo run -p aptos-node --release -- -f ./public_full_node.yaml` You have now successfully configured and started running a public FullNode in testnet.. -Note: This will build a release binary under `target/release/diem-node`. The release binaries tend to be substantially faster than debug binaries but lack debugging information useful for development. Simply omit the `--release` flag to build a debug binary. +Note: This will build a release binary under `target/release/aptos-node`. The release binaries tend to be substantially faster than debug binaries but lack debugging information useful for development. Simply omit the `--release` flag to build a debug binary. ## Using Docker diff --git a/developer-docs-site/docs/tutorials/tutorial-my-first-client.md b/developer-docs-site/docs/tutorials/tutorial-my-first-client.md index 4411256852fe0..b650eb6dc0374 100755 --- a/developer-docs-site/docs/tutorials/tutorial-my-first-client.md +++ b/developer-docs-site/docs/tutorials/tutorial-my-first-client.md @@ -226,10 +226,10 @@ script = stdlib.encode_peer_to_peer_with_metadata_script( ) # create transaction -raw_transaction = diem_types.RawTransaction( +raw_transaction = aptos_types.RawTransaction( sender=sender_auth_key.account_address(), sequence_number=sender_account.sequence_number, - payload=diem_types.TransactionPayload__Script(script), + payload=aptos_types.TransactionPayload__Script(script), max_gas_amount=1_000_000, gas_unit_price=0, gas_currency_code=CURRENCY, diff --git a/developer-docs-site/docs/tutorials/tutorial-run-local-validator-nw.md b/developer-docs-site/docs/tutorials/tutorial-run-local-validator-nw.md index 8464a8adba530..d20bd782caf55 100755 --- a/developer-docs-site/docs/tutorials/tutorial-run-local-validator-nw.md +++ b/developer-docs-site/docs/tutorials/tutorial-run-local-validator-nw.md @@ -28,9 +28,9 @@ You can run a local test validator network in two ways: using the Diem Core sour ./scripts/dev_setup.sh source ~/.cargo/env ``` -2. Run the process: `cargo run -p diem-node -- --test`. After starting up, the process should print its config path (e.g., `/private/var/folders/36/w0v54r116ls44q29wh8db0mh0000gn/T/f62a72f87940e3892a860c21b55b529b/0/node.yaml`) and other metadata. +2. Run the process: `cargo run -p aptos-node -- --test`. After starting up, the process should print its config path (e.g., `/private/var/folders/36/w0v54r116ls44q29wh8db0mh0000gn/T/f62a72f87940e3892a860c21b55b529b/0/node.yaml`) and other metadata. -Note: this command runs `diem-node` from a genesis-only ledger state. If you want to reuse the ledger state produced by a previous run of `diem-node`, use `cargo run -p diem-node -- --test --config `. +Note: this command runs `aptos-node` from a genesis-only ledger state. If you want to reuse the ledger state produced by a previous run of `aptos-node`, use `cargo run -p aptos-node -- --test --config `. ### Using Docker @@ -41,11 +41,11 @@ Note: this command runs `diem-node` from a genesis-only ledger state. If you wan 4. Create configuration files in the same directory so that the data can be exported out of the docker container: ``` # Linux / Mac - touch genesis.blob diem_root_key waypoint.txt + touch genesis.blob aptos_root_key waypoint.txt # Windows fsutil file createnew genesis.blob 0 - fsutil file createnew diem_root_key 0 + fsutil file createnew aptos_root_key 0 fsutil file createnew waypoint.txt 0 Run docker-compose: docker-compose up ``` @@ -67,13 +67,13 @@ validator_1 | ChainId: TESTING ``` This output contains information required for starting the Diem CLI tool: -* Diem root key path - The root (also known as a mint or faucet) key controls the account that can mint. Available in the docker compose folder under `diem_root_key`. +* Diem root key path - The root (also known as a mint or faucet) key controls the account that can mint. Available in the docker compose folder under `aptos_root_key`. * Waypoint - a verifiable checkpoint into the blockchain (available in the docker compose folder under waypoint.txt) * JSON-RPC endpoint - `http://127.0.0.1:8080`. * ChainId - uniquely distinguishes this chain from other chains. -Use the output from above to start a `diem-client` in another terminal: +Use the output from above to start a `aptos-client` in another terminal: ``` $ cd ~/diem diff --git a/developer-docs-site/static/img/diem-clients-dark.svg b/developer-docs-site/static/img/aptos-clients-dark.svg similarity index 100% rename from developer-docs-site/static/img/diem-clients-dark.svg rename to developer-docs-site/static/img/aptos-clients-dark.svg diff --git a/developer-docs-site/static/img/diem-clients.svg b/developer-docs-site/static/img/aptos-clients.svg similarity index 100% rename from developer-docs-site/static/img/diem-clients.svg rename to developer-docs-site/static/img/aptos-clients.svg diff --git a/developer-docs-site/static/img/diem-coin-sourcing-dark.svg b/developer-docs-site/static/img/aptos-coin-sourcing-dark.svg similarity index 100% rename from developer-docs-site/static/img/diem-coin-sourcing-dark.svg rename to developer-docs-site/static/img/aptos-coin-sourcing-dark.svg diff --git a/developer-docs-site/static/img/diem-coin-sourcing.svg b/developer-docs-site/static/img/aptos-coin-sourcing.svg similarity index 100% rename from developer-docs-site/static/img/diem-coin-sourcing.svg rename to developer-docs-site/static/img/aptos-coin-sourcing.svg diff --git a/developer-docs-site/static/img/diem-header-logo-white.png b/developer-docs-site/static/img/aptos-header-logo-white.png similarity index 100% rename from developer-docs-site/static/img/diem-header-logo-white.png rename to developer-docs-site/static/img/aptos-header-logo-white.png diff --git a/developer-docs-site/static/img/diem-keys-dark.svg b/developer-docs-site/static/img/aptos-keys-dark.svg similarity index 100% rename from developer-docs-site/static/img/diem-keys-dark.svg rename to developer-docs-site/static/img/aptos-keys-dark.svg diff --git a/developer-docs-site/static/img/diem-keys.svg b/developer-docs-site/static/img/aptos-keys.svg similarity index 100% rename from developer-docs-site/static/img/diem-keys.svg rename to developer-docs-site/static/img/aptos-keys.svg diff --git a/developer-docs-site/static/img/diem-logo.png b/developer-docs-site/static/img/aptos-logo.png similarity index 100% rename from developer-docs-site/static/img/diem-logo.png rename to developer-docs-site/static/img/aptos-logo.png diff --git a/developer-docs-site/static/img/diem-logomark-white.png b/developer-docs-site/static/img/aptos-logomark-white.png similarity index 100% rename from developer-docs-site/static/img/diem-logomark-white.png rename to developer-docs-site/static/img/aptos-logomark-white.png diff --git a/developer-docs-site/static/img/diem-nodes-dark.svg b/developer-docs-site/static/img/aptos-nodes-dark.svg similarity index 100% rename from developer-docs-site/static/img/diem-nodes-dark.svg rename to developer-docs-site/static/img/aptos-nodes-dark.svg diff --git a/developer-docs-site/static/img/diem-nodes.svg b/developer-docs-site/static/img/aptos-nodes.svg similarity index 100% rename from developer-docs-site/static/img/diem-nodes.svg rename to developer-docs-site/static/img/aptos-nodes.svg diff --git a/developer-docs-site/static/img/diem.ico b/developer-docs-site/static/img/aptos.ico similarity index 100% rename from developer-docs-site/static/img/diem.ico rename to developer-docs-site/static/img/aptos.ico diff --git a/developer-docs-site/static/img/debugging-move-in-diem-network-dark.svg b/developer-docs-site/static/img/debugging-move-in-aptos-network-dark.svg similarity index 100% rename from developer-docs-site/static/img/debugging-move-in-diem-network-dark.svg rename to developer-docs-site/static/img/debugging-move-in-aptos-network-dark.svg diff --git a/developer-docs-site/static/img/debugging-move-in-diem-network.svg b/developer-docs-site/static/img/debugging-move-in-aptos-network.svg similarity index 100% rename from developer-docs-site/static/img/debugging-move-in-diem-network.svg rename to developer-docs-site/static/img/debugging-move-in-aptos-network.svg diff --git a/developer-docs-site/static/img/docs/diem-blockchain-pdf.png b/developer-docs-site/static/img/docs/aptos-blockchain-pdf.png similarity index 100% rename from developer-docs-site/static/img/docs/diem-blockchain-pdf.png rename to developer-docs-site/static/img/docs/aptos-blockchain-pdf.png diff --git a/developer-docs-site/static/img/docs/diem-c-sourcing.svg b/developer-docs-site/static/img/docs/aptos-c-sourcing.svg similarity index 100% rename from developer-docs-site/static/img/docs/diem-c-sourcing.svg rename to developer-docs-site/static/img/docs/aptos-c-sourcing.svg diff --git a/developer-docs-site/static/img/docs/diem-move-paper.png b/developer-docs-site/static/img/docs/aptos-move-paper.png similarity index 100% rename from developer-docs-site/static/img/docs/diem-move-paper.png rename to developer-docs-site/static/img/docs/aptos-move-paper.png diff --git a/developer-docs-site/static/img/docs/diem-whitepaper-pdf.png b/developer-docs-site/static/img/docs/aptos-whitepaper-pdf.png similarity index 100% rename from developer-docs-site/static/img/docs/diem-whitepaper-pdf.png rename to developer-docs-site/static/img/docs/aptos-whitepaper-pdf.png diff --git a/developer-docs-site/static/img/docs/diem-whitepaper-pdf@2x.png b/developer-docs-site/static/img/docs/aptos-whitepaper-pdf@2x.png similarity index 100% rename from developer-docs-site/static/img/docs/diem-whitepaper-pdf@2x.png rename to developer-docs-site/static/img/docs/aptos-whitepaper-pdf@2x.png diff --git a/developer-docs-site/static/img/manage-diem-keys-dark.svg b/developer-docs-site/static/img/manage-aptos-keys-dark.svg similarity index 100% rename from developer-docs-site/static/img/manage-diem-keys-dark.svg rename to developer-docs-site/static/img/manage-aptos-keys-dark.svg diff --git a/developer-docs-site/static/img/manage-diem-keys.svg b/developer-docs-site/static/img/manage-aptos-keys.svg similarity index 100% rename from developer-docs-site/static/img/manage-diem-keys.svg rename to developer-docs-site/static/img/manage-aptos-keys.svg diff --git a/developer-docs-site/static/img/test-the-diem-reference-wallet-dark.svg b/developer-docs-site/static/img/test-the-aptos-reference-wallet-dark.svg similarity index 100% rename from developer-docs-site/static/img/test-the-diem-reference-wallet-dark.svg rename to developer-docs-site/static/img/test-the-aptos-reference-wallet-dark.svg diff --git a/developer-docs-site/static/img/test-the-diem-reference-wallet.svg b/developer-docs-site/static/img/test-the-aptos-reference-wallet.svg similarity index 100% rename from developer-docs-site/static/img/test-the-diem-reference-wallet.svg rename to developer-docs-site/static/img/test-the-aptos-reference-wallet.svg diff --git a/developer-docs-site/static/papers/diem-consensus-state-machine-replication-in-the-diem-blockchain/2019-06-28.pdf b/developer-docs-site/static/papers/aptos-consensus-state-machine-replication-in-the-aptos-blockchain/2019-06-28.pdf similarity index 100% rename from developer-docs-site/static/papers/diem-consensus-state-machine-replication-in-the-diem-blockchain/2019-06-28.pdf rename to developer-docs-site/static/papers/aptos-consensus-state-machine-replication-in-the-aptos-blockchain/2019-06-28.pdf diff --git a/developer-docs-site/static/papers/diem-consensus-state-machine-replication-in-the-diem-blockchain/2019-09-26.pdf b/developer-docs-site/static/papers/aptos-consensus-state-machine-replication-in-the-aptos-blockchain/2019-09-26.pdf similarity index 100% rename from developer-docs-site/static/papers/diem-consensus-state-machine-replication-in-the-diem-blockchain/2019-09-26.pdf rename to developer-docs-site/static/papers/aptos-consensus-state-machine-replication-in-the-aptos-blockchain/2019-09-26.pdf diff --git a/developer-docs-site/static/papers/diem-consensus-state-machine-replication-in-the-diem-blockchain/2019-10-24.pdf b/developer-docs-site/static/papers/aptos-consensus-state-machine-replication-in-the-aptos-blockchain/2019-10-24.pdf similarity index 100% rename from developer-docs-site/static/papers/diem-consensus-state-machine-replication-in-the-diem-blockchain/2019-10-24.pdf rename to developer-docs-site/static/papers/aptos-consensus-state-machine-replication-in-the-aptos-blockchain/2019-10-24.pdf diff --git a/developer-docs-site/static/papers/diem-consensus-state-machine-replication-in-the-diem-blockchain/2019-11-08.pdf b/developer-docs-site/static/papers/aptos-consensus-state-machine-replication-in-the-aptos-blockchain/2019-11-08.pdf similarity index 100% rename from developer-docs-site/static/papers/diem-consensus-state-machine-replication-in-the-diem-blockchain/2019-11-08.pdf rename to developer-docs-site/static/papers/aptos-consensus-state-machine-replication-in-the-aptos-blockchain/2019-11-08.pdf diff --git a/developer-docs-site/static/papers/diem-consensus-state-machine-replication-in-the-diem-blockchain/2020-04-09.pdf b/developer-docs-site/static/papers/aptos-consensus-state-machine-replication-in-the-aptos-blockchain/2020-04-09.pdf similarity index 100% rename from developer-docs-site/static/papers/diem-consensus-state-machine-replication-in-the-diem-blockchain/2020-04-09.pdf rename to developer-docs-site/static/papers/aptos-consensus-state-machine-replication-in-the-aptos-blockchain/2020-04-09.pdf diff --git a/developer-docs-site/static/papers/diem-consensus-state-machine-replication-in-the-diem-blockchain/2020-05-26.pdf b/developer-docs-site/static/papers/aptos-consensus-state-machine-replication-in-the-aptos-blockchain/2020-05-26.pdf similarity index 100% rename from developer-docs-site/static/papers/diem-consensus-state-machine-replication-in-the-diem-blockchain/2020-05-26.pdf rename to developer-docs-site/static/papers/aptos-consensus-state-machine-replication-in-the-aptos-blockchain/2020-05-26.pdf diff --git a/developer-docs-site/static/papers/diem-consensus-state-machine-replication-in-the-diem-blockchain/2021-08-17.pdf b/developer-docs-site/static/papers/aptos-consensus-state-machine-replication-in-the-aptos-blockchain/2021-08-17.pdf similarity index 100% rename from developer-docs-site/static/papers/diem-consensus-state-machine-replication-in-the-diem-blockchain/2021-08-17.pdf rename to developer-docs-site/static/papers/aptos-consensus-state-machine-replication-in-the-aptos-blockchain/2021-08-17.pdf diff --git a/developer-docs-site/static/papers/diem-move-a-language-with-programmable-resources/2019-06-18.pdf b/developer-docs-site/static/papers/aptos-move-a-language-with-programmable-resources/2019-06-18.pdf similarity index 100% rename from developer-docs-site/static/papers/diem-move-a-language-with-programmable-resources/2019-06-18.pdf rename to developer-docs-site/static/papers/aptos-move-a-language-with-programmable-resources/2019-06-18.pdf diff --git a/developer-docs-site/static/papers/diem-move-a-language-with-programmable-resources/2019-09-26.pdf b/developer-docs-site/static/papers/aptos-move-a-language-with-programmable-resources/2019-09-26.pdf similarity index 100% rename from developer-docs-site/static/papers/diem-move-a-language-with-programmable-resources/2019-09-26.pdf rename to developer-docs-site/static/papers/aptos-move-a-language-with-programmable-resources/2019-09-26.pdf diff --git a/developer-docs-site/static/papers/diem-move-a-language-with-programmable-resources/2020-04-09.pdf b/developer-docs-site/static/papers/aptos-move-a-language-with-programmable-resources/2020-04-09.pdf similarity index 100% rename from developer-docs-site/static/papers/diem-move-a-language-with-programmable-resources/2020-04-09.pdf rename to developer-docs-site/static/papers/aptos-move-a-language-with-programmable-resources/2020-04-09.pdf diff --git a/developer-docs-site/static/papers/diem-move-a-language-with-programmable-resources/2020-05-26.pdf b/developer-docs-site/static/papers/aptos-move-a-language-with-programmable-resources/2020-05-26.pdf similarity index 100% rename from developer-docs-site/static/papers/diem-move-a-language-with-programmable-resources/2020-05-26.pdf rename to developer-docs-site/static/papers/aptos-move-a-language-with-programmable-resources/2020-05-26.pdf diff --git a/developer-docs-site/static/papers/the-diem-blockchain/2019-06-25.pdf b/developer-docs-site/static/papers/the-aptos-blockchain/2019-06-25.pdf similarity index 100% rename from developer-docs-site/static/papers/the-diem-blockchain/2019-06-25.pdf rename to developer-docs-site/static/papers/the-aptos-blockchain/2019-06-25.pdf diff --git a/developer-docs-site/static/papers/the-diem-blockchain/2019-09-18.pdf b/developer-docs-site/static/papers/the-aptos-blockchain/2019-09-18.pdf similarity index 100% rename from developer-docs-site/static/papers/the-diem-blockchain/2019-09-18.pdf rename to developer-docs-site/static/papers/the-aptos-blockchain/2019-09-18.pdf diff --git a/developer-docs-site/static/papers/the-diem-blockchain/2019-09-26.pdf b/developer-docs-site/static/papers/the-aptos-blockchain/2019-09-26.pdf similarity index 100% rename from developer-docs-site/static/papers/the-diem-blockchain/2019-09-26.pdf rename to developer-docs-site/static/papers/the-aptos-blockchain/2019-09-26.pdf diff --git a/developer-docs-site/static/papers/the-diem-blockchain/2020-04-09.pdf b/developer-docs-site/static/papers/the-aptos-blockchain/2020-04-09.pdf similarity index 100% rename from developer-docs-site/static/papers/the-diem-blockchain/2020-04-09.pdf rename to developer-docs-site/static/papers/the-aptos-blockchain/2020-04-09.pdf diff --git a/developer-docs-site/static/papers/the-diem-blockchain/2020-05-26.pdf b/developer-docs-site/static/papers/the-aptos-blockchain/2020-05-26.pdf similarity index 100% rename from developer-docs-site/static/papers/the-diem-blockchain/2020-05-26.pdf rename to developer-docs-site/static/papers/the-aptos-blockchain/2020-05-26.pdf diff --git a/devtools/x-lint/src/runner.rs b/devtools/x-lint/src/runner.rs index 11e76ad76f158..22112a5181486 100644 --- a/devtools/x-lint/src/runner.rs +++ b/devtools/x-lint/src/runner.rs @@ -244,7 +244,7 @@ impl<'cfg> LintEngine<'cfg> { // TODO: make global exclusions configurable Ok(tracked_files .iter() - .filter(|f| !f.starts_with("testsuite/diem-fuzzer/artifacts/"))) + .filter(|f| !f.starts_with("testsuite/aptos-fuzzer/artifacts/"))) } } diff --git a/devtools/x/src/config.rs b/devtools/x/src/config.rs index 2312a181bfc18..f48f20fcb1a6b 100644 --- a/devtools/x/src/config.rs +++ b/devtools/x/src/config.rs @@ -132,7 +132,7 @@ pub struct WorkspaceConfig { /// Exceptions to whitespace linters pub whitespace_exceptions: Vec, /// Move to Diem dependencies - pub move_to_diem_deps: MoveToDiemDepsConfig, + pub move_to_aptos_deps: MoveToDiemDepsConfig, } #[derive(Clone, Serialize, Deserialize, Debug, PartialEq, Eq)] @@ -161,7 +161,7 @@ pub struct DirectDepDupsConfig { #[derive(Clone, Serialize, Deserialize, Debug, PartialEq, Eq)] pub struct MoveToDiemDepsConfig { - pub diem_crates_in_language: HashSet, + pub aptos_crates_in_language: HashSet, pub exclude: HashSet, } diff --git a/devtools/x/src/lint/guppy.rs b/devtools/x/src/lint/guppy.rs index 6447937a269e3..e34948282b61d 100644 --- a/devtools/x/src/lint/guppy.rs +++ b/devtools/x/src/lint/guppy.rs @@ -604,7 +604,7 @@ impl<'cfg> MoveCratesDontDependOnDiemCrates<'cfg> { impl<'cfg> Linter for MoveCratesDontDependOnDiemCrates<'cfg> { fn name(&self) -> &'static str { - "move-crates-dont-depend-on-diem-crates" + "move-crates-dont-depend-on-aptos-crates" } } @@ -626,7 +626,7 @@ impl<'cfg> PackageLinter for MoveCratesDontDependOnDiemCrates<'cfg> { // 2. All crates inside language are considered Move crates, unless marked otherwise. let is_move_crate = |crate_path: &str, crate_name: &str| { if crate_path.starts_with("language/") { - if self.config.diem_crates_in_language.contains(crate_name) { + if self.config.aptos_crates_in_language.contains(crate_name) { return false; } return true; @@ -650,7 +650,7 @@ impl<'cfg> PackageLinter for MoveCratesDontDependOnDiemCrates<'cfg> { "depending on non-move crate `{}`\n\ Note: all crates in language/ are considered Move crates by default. \ If you are creating a new Diem crate in language, you need to add its name to the \ - diem_crates_in_language list in x.toml to make the linter recognize it.", + aptos_crates_in_language list in x.toml to make the linter recognize it.", dep_name ), ); diff --git a/devtools/x/src/lint/mod.rs b/devtools/x/src/lint/mod.rs index 5d0ae19cdcc65..484e4918415c5 100644 --- a/devtools/x/src/lint/mod.rs +++ b/devtools/x/src/lint/mod.rs @@ -39,7 +39,7 @@ pub fn run(args: Args, xctx: XContext) -> crate::Result<()> { &guppy::PublishedPackagesDontDependOnUnpublishedPackages::new(xctx.core()), &guppy::OnlyPublishToCratesIo, &guppy::CratesInCratesDirectory, - &guppy::MoveCratesDontDependOnDiemCrates::new(&workspace_config.move_to_diem_deps), + &guppy::MoveCratesDontDependOnDiemCrates::new(&workspace_config.move_to_aptos_deps), &workspace_classify::DefaultOrTestOnly::new( xctx.core().package_graph()?, &workspace_config.test_only, diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/PaymentScripts.mvsm b/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/PaymentScripts.mvsm deleted file mode 100644 index 443e06b9790cd..0000000000000 Binary files a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/PaymentScripts.mvsm and /dev/null differ diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/Signature.mvsm b/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/Signature.mvsm deleted file mode 100644 index 3ea3b3ee4fb74..0000000000000 Binary files a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/Signature.mvsm and /dev/null differ diff --git a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/source_maps/Signature.mvsm b/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/source_maps/Signature.mvsm deleted file mode 100644 index 16b96f801d2ab..0000000000000 Binary files a/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build/DiemCoreFramework/source_maps/Signature.mvsm and /dev/null differ diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/DiemConfig.mv b/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/DiemConfig.mv deleted file mode 100644 index c87a249b9ce93..0000000000000 Binary files a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/bytecode_modules/DiemConfig.mv and /dev/null differ diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/source_maps/DiemConfig.mvsm b/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/source_maps/DiemConfig.mvsm deleted file mode 100644 index 15e4b84f6f2e3..0000000000000 Binary files a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/source_maps/DiemConfig.mvsm and /dev/null differ diff --git a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/source_maps/Signature.mvsm b/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/source_maps/Signature.mvsm deleted file mode 100644 index 16b96f801d2ab..0000000000000 Binary files a/diem-move/diem-framework/experimental/releases/artifacts/current/build/DiemCoreFramework/source_maps/Signature.mvsm and /dev/null differ diff --git a/docker/diem-build.sh b/docker/aptos-build.sh similarity index 97% rename from docker/diem-build.sh rename to docker/aptos-build.sh index 0717e65581870..b87bb00746916 100755 --- a/docker/diem-build.sh +++ b/docker/aptos-build.sh @@ -16,7 +16,7 @@ DOCKERFILE_BUILD_RE='^RUN ./docker/build-common.sh$' if [ -z "$DOCKERFILE" ] || [ -z "$TAGS" ] then - echo "Usage diem-build.sh " + echo "Usage aptos-build.sh " fi shift 2 diff --git a/docker/build-aws.sh b/docker/build-aws.sh index 51c03c4656819..5a3cbda089688 100755 --- a/docker/build-aws.sh +++ b/docker/build-aws.sh @@ -23,25 +23,25 @@ BUILD_PROJECTS=() while [[ "$1" =~ ^- ]]; do case $1 in --build-all ) - BUILD_PROJECTS=(diem-validator diem-init diem-faucet diem-safety-rules diem-tools diem-forge) + BUILD_PROJECTS=(aptos-validator aptos-init aptos-faucet aptos-safety-rules aptos-tools aptos-forge) ;; --build-validator ) - BUILD_PROJECTS=(diem-validator) + BUILD_PROJECTS=(aptos-validator) ;; --build-init ) - BUILD_PROJECTS=(diem-init) + BUILD_PROJECTS=(aptos-init) ;; --build-faucet ) - BUILD_PROJECTS=(diem-faucet) + BUILD_PROJECTS=(aptos-faucet) ;; --build-safety-rules ) - BUILD_PROJECTS=(diem-safety-rules) + BUILD_PROJECTS=(aptos-safety-rules) ;; --build-tools ) - BUILD_PROJECTS=(diem-tools) + BUILD_PROJECTS=(aptos-tools) ;; --build-forge ) - BUILD_PROJECTS=(diem-forge diem-validator diem-init diem-faucet diem-safety-rules diem-tools) + BUILD_PROJECTS=(aptos-forge aptos-validator aptos-init aptos-faucet aptos-safety-rules aptos-tools) ;; --version ) shift; diff --git a/docker/build-common.sh b/docker/build-common.sh index 51ed51f97f071..268a0e6b99a70 100755 --- a/docker/build-common.sh +++ b/docker/build-common.sh @@ -25,20 +25,20 @@ cargo x generate-workspace-hack --mode disable if [ "$IMAGE_TARGETS" = "release" ] || [ "$IMAGE_TARGETS" = "all" ]; then # Build release binaries (TODO: use x to run this?) cargo build --release \ - -p diem-genesis-tool \ - -p diem-operational-tool \ - -p diem-node \ + -p aptos-genesis-tool \ + -p aptos-operational-tool \ + -p aptos-node \ -p safety-rules \ -p db-bootstrapper \ -p backup-cli \ - -p diem-transaction-replay \ - -p diem-writeset-generator \ + -p aptos-transaction-replay \ + -p aptos-writeset-generator \ "$@" - # Build and overwrite the diem-node binary with feature failpoints if $ENABLE_FAILPOINTS is configured + # Build and overwrite the aptos-node binary with feature failpoints if $ENABLE_FAILPOINTS is configured if [ "$ENABLE_FAILPOINTS" = "1" ]; then - echo "Building diem-node with failpoints feature" - (cd diem-node && cargo build --release --features failpoints "$@") + echo "Building aptos-node with failpoints feature" + (cd aptos-node && cargo build --release --features failpoints "$@") fi fi @@ -46,7 +46,7 @@ fi if [ "$IMAGE_TARGETS" = "test" ] || [ "$IMAGE_TARGETS" = "all" ]; then # These non-release binaries are built separately to avoid feature unification issues cargo build --release \ - -p diem-faucet \ + -p aptos-faucet \ -p forge-cli \ "$@" fi @@ -54,4 +54,4 @@ fi rm -rf target/release/{build,deps,incremental} STRIP_DIR=${STRIP_DIR:-/diem/target} -find "$STRIP_DIR/release" -maxdepth 1 -executable -type f | grep -Ev 'diem-node|safety-rules' | xargs strip +find "$STRIP_DIR/release" -maxdepth 1 -executable -type f | grep -Ev 'aptos-node|safety-rules' | xargs strip diff --git a/docker/compose/README.md b/docker/compose/README.md index f06ed0e9faef7..6de005cc09f16 100644 --- a/docker/compose/README.md +++ b/docker/compose/README.md @@ -24,7 +24,7 @@ To build your own complete testnet: 1. Faucet will be available at http://127.0.0.1:8000 2. JSON-RPC will be available at http://127.0.0.1:8080 -If you would like to clear the validator/blockchain data and start from scratch, either remove the docker volume `diem-shared`, +If you would like to clear the validator/blockchain data and start from scratch, either remove the docker volume `aptos-shared`, or run `docker-compose run validator rm -rf '/opt/diem/var/*'` from the **validator-testnet** directory. To clear just the validator logs, run `docker-compose run validator rm -rf '/opt/diem/var/validator.log'` diff --git a/docker/compose/data-restore/docker-compose.yaml b/docker/compose/data-restore/docker-compose.yaml index 24c3e7b592233..121e5a62e073c 100644 --- a/docker/compose/data-restore/docker-compose.yaml +++ b/docker/compose/data-restore/docker-compose.yaml @@ -26,7 +26,7 @@ services: sh -c " /usr/local/bin/db-restore --concurrent-downloads 2 \ --target-db-dir /opt/diem/data/db auto \ - --metadata-cache-dir /tmp/diem-restore-metadata \ + --metadata-cache-dir /tmp/aptos-restore-metadata \ command-adapter --config /opt/diem/etc/s3-public.toml " diff --git a/docker/compose/monitoring/docker-compose.yaml b/docker/compose/monitoring/docker-compose.yaml index 7ca05c00082a3..890177d00f0e7 100644 --- a/docker/compose/monitoring/docker-compose.yaml +++ b/docker/compose/monitoring/docker-compose.yaml @@ -86,4 +86,4 @@ volumes: # networks: # default: # external: true -# name: "diem-docker-compose-shared" +# name: "aptos-docker-compose-shared" diff --git a/docker/compose/public_full_node/docker-compose.yaml b/docker/compose/public_full_node/docker-compose.yaml index 86b38bacc332c..e0825f710cd00 100644 --- a/docker/compose/public_full_node/docker-compose.yaml +++ b/docker/compose/public_full_node/docker-compose.yaml @@ -1,4 +1,4 @@ -# This compose file defines a Public Fullnode docker compose wrapper around diem-node. +# This compose file defines a Public Fullnode docker compose wrapper around aptos-node. # # In order to use, place a copy of the proper genesis.blob and waypoint.txt in this directory. # @@ -56,7 +56,7 @@ services: source: ./waypoint.txt target: /opt/diem/etc/waypoint.txt read_only: true - command: ["/opt/diem/bin/diem-node", "-f", "/opt/diem/etc/node.yaml"] + command: ["/opt/diem/bin/aptos-node", "-f", "/opt/diem/etc/node.yaml"] ports: - "8080:8080" expose: diff --git a/docker/compose/validator-testnet/docker-compose.yaml b/docker/compose/validator-testnet/docker-compose.yaml index aad3a3b7c99df..7e11dc0e39f73 100644 --- a/docker/compose/validator-testnet/docker-compose.yaml +++ b/docker/compose/validator-testnet/docker-compose.yaml @@ -31,12 +31,12 @@ services: shared: volumes: - type: volume - source: diem-shared + source: aptos-shared target: /opt/diem/var - type: bind source: ./validator_node_template.yaml target: /opt/diem/var/validator_node_template.yaml - command: ["/opt/diem/bin/diem-node", "--test", "--config", "/opt/diem/var"] + command: ["/opt/diem/bin/aptos-node", "--test", "--config", "/opt/diem/var"] ports: - "8080:8080" expose: @@ -50,7 +50,7 @@ services: shared: volumes: - type: volume - source: diem-shared + source: aptos-shared target: /opt/diem/var command: > /bin/bash -c " @@ -58,7 +58,7 @@ services: do if [[ -s /opt/diem/var/mint.key ]] then - /opt/diem/bin/diem-faucet \ + /opt/diem/bin/aptos-faucet \ --address 0.0.0.0 \ --port 8000 \ --chain-id TESTING \ @@ -77,11 +77,11 @@ services: networks: shared: - name: "diem-docker-compose-shared" + name: "aptos-docker-compose-shared" ipam: config: - subnet: 172.16.1.0/24 volumes: - diem-shared: - name: diem-shared + aptos-shared: + name: aptos-shared diff --git a/docker/faucet/Dockerfile b/docker/faucet/Dockerfile index a4e1b28356327..ff62c235f77e2 100644 --- a/docker/faucet/Dockerfile +++ b/docker/faucet/Dockerfile @@ -29,7 +29,7 @@ RUN apt-get update && apt-get install -y libssl1.1 nano net-tools tcpdump iprout RUN mkdir -p /opt/diem/bin /diem/client/data/wallet/ -COPY --from=builder /diem/target/release/diem-faucet /opt/diem/bin +COPY --from=builder /diem/target/release/aptos-faucet /opt/diem/bin # Test the docker container before shipping. FROM pre-test AS test diff --git a/docker/faucet/build.sh b/docker/faucet/build.sh index 7f6265c6faccf..d27373f20cfa8 100755 --- a/docker/faucet/build.sh +++ b/docker/faucet/build.sh @@ -5,4 +5,4 @@ set -e DIR="$( cd "$( dirname "$0" )" && pwd )" -$DIR/../diem-build.sh $DIR/Dockerfile diem/faucet "$@" +$DIR/../aptos-build.sh $DIR/Dockerfile diem/faucet "$@" diff --git a/docker/forge/build.sh b/docker/forge/build.sh index 76b5f3574ebe2..5159589ca03b8 100755 --- a/docker/forge/build.sh +++ b/docker/forge/build.sh @@ -5,4 +5,4 @@ set -e DIR="$( cd "$( dirname "$0" )" && pwd )" -$DIR/../diem-build.sh $DIR/Dockerfile diem/forge:latest "$@" +$DIR/../aptos-build.sh $DIR/Dockerfile diem/forge:latest "$@" diff --git a/docker/init/Dockerfile b/docker/init/Dockerfile index 8b1329c4b5569..6e7c1c7881646 100644 --- a/docker/init/Dockerfile +++ b/docker/init/Dockerfile @@ -29,34 +29,34 @@ RUN cd /usr/local/bin && wget "https://storage.googleapis.com/kubernetes-release RUN cd /usr/local/bin && wget "https://releases.hashicorp.com/vault/1.5.0/vault_1.5.0_linux_amd64.zip" -O- | busybox unzip - && chmod +x vault RUN mkdir -p /opt/diem/bin -COPY --from=builder /diem/target/release/diem-genesis-tool /usr/local/bin -COPY --from=builder /diem/target/release/diem-operational-tool /usr/local/bin +COPY --from=builder /diem/target/release/aptos-genesis-tool /usr/local/bin +COPY --from=builder /diem/target/release/aptos-operational-tool /usr/local/bin ### Get DPN Move modules bytecodes for genesis ceremony RUN mkdir -p /diem/move/build RUN mkdir -p /diem/move/modules -COPY --from=builder /diem/diem-move/diem-framework/DPN/releases/artifacts/current/build /diem/move/build +COPY --from=builder /diem/aptos-move/diem-framework/DPN/releases/artifacts/current/build /diem/move/build RUN mv /diem/move/build/**/bytecode_modules/*.mv /diem/move/modules RUN rm -rf /diem/move/build ### Get experimental Move modules bytecodes for genesis ceremony RUN mkdir -p /experimental/move/build RUN mkdir -p /experimental/move/modules -COPY --from=builder /diem/diem-move/diem-framework/experimental/releases/artifacts/current/build /experimental/move/build +COPY --from=builder /diem/aptos-move/diem-framework/experimental/releases/artifacts/current/build /experimental/move/build RUN mv /experimental/move/build/**/bytecode_modules/*.mv /experimental/move/modules RUN rm -rf /experimental/move/build ### Get Aptos Move modules bytecodes for genesis ceremony RUN mkdir -p /aptos-framework/move/build RUN mkdir -p /aptos-framework/move/modules -COPY --from=builder /diem/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build /aptos-framework/move/build +COPY --from=builder /diem/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build /aptos-framework/move/build RUN mv /aptos-framework/move/build/**/bytecode_modules/*.mv /aptos-framework/move/modules RUN rm -rf /aptos-framework/move/build FROM pre-prod as testing -RUN /usr/local/bin/diem-genesis-tool -h -RUN /usr/local/bin/diem-operational-tool -h +RUN /usr/local/bin/aptos-genesis-tool -h +RUN /usr/local/bin/aptos-operational-tool -h FROM pre-prod as prod diff --git a/docker/init/build.sh b/docker/init/build.sh index bbdb7aeae8859..752a28354f03a 100755 --- a/docker/init/build.sh +++ b/docker/init/build.sh @@ -5,4 +5,4 @@ set -e DIR="$( cd "$( dirname "$0" )" && pwd )" -$DIR/../diem-build.sh $DIR/Dockerfile diem/init "$@" +$DIR/../aptos-build.sh $DIR/Dockerfile diem/init "$@" diff --git a/docker/safety-rules/build.sh b/docker/safety-rules/build.sh index fb37319761c4a..c6263db6a95af 100755 --- a/docker/safety-rules/build.sh +++ b/docker/safety-rules/build.sh @@ -5,4 +5,4 @@ set -e DIR="$( cd "$( dirname "$0" )" && pwd )" -$DIR/../diem-build.sh $DIR/Dockerfile diem/validator_tcb "$@" +$DIR/../aptos-build.sh $DIR/Dockerfile diem/validator_tcb "$@" diff --git a/docker/tag-and-push.sh b/docker/tag-and-push.sh index 838313bb51e66..e217837b80d15 100755 --- a/docker/tag-and-push.sh +++ b/docker/tag-and-push.sh @@ -4,7 +4,7 @@ # tag-and-push.sh is used tag an image with multiple tags and push them to the target repo. Use ":" as the separator # between multiple tags # Example: -# SOURCE=diem_validator:latest TARGET_REPO=1234567890.dkr.ecr.us-west-2.amazonaws.com/diem_forge TARGET_TAGS=master:master_39cnja0 tag-and-push.sh +# SOURCE=aptos_validator:latest TARGET_REPO=1234567890.dkr.ecr.us-west-2.amazonaws.com/aptos_forge TARGET_TAGS=master:master_39cnja0 tag-and-push.sh set -e diff --git a/docker/tools/Dockerfile b/docker/tools/Dockerfile index ee0e4ec4d5bab..dab5f0173cb46 100644 --- a/docker/tools/Dockerfile +++ b/docker/tools/Dockerfile @@ -38,32 +38,32 @@ COPY docker/tools/boto.cfg /etc RUN cd /usr/local/bin && wget https://azcopyvnext.azureedge.net/release20210226/azcopy_linux_amd64_10.9.0.tar.gz -O- | tar --gzip --wildcards --extract '*/azcopy' --strip-components=1 --no-same-owner && chmod +x azcopy RUN wget https://storage.googleapis.com/pub/gsutil.tar.gz -O- | tar --gzip --directory /opt --extract && ln -s /opt/gsutil/gsutil /usr/local/bin -COPY --from=builder /diem/target/release/diem-genesis-tool /usr/local/bin -COPY --from=builder /diem/target/release/diem-operational-tool /usr/local/bin +COPY --from=builder /diem/target/release/aptos-genesis-tool /usr/local/bin +COPY --from=builder /diem/target/release/aptos-operational-tool /usr/local/bin COPY --from=builder /diem/target/release/db-bootstrapper /usr/local/bin COPY --from=builder /diem/target/release/db-backup /usr/local/bin COPY --from=builder /diem/target/release/db-backup-verify /usr/local/bin COPY --from=builder /diem/target/release/db-restore /usr/local/bin -COPY --from=builder /diem/target/release/diem-transaction-replay /usr/local/bin +COPY --from=builder /diem/target/release/aptos-transaction-replay /usr/local/bin ### Get DPN Move modules bytecodes for genesis ceremony RUN mkdir -p /diem/move/build RUN mkdir -p /diem/move/modules -COPY --from=builder /diem/diem-move/diem-framework/DPN/releases/artifacts/current/build /diem/move/build +COPY --from=builder /diem/aptos-move/diem-framework/DPN/releases/artifacts/current/build /diem/move/build RUN mv /diem/move/build/**/bytecode_modules/*.mv /diem/move/modules RUN rm -rf /diem/move/build ### Get experimental Move modules bytecodes for genesis ceremony RUN mkdir -p /experimental/move/build RUN mkdir -p /experimental/move/modules -COPY --from=builder /diem/diem-move/diem-framework/experimental/releases/artifacts/current/build /experimental/move/build +COPY --from=builder /diem/aptos-move/diem-framework/experimental/releases/artifacts/current/build /experimental/move/build RUN mv /experimental/move/build/**/bytecode_modules/*.mv /experimental/move/modules RUN rm -rf /experimental/move/build ### Get Aptos Move modules bytecodes for genesis ceremony RUN mkdir -p /aptos-framework/move/build RUN mkdir -p /aptos-framework/move/modules -COPY --from=builder /diem/diem-move/diem-framework/aptos-framework/releases/artifacts/current/build /aptos-framework/move/build +COPY --from=builder /diem/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build /aptos-framework/move/build RUN mv /aptos-framework/move/build/**/bytecode_modules/*.mv /aptos-framework/move/modules RUN rm -rf /aptos-framework/move/build diff --git a/docker/tools/build.sh b/docker/tools/build.sh index c981895d30fa6..407322e9f7df6 100755 --- a/docker/tools/build.sh +++ b/docker/tools/build.sh @@ -5,4 +5,4 @@ set -e DIR="$( cd "$( dirname "$0" )" && pwd )" -$DIR/../diem-build.sh $DIR/Dockerfile diem/tools "$@" +$DIR/../aptos-build.sh $DIR/Dockerfile diem/tools "$@" diff --git a/docker/validator/Dockerfile b/docker/validator/Dockerfile index 98497306bc7fa..4f4be256a4899 100644 --- a/docker/validator/Dockerfile +++ b/docker/validator/Dockerfile @@ -30,7 +30,7 @@ RUN addgroup --system --gid 6180 diem && adduser --system --ingroup diem --no-cr RUN mkdir -p /opt/diem/bin /opt/diem/etc COPY docker/install-tools.sh /root -COPY --from=builder /diem/target/release/diem-node /opt/diem/bin +COPY --from=builder /diem/target/release/aptos-node /opt/diem/bin COPY --from=builder /diem/target/release/db-backup /opt/diem/bin COPY --from=builder /diem/target/release/db-bootstrapper /opt/diem/bin COPY --from=builder /diem/target/release/db-restore /opt/diem/bin diff --git a/docker/validator/build.sh b/docker/validator/build.sh index 1e2b03f84fb0f..5708fc18b18a9 100755 --- a/docker/validator/build.sh +++ b/docker/validator/build.sh @@ -5,4 +5,4 @@ set -e DIR="$( cd "$( dirname "$0" )" && pwd )" -$DIR/../diem-build.sh $DIR/../validator/Dockerfile diem/validator "$@" +$DIR/../aptos-build.sh $DIR/../validator/Dockerfile diem/validator "$@" diff --git a/documentation/coding_guidelines.md b/documentation/coding_guidelines.md index 4a9adbb23fac0..18876a4b604b5 100644 --- a/documentation/coding_guidelines.md +++ b/documentation/coding_guidelines.md @@ -181,8 +181,8 @@ Error handling suggestions follow the [Rust book guidance](https://doc.rust-lang *Fallible functions* -* `duration_since_epoch()` - to obtain the unix time, call the function provided by `diem-infallible`. -* `RwLock` and `Mutex` - Instead of calling `unwrap()` on the standard library implementations of these functions, use the infallible equivalent types that we provide in `diem-infallible`. +* `duration_since_epoch()` - to obtain the unix time, call the function provided by `aptos-infallible`. +* `RwLock` and `Mutex` - Instead of calling `unwrap()` on the standard library implementations of these functions, use the infallible equivalent types that we provide in `aptos-infallible`. *Panic* @@ -293,7 +293,7 @@ References: *Fuzzing* -Diem contains harnesses for fuzzing crash-prone code like deserializers, using [`libFuzzer`](https://llvm.org/docs/LibFuzzer.html) through [`cargo fuzz`](https://rust-fuzz.github.io/book/cargo-fuzz.html). For more examples, see the `testsuite/diem_fuzzer` directory. +Diem contains harnesses for fuzzing crash-prone code like deserializers, using [`libFuzzer`](https://llvm.org/docs/LibFuzzer.html) through [`cargo fuzz`](https://rust-fuzz.github.io/book/cargo-fuzz.html). For more examples, see the `testsuite/aptos_fuzzer` directory. ### Conditional compilation of tests diff --git a/execution/db-bootstrapper/Cargo.toml b/execution/db-bootstrapper/Cargo.toml index 4535d7e5d43f1..c4bc14d60a3dd 100644 --- a/execution/db-bootstrapper/Cargo.toml +++ b/execution/db-bootstrapper/Cargo.toml @@ -15,11 +15,11 @@ structopt = "0.3.21" executor = { path = "../executor" } bcs = "0.1.2" -diemdb = { path = "../../storage/diemdb" } -diem-config = { path = "../../config" } -diem-crypto = { path = "../../crates/diem-crypto" } -diem-temppath = { path = "../../crates/diem-temppath" } -diem-types = { path = "../../types" } -diem-vm = { path = "../../diem-move/diem-vm" } -diem-workspace-hack = { version = "0.1", path = "../../crates/diem-workspace-hack" } +aptosdb = { path = "../../storage/aptosdb" } +aptos-config = { path = "../../config" } +aptos-crypto = { path = "../../crates/aptos-crypto" } +aptos-temppath = { path = "../../crates/aptos-temppath" } +aptos-types = { path = "../../types" } +aptos-vm = { path = "../../aptos-move/aptos-vm" } +aptos-workspace-hack = { version = "0.1", path = "../../crates/aptos-workspace-hack" } storage-interface = { path = "../../storage/storage-interface" } diff --git a/execution/db-bootstrapper/src/bin/db-bootstrapper.rs b/execution/db-bootstrapper/src/bin/db-bootstrapper.rs index 02deb893476a0..ce59943dbea39 100644 --- a/execution/db-bootstrapper/src/bin/db-bootstrapper.rs +++ b/execution/db-bootstrapper/src/bin/db-bootstrapper.rs @@ -2,11 +2,11 @@ // SPDX-License-Identifier: Apache-2.0 use anyhow::{ensure, format_err, Context, Result}; -use diem_config::config::RocksdbConfig; -use diem_temppath::TempPath; -use diem_types::{transaction::Transaction, waypoint::Waypoint}; -use diem_vm::DiemVM; -use diemdb::DiemDB; +use aptos_config::config::RocksdbConfig; +use aptos_temppath::TempPath; +use aptos_types::{transaction::Transaction, waypoint::Waypoint}; +use aptos_vm::DiemVM; +use aptosdb::DiemDB; use executor::db_bootstrapper::calculate_genesis; use std::{ fs::File, diff --git a/execution/execution-correctness/Cargo.toml b/execution/execution-correctness/Cargo.toml index 7bbb2ba5e58df..3732791f884f6 100644 --- a/execution/execution-correctness/Cargo.toml +++ b/execution/execution-correctness/Cargo.toml @@ -14,17 +14,17 @@ consensus-types = { path = "../../consensus/consensus-types", default-features = executor = { path = "../executor" } executor-types = { path = "../executor-types" } bcs = "0.1.2" -diem-config = { path = "../../config" } -diem-crypto = { path = "../../crates/diem-crypto" } -diem-global-constants = { path = "../../config/global-constants"} -diem-logger = { path = "../../crates/diem-logger" } -diem-infallible = { path = "../../crates/diem-infallible" } -diem-secure-net = { path = "../../secure/net" } -diem-secure-storage = { path = "../../secure/storage" } -diem-temppath = { path = "../../crates/diem-temppath" } -diem-types = { path = "../../types" } -diem-vm = { path = "../../diem-move/diem-vm" } -diem-workspace-hack = { version = "0.1", path = "../../crates/diem-workspace-hack" } +aptos-config = { path = "../../config" } +aptos-crypto = { path = "../../crates/aptos-crypto" } +aptos-global-constants = { path = "../../config/global-constants"} +aptos-logger = { path = "../../crates/aptos-logger" } +aptos-infallible = { path = "../../crates/aptos-infallible" } +aptos-secure-net = { path = "../../secure/net" } +aptos-secure-storage = { path = "../../secure/storage" } +aptos-temppath = { path = "../../crates/aptos-temppath" } +aptos-types = { path = "../../types" } +aptos-vm = { path = "../../aptos-move/aptos-vm" } +aptos-workspace-hack = { version = "0.1", path = "../../crates/aptos-workspace-hack" } serde = { version = "1.0.124", default-features = false } storage-client = { path = "../../storage/storage-client" } storage-interface = { path = "../../storage/storage-interface" } @@ -35,9 +35,9 @@ executor-test-helpers = { path = "../executor-test-helpers", optional = true } [dev-dependencies] consensus-types = { path = "../../consensus/consensus-types", default-features = false, features = ["fuzzing"] } executor-test-helpers = { path = "../executor-test-helpers" } -diem-config = { path = "../../config" , features = ["fuzzing"] } -diem-genesis-tool = {path = "../../config/management/genesis", features = ["testing"] } -diem-transaction-builder = { path = "../../sdk/transaction-builder" } +aptos-config = { path = "../../config" , features = ["fuzzing"] } +aptos-genesis-tool = {path = "../../config/management/genesis", features = ["testing"] } +aptos-transaction-builder = { path = "../../sdk/transaction-builder" } [features] -fuzzing = ["diem-config/fuzzing", "consensus-types/fuzzing"] +fuzzing = ["aptos-config/fuzzing", "consensus-types/fuzzing"] diff --git a/execution/execution-correctness/src/execution_correctness.rs b/execution/execution-correctness/src/execution_correctness.rs index fdc5263dbbb5c..334fdb93f576f 100644 --- a/execution/execution-correctness/src/execution_correctness.rs +++ b/execution/execution-correctness/src/execution_correctness.rs @@ -1,9 +1,9 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 +use aptos_crypto::HashValue; +use aptos_types::ledger_info::LedgerInfoWithSignatures; use consensus_types::block::Block; -use diem_crypto::HashValue; -use diem_types::ledger_info::LedgerInfoWithSignatures; use executor_types::{Error, StateComputeResult}; /// Interface for ExecutionCorrectness. diff --git a/execution/execution-correctness/src/execution_correctness_manager.rs b/execution/execution-correctness/src/execution_correctness_manager.rs index ffa06420054c0..19041d52f64e5 100644 --- a/execution/execution-correctness/src/execution_correctness_manager.rs +++ b/execution/execution-correctness/src/execution_correctness_manager.rs @@ -9,12 +9,12 @@ use crate::{ serializer::{SerializerClient, SerializerService}, thread::ThreadService, }; -use diem_config::config::{ExecutionCorrectnessService, NodeConfig}; -use diem_crypto::ed25519::Ed25519PrivateKey; -use diem_global_constants::EXECUTION_KEY; -use diem_secure_storage::{CryptoStorage, Storage}; +use aptos_config::config::{ExecutionCorrectnessService, NodeConfig}; +use aptos_crypto::ed25519::Ed25519PrivateKey; +use aptos_global_constants::EXECUTION_KEY; +use aptos_secure_storage::{CryptoStorage, Storage}; -use diem_vm::DiemVM; +use aptos_vm::DiemVM; use executor::block_executor::BlockExecutor; use std::{convert::TryInto, net::SocketAddr, sync::Arc}; use storage_client::StorageClient; diff --git a/execution/execution-correctness/src/local.rs b/execution/execution-correctness/src/local.rs index 233e36d0dff19..3621ffc8b2b0a 100644 --- a/execution/execution-correctness/src/local.rs +++ b/execution/execution-correctness/src/local.rs @@ -2,9 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 use crate::execution_correctness::ExecutionCorrectness; +use aptos_crypto::{ed25519::Ed25519PrivateKey, traits::SigningKey, HashValue}; +use aptos_types::ledger_info::LedgerInfoWithSignatures; use consensus_types::{block::Block, vote_proposal::VoteProposal}; -use diem_crypto::{ed25519::Ed25519PrivateKey, traits::SigningKey, HashValue}; -use diem_types::ledger_info::LedgerInfoWithSignatures; use executor_types::{BlockExecutorTrait, Error, StateComputeResult}; use std::{boxed::Box, sync::Arc}; diff --git a/execution/execution-correctness/src/main.rs b/execution/execution-correctness/src/main.rs index 09ccc3ec1f434..c19d10ccda888 100644 --- a/execution/execution-correctness/src/main.rs +++ b/execution/execution-correctness/src/main.rs @@ -5,7 +5,7 @@ #![forbid(unsafe_code)] -use diem_config::config::NodeConfig; +use aptos_config::config::NodeConfig; use execution_correctness::Process; use std::{env, process}; @@ -22,7 +22,7 @@ fn main() { process::exit(1); }); - diem_logger::Logger::new() + aptos_logger::Logger::new() .channel_size(config.logger.chan_size) .is_async(config.logger.is_async) .level(config.logger.level) diff --git a/execution/execution-correctness/src/process.rs b/execution/execution-correctness/src/process.rs index 0b2fa3a2dc35a..16b25dc490561 100644 --- a/execution/execution-correctness/src/process.rs +++ b/execution/execution-correctness/src/process.rs @@ -5,8 +5,8 @@ use crate::{ execution_correctness_manager, remote_service::{self, RemoteService}, }; -use diem_config::config::{ExecutionCorrectnessService, NodeConfig}; -use diem_crypto::ed25519::Ed25519PrivateKey; +use aptos_config::config::{ExecutionCorrectnessService, NodeConfig}; +use aptos_crypto::ed25519::Ed25519PrivateKey; use std::net::SocketAddr; pub struct Process { diff --git a/execution/execution-correctness/src/remote_service.rs b/execution/execution-correctness/src/remote_service.rs index dd5af86dad770..08714faeaa819 100644 --- a/execution/execution-correctness/src/remote_service.rs +++ b/execution/execution-correctness/src/remote_service.rs @@ -4,12 +4,12 @@ use crate::serializer::{ ExecutionCorrectnessInput, SerializerClient, SerializerService, TSerializerClient, }; -use diem_crypto::ed25519::Ed25519PrivateKey; -use diem_infallible::Mutex; -use diem_logger::warn; -use diem_secure_net::{NetworkClient, NetworkServer}; +use aptos_crypto::ed25519::Ed25519PrivateKey; +use aptos_infallible::Mutex; +use aptos_logger::warn; +use aptos_secure_net::{NetworkClient, NetworkServer}; -use diem_vm::DiemVM; +use aptos_vm::DiemVM; use executor::block_executor::BlockExecutor; use executor_types::Error; use std::net::SocketAddr; diff --git a/execution/execution-correctness/src/serializer.rs b/execution/execution-correctness/src/serializer.rs index 2021a7b69b32c..2e51f325c87fe 100644 --- a/execution/execution-correctness/src/serializer.rs +++ b/execution/execution-correctness/src/serializer.rs @@ -2,9 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 use crate::execution_correctness::ExecutionCorrectness; +use aptos_crypto::{ed25519::Ed25519PrivateKey, traits::SigningKey, HashValue}; +use aptos_types::ledger_info::LedgerInfoWithSignatures; use consensus_types::{block::Block, vote_proposal::VoteProposal}; -use diem_crypto::{ed25519::Ed25519PrivateKey, traits::SigningKey, HashValue}; -use diem_types::ledger_info::LedgerInfoWithSignatures; use executor_types::{BlockExecutorTrait, Error, StateComputeResult}; use serde::{Deserialize, Serialize}; use std::sync::Arc; diff --git a/execution/execution-correctness/src/tests/local.rs b/execution/execution-correctness/src/tests/local.rs index 2147b4b9eae3d..9c8647be7f542 100644 --- a/execution/execution-correctness/src/tests/local.rs +++ b/execution/execution-correctness/src/tests/local.rs @@ -4,7 +4,7 @@ use crate::{ execution_correctness::ExecutionCorrectness, tests::suite, ExecutionCorrectnessManager, }; -use diem_crypto::{ +use aptos_crypto::{ ed25519::{Ed25519PrivateKey, Ed25519PublicKey}, Uniform, }; diff --git a/execution/execution-correctness/src/tests/serializer.rs b/execution/execution-correctness/src/tests/serializer.rs index 28c5670e2c4d3..24ed69db7de9a 100644 --- a/execution/execution-correctness/src/tests/serializer.rs +++ b/execution/execution-correctness/src/tests/serializer.rs @@ -4,7 +4,7 @@ use crate::{ execution_correctness::ExecutionCorrectness, tests::suite, ExecutionCorrectnessManager, }; -use diem_crypto::{ +use aptos_crypto::{ ed25519::{Ed25519PrivateKey, Ed25519PublicKey}, Uniform, }; diff --git a/execution/execution-correctness/src/tests/suite.rs b/execution/execution-correctness/src/tests/suite.rs index 21e09a9002e7c..556b9206593a5 100644 --- a/execution/execution-correctness/src/tests/suite.rs +++ b/execution/execution-correctness/src/tests/suite.rs @@ -2,12 +2,12 @@ // SPDX-License-Identifier: Apache-2.0 use crate::execution_correctness::ExecutionCorrectness; +use aptos_crypto::{ed25519::*, traits::Signature}; use consensus_types::{block::Block, vote_proposal::VoteProposal}; -use diem_crypto::{ed25519::*, traits::Signature}; use executor_test_helpers::{extract_signer, gen_ledger_info_with_sigs}; pub fn run_test_suite(executor_pair: (Box, Option)) { - let (mut config, _genesis_key) = diem_genesis_tool::test_config(); + let (mut config, _genesis_key) = aptos_genesis_tool::test_config(); let signer = extract_signer(&mut config); let (executor, execution_pubkey) = executor_pair; let parent_block_id = executor.committed_block_id().unwrap(); diff --git a/execution/execution-correctness/src/tests/thread.rs b/execution/execution-correctness/src/tests/thread.rs index 4af0a91d60fee..d10f2d6e1a48f 100644 --- a/execution/execution-correctness/src/tests/thread.rs +++ b/execution/execution-correctness/src/tests/thread.rs @@ -4,7 +4,7 @@ use crate::{ execution_correctness::ExecutionCorrectness, tests::suite, ExecutionCorrectnessManager, }; -use diem_crypto::{ +use aptos_crypto::{ ed25519::{Ed25519PrivateKey, Ed25519PublicKey}, Uniform, }; diff --git a/execution/execution-correctness/src/thread.rs b/execution/execution-correctness/src/thread.rs index 8c8d978caf7ec..4268bec97ec8b 100644 --- a/execution/execution-correctness/src/thread.rs +++ b/execution/execution-correctness/src/thread.rs @@ -8,8 +8,8 @@ //! in testing correctness of the communication layer between ExecutionCorrectness and SafetyRules. use crate::remote_service::{self, RemoteService}; -use diem_config::utils; -use diem_crypto::ed25519::Ed25519PrivateKey; +use aptos_config::utils; +use aptos_crypto::ed25519::Ed25519PrivateKey; use std::{ net::{IpAddr, Ipv4Addr, SocketAddr}, thread::{self, JoinHandle}, diff --git a/execution/execution-correctness/tests/binary.rs b/execution/execution-correctness/tests/binary.rs index 7ebdd96ec0ab4..7db40ef3c8c07 100644 --- a/execution/execution-correctness/tests/binary.rs +++ b/execution/execution-correctness/tests/binary.rs @@ -1,7 +1,7 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_config::{ +use aptos_config::{ config::{ExecutionCorrectnessService, PersistableConfig, RemoteExecutionService}, utils, }; @@ -17,7 +17,7 @@ fn test_rest() { config.execution.service = ExecutionCorrectnessService::Process(RemoteExecutionService { server_address }); - let config_path = diem_temppath::TempPath::new(); + let config_path = aptos_temppath::TempPath::new(); config_path.create_as_file().unwrap(); config.save_config(config_path.path()).unwrap(); diff --git a/execution/executor-benchmark/Cargo.toml b/execution/executor-benchmark/Cargo.toml index ec826fd59b321..bb16822c3bd7d 100644 --- a/execution/executor-benchmark/Cargo.toml +++ b/execution/executor-benchmark/Cargo.toml @@ -22,30 +22,30 @@ serde = "1.0.124" structopt = "0.3.21" toml = "0.5.8" -diemdb = { path = "../../storage/diemdb" } -diem-config = { path = "../../config" } -diem-crypto = { path = "../../crates/diem-crypto" } -diem-genesis-tool = {path = "../../config/management/genesis", features = ["testing"] } -diem-infallible = { path = "../../crates/diem-infallible" } -diem-jellyfish-merkle = { path = "../../storage/jellyfish-merkle" } -diem-logger = { path = "../../crates/diem-logger" } -diem-secure-push-metrics = { path = "../../secure/push-metrics" } -diem-types = { path = "../../types" } -diem-vm= { path = "../../diem-move/diem-vm" } -diem-workspace-hack = { version = "0.1", path = "../../crates/diem-workspace-hack" } +aptosdb = { path = "../../storage/aptosdb" } +aptos-config = { path = "../../config" } +aptos-crypto = { path = "../../crates/aptos-crypto" } +aptos-genesis-tool = {path = "../../config/management/genesis", features = ["testing"] } +aptos-infallible = { path = "../../crates/aptos-infallible" } +aptos-jellyfish-merkle = { path = "../../storage/jellyfish-merkle" } +aptos-logger = { path = "../../crates/aptos-logger" } +aptos-secure-push-metrics = { path = "../../secure/push-metrics" } +aptos-types = { path = "../../types" } +aptos-vm= { path = "../../aptos-move/aptos-vm" } +aptos-workspace-hack = { version = "0.1", path = "../../crates/aptos-workspace-hack" } executor = { path = "../executor" } executor-types = { path = "../executor-types" } schemadb = { path = "../../storage/schemadb" } storage-client = { path = "../../storage/storage-client" } storage-interface = { path = "../../storage/storage-interface" } -diem-transaction-builder = { path = "../../sdk/transaction-builder" } +aptos-transaction-builder = { path = "../../sdk/transaction-builder" } [dev-dependencies] -diem-temppath = { path = "../../crates/diem-temppath" } +aptos-temppath = { path = "../../crates/aptos-temppath" } [features] default = [] -fuzzing = ["diem-config/fuzzing", "diem-crypto/fuzzing", "diem-types/fuzzing"] +fuzzing = ["aptos-config/fuzzing", "aptos-crypto/fuzzing", "aptos-types/fuzzing"] [[bench]] name = "executor_benchmark" diff --git a/execution/executor-benchmark/benches/executor_benchmark.rs b/execution/executor-benchmark/benches/executor_benchmark.rs index 2115489287332..f42f580a4dc61 100644 --- a/execution/executor-benchmark/benches/executor_benchmark.rs +++ b/execution/executor-benchmark/benches/executor_benchmark.rs @@ -20,7 +20,7 @@ pub const INITIAL_BALANCE: u64 = 1000000; // fn executor_benchmark(c: &mut Criterion) { - let (config, genesis_key) = diem_genesis_tool::test_config(); + let (config, genesis_key) = aptos_genesis_tool::test_config(); let (_db, executor) = init_db_and_executor(&config); let parent_block_id = executor.committed_block_id(); diff --git a/execution/executor-benchmark/src/db_generator.rs b/execution/executor-benchmark/src/db_generator.rs index 53e6bf82c1f84..ca6cea7830953 100644 --- a/execution/executor-benchmark/src/db_generator.rs +++ b/execution/executor-benchmark/src/db_generator.rs @@ -5,13 +5,13 @@ use crate::{ transaction_executor::TransactionExecutor, transaction_generator::TransactionGenerator, TransactionCommitter, }; -use diem_config::{config::RocksdbConfig, utils::get_genesis_txn}; -use diem_jellyfish_merkle::metrics::{ +use aptos_config::{config::RocksdbConfig, utils::get_genesis_txn}; +use aptos_jellyfish_merkle::metrics::{ DIEM_JELLYFISH_INTERNAL_ENCODED_BYTES, DIEM_JELLYFISH_LEAF_ENCODED_BYTES, DIEM_JELLYFISH_STORAGE_READS, }; -use diem_vm::DiemVM; -use diemdb::{ +use aptos_vm::DiemVM; +use aptosdb::{ metrics::DIEM_STORAGE_ROCKSDB_PROPERTIES, schema::JELLYFISH_MERKLE_NODE_CF_NAME, DiemDB, }; use executor::{ @@ -36,12 +36,12 @@ pub fn run( println!("Initializing..."); if db_dir.as_ref().exists() { - fs::remove_dir_all(db_dir.as_ref().join("diemdb")).unwrap_or(()); + fs::remove_dir_all(db_dir.as_ref().join("aptosdb")).unwrap_or(()); } // create if not exists fs::create_dir_all(db_dir.as_ref()).unwrap(); - let (config, genesis_key) = diem_genesis_tool::test_config(); + let (config, genesis_key) = aptos_genesis_tool::test_config(); // Create executor. let (db, db_rw) = DbReaderWriter::wrap( DiemDB::open( diff --git a/execution/executor-benchmark/src/lib.rs b/execution/executor-benchmark/src/lib.rs index 07da49872b1d3..fd200151f5bbb 100644 --- a/execution/executor-benchmark/src/lib.rs +++ b/execution/executor-benchmark/src/lib.rs @@ -10,11 +10,11 @@ use crate::{ transaction_committer::TransactionCommitter, transaction_executor::TransactionExecutor, transaction_generator::TransactionGenerator, }; -use diem_config::config::{NodeConfig, RocksdbConfig}; -use diem_logger::prelude::*; +use aptos_config::config::{NodeConfig, RocksdbConfig}; +use aptos_logger::prelude::*; -use diem_vm::DiemVM; -use diemdb::DiemDB; +use aptos_vm::DiemVM; +use aptosdb::DiemDB; use executor::block_executor::BlockExecutor; use executor_types::BlockExecutorTrait; use std::{ @@ -51,7 +51,7 @@ pub fn run_benchmark( ) { // Create rocksdb checkpoint. if checkpoint_dir.as_ref().exists() { - fs::remove_dir_all(checkpoint_dir.as_ref().join("diemdb")).unwrap_or(()); + fs::remove_dir_all(checkpoint_dir.as_ref().join("aptosdb")).unwrap_or(()); } std::fs::create_dir_all(checkpoint_dir.as_ref()).unwrap(); @@ -63,10 +63,10 @@ pub fn run_benchmark( true, /* account_count_migration */ ) .expect("db open failure.") - .create_checkpoint(checkpoint_dir.as_ref().join("diemdb")) + .create_checkpoint(checkpoint_dir.as_ref().join("aptosdb")) .expect("db checkpoint creation fails."); - let (mut config, genesis_key) = diem_genesis_tool::test_config(); + let (mut config, genesis_key) = aptos_genesis_tool::test_config(); config.storage.dir = checkpoint_dir.as_ref().to_path_buf(); let (db, executor) = init_db_and_executor(&config); @@ -128,7 +128,7 @@ pub fn run_benchmark( #[cfg(test)] mod tests { - use diem_temppath::TempPath; + use aptos_temppath::TempPath; #[test] fn test_benchmark() { diff --git a/execution/executor-benchmark/src/main.rs b/execution/executor-benchmark/src/main.rs index cec995cb548db..2004072aac3e8 100644 --- a/execution/executor-benchmark/src/main.rs +++ b/execution/executor-benchmark/src/main.rs @@ -1,7 +1,7 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_secure_push_metrics::MetricsPusher; +use aptos_secure_push_metrics::MetricsPusher; use std::path::PathBuf; use structopt::StructOpt; @@ -84,7 +84,7 @@ fn main() { checkpoint_dir, verify, } => { - diem_logger::Logger::new().init(); + aptos_logger::Logger::new().init(); executor_benchmark::run_benchmark( opt.block_size, blocks, diff --git a/execution/executor-benchmark/src/transaction_committer.rs b/execution/executor-benchmark/src/transaction_committer.rs index 6564114d02d10..fbc9926028438 100644 --- a/execution/executor-benchmark/src/transaction_committer.rs +++ b/execution/executor-benchmark/src/transaction_committer.rs @@ -1,15 +1,15 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_crypto::hash::HashValue; -use diem_logger::prelude::*; -use diem_types::{ +use aptos_crypto::hash::HashValue; +use aptos_logger::prelude::*; +use aptos_types::{ block_info::BlockInfo, ledger_info::{LedgerInfo, LedgerInfoWithSignatures}, transaction::Version, }; -use diem_vm::DiemVM; -use diemdb::metrics::DIEM_STORAGE_API_LATENCY_SECONDS; +use aptos_vm::DiemVM; +use aptosdb::metrics::DIEM_STORAGE_API_LATENCY_SECONDS; use executor::{ block_executor::BlockExecutor, metrics::{ diff --git a/execution/executor-benchmark/src/transaction_executor.rs b/execution/executor-benchmark/src/transaction_executor.rs index 69a4a563ff803..105a5018a5b6b 100644 --- a/execution/executor-benchmark/src/transaction_executor.rs +++ b/execution/executor-benchmark/src/transaction_executor.rs @@ -1,9 +1,9 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_crypto::hash::HashValue; -use diem_types::transaction::{Transaction, Version}; -use diem_vm::DiemVM; +use aptos_crypto::hash::HashValue; +use aptos_types::transaction::{Transaction, Version}; +use aptos_vm::DiemVM; use executor::block_executor::BlockExecutor; use executor_types::BlockExecutorTrait; use std::{ diff --git a/execution/executor-benchmark/src/transaction_generator.rs b/execution/executor-benchmark/src/transaction_generator.rs index 1af2634a2a6a7..cc4c26da7d6ca 100644 --- a/execution/executor-benchmark/src/transaction_generator.rs +++ b/execution/executor-benchmark/src/transaction_generator.rs @@ -1,16 +1,15 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use chrono::Local; -use diem_crypto::{ +use aptos_crypto::{ ed25519::{Ed25519PrivateKey, Ed25519PublicKey}, PrivateKey, SigningKey, Uniform, }; -use diem_logger::info; -use diem_transaction_builder::stdlib::{ +use aptos_logger::info; +use aptos_transaction_builder::stdlib::{ encode_create_parent_vasp_account_script, encode_peer_to_peer_with_metadata_script, }; -use diem_types::{ +use aptos_types::{ account_address::AccountAddress, account_config::{ testnet_dd_account_address, treasury_compliance_account_address, xus_tag, AccountResource, @@ -22,6 +21,7 @@ use diem_types::{ Version, }, }; +use chrono::Local; use indicatif::{ProgressBar, ProgressStyle}; use rand::{rngs::StdRng, SeedableRng}; use serde::{Deserialize, Serialize}; @@ -143,7 +143,7 @@ impl TransactionGenerator { for _i in 0..num_accounts { let private_key = Ed25519PrivateKey::generate(&mut rng); let public_key = private_key.public_key(); - let address = diem_types::account_address::from_public_key(&public_key); + let address = aptos_types::account_address::from_public_key(&public_key); let account = AccountData { private_key, public_key, @@ -387,7 +387,7 @@ fn create_transaction( public_key: Ed25519PublicKey, program: Script, ) -> Transaction { - let now = diem_infallible::duration_since_epoch(); + let now = aptos_infallible::duration_since_epoch(); let expiration_time = now.as_secs() + 3600; let raw_txn = RawTransaction::new_script( diff --git a/execution/executor-test-helpers/Cargo.toml b/execution/executor-test-helpers/Cargo.toml index b5f4f71b57da7..945e31fd5a5e0 100644 --- a/execution/executor-test-helpers/Cargo.toml +++ b/execution/executor-test-helpers/Cargo.toml @@ -16,15 +16,15 @@ tempfile = "3.2.0" executor = { path = "../executor" } executor-types = { path = "../executor-types" } -diemdb = { path = "../../storage/diemdb", features = ["fuzzing"] } -diem-config = { path = "../../config" } -diem-crypto = { path = "../../crates/diem-crypto" } -diem-genesis-tool = {path = "../../config/management/genesis", features = ["testing"] } -diem-temppath = { path = "../../crates/diem-temppath" } -diem-types = { path = "../../types", features = ["fuzzing"] } -diem-vm = { path = "../../diem-move/diem-vm" } -diem-workspace-hack = { version = "0.1", path = "../../crates/diem-workspace-hack" } +aptosdb = { path = "../../storage/aptosdb", features = ["fuzzing"] } +aptos-config = { path = "../../config" } +aptos-crypto = { path = "../../crates/aptos-crypto" } +aptos-genesis-tool = {path = "../../config/management/genesis", features = ["testing"] } +aptos-temppath = { path = "../../crates/aptos-temppath" } +aptos-types = { path = "../../types", features = ["fuzzing"] } +aptos-vm = { path = "../../aptos-move/aptos-vm" } +aptos-workspace-hack = { version = "0.1", path = "../../crates/aptos-workspace-hack" } storage-interface = { path = "../../storage/storage-interface" } storage-service = { path = "../../storage/storage-service" } -diem-transaction-builder = { path = "../../sdk/transaction-builder" } -vm-genesis = { path = "../../diem-move/vm-genesis" } +aptos-transaction-builder = { path = "../../sdk/transaction-builder" } +vm-genesis = { path = "../../aptos-move/vm-genesis" } diff --git a/execution/executor-test-helpers/src/integration_test_impl.rs b/execution/executor-test-helpers/src/integration_test_impl.rs index f78ccfa77ff59..0e38c1f95a116 100644 --- a/execution/executor-test-helpers/src/integration_test_impl.rs +++ b/execution/executor-test-helpers/src/integration_test_impl.rs @@ -5,11 +5,11 @@ use crate::{ bootstrap_genesis, gen_block_id, gen_ledger_info_with_sigs, get_test_signed_transaction, }; use anyhow::{anyhow, ensure, Result}; -use diem_crypto::{ed25519::Ed25519PrivateKey, PrivateKey, Uniform}; -use diem_transaction_builder::stdlib::{ +use aptos_crypto::{ed25519::Ed25519PrivateKey, PrivateKey, Uniform}; +use aptos_transaction_builder::stdlib::{ encode_create_parent_vasp_account_script, encode_peer_to_peer_with_metadata_script, }; -use diem_types::{ +use aptos_types::{ account_config::{ from_currency_code_string, testnet_dd_account_address, treasury_compliance_account_address, xus_tag, XUS_NAME, @@ -24,8 +24,8 @@ use diem_types::{ trusted_state::{TrustedState, TrustedStateChange}, waypoint::Waypoint, }; -use diem_vm::DiemVM; -use diemdb::DiemDB; +use aptos_vm::DiemVM; +use aptosdb::DiemDB; use executor::block_executor::BlockExecutor; use executor_types::BlockExecutorTrait; use rand::SeedableRng; @@ -37,12 +37,12 @@ pub fn test_execution_with_storage_impl() -> Arc { let genesis_txn = Transaction::GenesisTransaction(WriteSetPayload::Direct(genesis)); let genesis_key = &vm_genesis::GENESIS_KEYPAIR.0; - let path = diem_temppath::TempPath::new(); + let path = aptos_temppath::TempPath::new(); path.create_as_dir().unwrap(); let (diem_db, db, executor, waypoint) = create_db_and_executor(path.path(), &genesis_txn); let parent_block_id = executor.committed_block_id(); - let signer = diem_types::validator_signer::ValidatorSigner::new( + let signer = aptos_types::validator_signer::ValidatorSigner::new( validators[0].data.address, validators[0].key.clone(), ); diff --git a/execution/executor-test-helpers/src/lib.rs b/execution/executor-test-helpers/src/lib.rs index 2adf5bc428b4f..3fb7bf89e976e 100644 --- a/execution/executor-test-helpers/src/lib.rs +++ b/execution/executor-test-helpers/src/lib.rs @@ -3,12 +3,12 @@ pub mod integration_test_impl; -use diem_config::{config::NodeConfig, utils}; -use diem_crypto::{ +use aptos_config::{config::NodeConfig, utils}; +use aptos_crypto::{ ed25519::{Ed25519PrivateKey, Ed25519PublicKey}, HashValue, }; -use diem_types::{ +use aptos_types::{ account_address::AccountAddress, block_info::BlockInfo, block_metadata::BlockMetadata, @@ -18,8 +18,8 @@ use diem_types::{ validator_signer::ValidatorSigner, waypoint::Waypoint, }; -use diem_vm::{DiemVM, VMExecutor}; -use diemdb::DiemDB; +use aptos_vm::{DiemVM, VMExecutor}; +use aptosdb::DiemDB; use executor::db_bootstrapper::{generate_waypoint, maybe_bootstrap}; use executor_types::StateComputeResult; use std::{ @@ -40,7 +40,7 @@ pub fn bootstrap_genesis( } pub fn start_storage_service() -> (NodeConfig, JoinHandle<()>, DbReaderWriter) { - let (mut config, _genesis_key) = diem_genesis_tool::test_config(); + let (mut config, _genesis_key) = aptos_genesis_tool::test_config(); let server_port = utils::get_available_port(); config.storage.address = SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), server_port); let (db, db_rw) = DbReaderWriter::wrap(DiemDB::new_for_test(&config.storage.dir())); diff --git a/execution/executor-types/Cargo.toml b/execution/executor-types/Cargo.toml index 1810b6486810b..d78d5bbaeada6 100644 --- a/execution/executor-types/Cargo.toml +++ b/execution/executor-types/Cargo.toml @@ -15,14 +15,14 @@ serde = { version = "1.0.124", default-features = false } thiserror = "1.0.24" bcs = "0.1.2" -diem-crypto = { path = "../../crates/diem-crypto" } -diem-secure-net = { path = "../../secure/net" } -diem-state-view = { path = "../../storage/state-view" } -diem-types = { path = "../../types" } -diem-workspace-hack = { version = "0.1", path = "../../crates/diem-workspace-hack" } +aptos-crypto = { path = "../../crates/aptos-crypto" } +aptos-secure-net = { path = "../../secure/net" } +aptos-state-view = { path = "../../storage/state-view" } +aptos-types = { path = "../../types" } +aptos-workspace-hack = { version = "0.1", path = "../../crates/aptos-workspace-hack" } scratchpad = { path = "../../storage/scratchpad" } storage-interface = { path = "../../storage/storage-interface" } [features] default = [] -fuzzing = ["diem-crypto/fuzzing", "diem-types/fuzzing"] +fuzzing = ["aptos-crypto/fuzzing", "aptos-types/fuzzing"] diff --git a/execution/executor-types/src/error.rs b/execution/executor-types/src/error.rs index b68ebbe0bde5e..8986ba8f6ef07 100644 --- a/execution/executor-types/src/error.rs +++ b/execution/executor-types/src/error.rs @@ -4,8 +4,8 @@ use serde::{Deserialize, Serialize}; use thiserror::Error; -use diem_crypto::HashValue; -use diem_types::transaction::Version; +use aptos_crypto::HashValue; +use aptos_types::transaction::Version; #[derive(Debug, Deserialize, Error, PartialEq, Serialize)] /// Different reasons for proposal rejection @@ -49,8 +49,8 @@ impl From for Error { } } -impl From for Error { - fn from(error: diem_secure_net::Error) -> Self { +impl From for Error { + fn from(error: aptos_secure_net::Error) -> Self { Self::InternalError { error: format!("{}", error), } diff --git a/execution/executor-types/src/executed_chunk.rs b/execution/executor-types/src/executed_chunk.rs index 0ff48218929f9..addd1264b2a71 100644 --- a/execution/executor-types/src/executed_chunk.rs +++ b/execution/executor-types/src/executed_chunk.rs @@ -5,8 +5,8 @@ use crate::{ExecutedTrees, StateComputeResult, TransactionData}; use anyhow::{ensure, Result}; -use diem_crypto::hash::{CryptoHash, TransactionAccumulatorHasher}; -use diem_types::{ +use aptos_crypto::hash::{CryptoHash, TransactionAccumulatorHasher}; +use aptos_types::{ contract_event::ContractEvent, epoch_state::EpochState, ledger_info::LedgerInfoWithSignatures, diff --git a/execution/executor-types/src/lib.rs b/execution/executor-types/src/lib.rs index 1cbd2b10b8a60..b3cc4186b3025 100644 --- a/execution/executor-types/src/lib.rs +++ b/execution/executor-types/src/lib.rs @@ -9,7 +9,7 @@ mod executed_chunk; pub use error::Error; use anyhow::Result; -use diem_crypto::{ +use aptos_crypto::{ ed25519::Ed25519Signature, hash::{ EventAccumulatorHasher, TransactionAccumulatorHasher, ACCUMULATOR_PLACEHOLDER_HASH, @@ -17,8 +17,8 @@ use diem_crypto::{ }, HashValue, }; -use diem_state_view::StateViewId; -use diem_types::{ +use aptos_state_view::StateViewId; +use aptos_types::{ account_address::AccountAddress, account_state_blob::AccountStateBlob, contract_event::ContractEvent, @@ -40,7 +40,7 @@ use storage_interface::DbReader; pub use executed_chunk::ExecutedChunk; use storage_interface::state_view::VerifiedStateView; -type SparseMerkleProof = diem_types::proof::SparseMerkleProof; +type SparseMerkleProof = aptos_types::proof::SparseMerkleProof; type SparseMerkleTree = scratchpad::SparseMerkleTree; pub trait ChunkExecutorTrait: Send + Sync { diff --git a/execution/executor/Cargo.toml b/execution/executor/Cargo.toml index 08ba9cc760161..11f28d638a872 100644 --- a/execution/executor/Cargo.toml +++ b/execution/executor/Cargo.toml @@ -21,16 +21,16 @@ serde = { version = "1.0.124", features = ["derive"] } consensus-types = { path = "../../consensus/consensus-types"} executor-types = { path = "../executor-types" } bcs = "0.1.2" -diem-crypto = { path = "../../crates/diem-crypto" } -diem-logger = { path = "../../crates/diem-logger" } -diem-metrics = { path = "../../crates/diem-metrics" } -diem-infallible = { path = "../../crates/diem-infallible" } -diem-secure-net = { path = "../../secure/net" } -diem-state-view = { path = "../../storage/state-view" } -diem-types = { path = "../../types" } +aptos-crypto = { path = "../../crates/aptos-crypto" } +aptos-logger = { path = "../../crates/aptos-logger" } +aptos-metrics = { path = "../../crates/aptos-metrics" } +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/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } -diem-vm = { path = "../../diem-move/diem-vm" } -diem-workspace-hack = { version = "0.1", path = "../../crates/diem-workspace-hack" } +aptos-vm = { path = "../../aptos-move/aptos-vm" } +aptos-workspace-hack = { version = "0.1", path = "../../crates/aptos-workspace-hack" } scratchpad = { path = "../../storage/scratchpad" } storage-interface = { path = "../../storage/storage-interface" } @@ -40,18 +40,18 @@ proptest = { version = "1.0.0", optional = true } proptest = "1.0.0" rand = "0.8.3" -diem-framework-releases = { path = "../../diem-move/diem-framework/DPN/releases" } +diem-framework-releases = { path = "../../aptos-move/diem-framework/DPN/releases" } executor-test-helpers = { path = "../executor-test-helpers" } -diem-config = { path = "../../config" } -diem-genesis-tool = {path = "../../config/management/genesis", features = ["testing"] } -diem-temppath = { path = "../../crates/diem-temppath" } -diemdb = { path = "../../storage/diemdb" } +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/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } storage-interface = { path = "../../storage/storage-interface", features=["fuzzing"] } -diem-transaction-builder = { path = "../../sdk/transaction-builder" } -vm-genesis = { path = "../../diem-move/vm-genesis" } +aptos-transaction-builder = { path = "../../sdk/transaction-builder" } +vm-genesis = { path = "../../aptos-move/vm-genesis" } [features] default = [] -fuzzing = ["consensus-types/fuzzing", "diem-crypto/fuzzing", "diem-types/fuzzing", "proptest", "storage-interface/fuzzing"] -failpoints = ["fail/failpoints", "diem-vm/failpoints"] +fuzzing = ["consensus-types/fuzzing", "aptos-crypto/fuzzing", "aptos-types/fuzzing", "proptest", "storage-interface/fuzzing"] +failpoints = ["fail/failpoints", "aptos-vm/failpoints"] diff --git a/execution/executor/src/block_executor.rs b/execution/executor/src/block_executor.rs index 27b924751dfa7..27bc64bcc2e6d 100644 --- a/execution/executor/src/block_executor.rs +++ b/execution/executor/src/block_executor.rs @@ -5,11 +5,11 @@ use crate::logging::{LogEntry, LogSchema}; use anyhow::Result; -use diem_crypto::HashValue; -use diem_logger::prelude::*; -use diem_state_view::StateViewId; -use diem_types::{ledger_info::LedgerInfoWithSignatures, transaction::Transaction}; -use diem_vm::VMExecutor; +use aptos_crypto::HashValue; +use aptos_logger::prelude::*; +use aptos_state_view::StateViewId; +use aptos_types::{ledger_info::LedgerInfoWithSignatures, transaction::Transaction}; +use aptos_vm::VMExecutor; use executor_types::{BlockExecutorTrait, Error, StateComputeResult}; use fail::fail_point; use std::marker::PhantomData; diff --git a/execution/executor/src/chunk_executor.rs b/execution/executor/src/chunk_executor.rs index 903f6f73046d2..632774fddba90 100644 --- a/execution/executor/src/chunk_executor.rs +++ b/execution/executor/src/chunk_executor.rs @@ -16,17 +16,17 @@ use crate::{ }, }; use anyhow::Result; -use diem_infallible::Mutex; -use diem_logger::prelude::*; -use diem_state_view::StateViewId; -use diem_types::{ +use aptos_infallible::Mutex; +use aptos_logger::prelude::*; +use aptos_state_view::StateViewId; +use aptos_types::{ contract_event::ContractEvent, ledger_info::LedgerInfoWithSignatures, transaction::{ Transaction, TransactionInfo, TransactionListWithProof, TransactionOutputListWithProof, }, }; -use diem_vm::VMExecutor; +use aptos_vm::VMExecutor; use executor_types::{ChunkExecutorTrait, ExecutedChunk, ExecutedTrees, TransactionReplayer}; use fail::fail_point; use std::{marker::PhantomData, sync::Arc}; diff --git a/execution/executor/src/components/apply_chunk_output.rs b/execution/executor/src/components/apply_chunk_output.rs index 4ac0baa7c1867..8ec098603c11f 100644 --- a/execution/executor/src/components/apply_chunk_output.rs +++ b/execution/executor/src/components/apply_chunk_output.rs @@ -5,12 +5,12 @@ use crate::{components::chunk_output::ChunkOutput, metrics::DIEM_EXECUTOR_ERRORS}; use anyhow::{anyhow, bail, ensure, Result}; -use diem_crypto::{ +use aptos_crypto::{ hash::{CryptoHash, EventAccumulatorHasher, TransactionAccumulatorHasher}, HashValue, }; -use diem_logger::error; -use diem_types::{ +use aptos_logger::error; +use aptos_types::{ account_address::{AccountAddress, HashAccountAddress}, account_state::AccountState, account_state_blob::AccountStateBlob, diff --git a/execution/executor/src/components/block_tree/mod.rs b/execution/executor/src/components/block_tree/mod.rs index c46b191611828..628c8639af016 100644 --- a/execution/executor/src/components/block_tree/mod.rs +++ b/execution/executor/src/components/block_tree/mod.rs @@ -11,11 +11,11 @@ use crate::{ logging::{LogEntry, LogSchema}, }; use anyhow::{anyhow, ensure, Result}; +use aptos_crypto::HashValue; +use aptos_infallible::Mutex; +use aptos_logger::{debug, info}; +use aptos_types::{ledger_info::LedgerInfo, proof::definition::LeafCount}; use consensus_types::block::Block as ConsensusBlock; -use diem_crypto::HashValue; -use diem_infallible::Mutex; -use diem_logger::{debug, info}; -use diem_types::{ledger_info::LedgerInfo, proof::definition::LeafCount}; use executor_types::{Error, ExecutedChunk}; use std::{ collections::{hash_map::Entry, HashMap}, diff --git a/execution/executor/src/components/block_tree/test.rs b/execution/executor/src/components/block_tree/test.rs index fab69726d9286..43f00a9754aed 100644 --- a/execution/executor/src/components/block_tree/test.rs +++ b/execution/executor/src/components/block_tree/test.rs @@ -2,9 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 use crate::components::block_tree::{epoch_genesis_block_id, BlockLookup, BlockTree}; -use diem_crypto::{hash::PRE_GENESIS_BLOCK_ID, HashValue}; -use diem_infallible::Mutex; -use diem_types::{block_info::BlockInfo, epoch_state::EpochState, ledger_info::LedgerInfo}; +use aptos_crypto::{hash::PRE_GENESIS_BLOCK_ID, HashValue}; +use aptos_infallible::Mutex; +use aptos_types::{block_info::BlockInfo, epoch_state::EpochState, ledger_info::LedgerInfo}; use executor_types::{ExecutedChunk, ExecutedTrees}; use std::sync::Arc; diff --git a/execution/executor/src/components/chunk_output.rs b/execution/executor/src/components/chunk_output.rs index b74812d6c4a71..74f34217132f2 100644 --- a/execution/executor/src/components/chunk_output.rs +++ b/execution/executor/src/components/chunk_output.rs @@ -5,14 +5,14 @@ use crate::components::apply_chunk_output::ApplyChunkOutput; use anyhow::Result; -use diem_crypto::hash::TransactionAccumulatorHasher; -use diem_logger::trace; -use diem_state_view::StateView; -use diem_types::{ +use aptos_crypto::hash::TransactionAccumulatorHasher; +use aptos_logger::trace; +use aptos_state_view::StateView; +use aptos_types::{ proof::accumulator::InMemoryAccumulator, transaction::{Transaction, TransactionOutput}, }; -use diem_vm::VMExecutor; +use aptos_vm::VMExecutor; use executor_types::ExecutedChunk; use fail::fail_point; use std::{collections::HashSet, sync::Arc}; diff --git a/execution/executor/src/db_bootstrapper.rs b/execution/executor/src/db_bootstrapper.rs index ac59be05940d6..dcbea779be297 100644 --- a/execution/executor/src/db_bootstrapper.rs +++ b/execution/executor/src/db_bootstrapper.rs @@ -5,12 +5,12 @@ use crate::components::{apply_chunk_output::IntoLedgerView, chunk_output::ChunkOutput}; use anyhow::{anyhow, ensure, format_err, Result}; -use diem_crypto::HashValue; -use diem_logger::prelude::*; -use diem_state_view::{StateView, StateViewId}; -use diem_types::{ +use aptos_crypto::HashValue; +use aptos_logger::prelude::*; +use aptos_state_view::{StateView, StateViewId}; +use aptos_types::{ access_path::AccessPath, - account_config::diem_root_address, + account_config::aptos_root_address, block_info::{BlockInfo, GENESIS_EPOCH, GENESIS_ROUND, GENESIS_TIMESTAMP_USECS}, diem_timestamp::DiemTimestampResource, ledger_info::{LedgerInfo, LedgerInfoWithSignatures}, @@ -18,7 +18,7 @@ use diem_types::{ transaction::Transaction, waypoint::Waypoint, }; -use diem_vm::VMExecutor; +use aptos_vm::VMExecutor; use executor_types::ExecutedChunk; use move_core_types::move_resource::MoveResource; use std::{collections::btree_map::BTreeMap, sync::Arc}; @@ -178,7 +178,7 @@ pub fn calculate_genesis( fn get_state_timestamp(state_view: &VerifiedStateView) -> Result { let rsrc_bytes = &state_view .get(&AccessPath::new( - diem_root_address(), + aptos_root_address(), DiemTimestampResource::resource_path(), ))? .ok_or_else(|| format_err!("DiemTimestampResource missing."))?; diff --git a/execution/executor/src/fuzzing.rs b/execution/executor/src/fuzzing.rs index 424085d7c6f69..026aa79878e66 100644 --- a/execution/executor/src/fuzzing.rs +++ b/execution/executor/src/fuzzing.rs @@ -3,16 +3,16 @@ use crate::{block_executor::BlockExecutor, chunk_executor::ChunkExecutor}; use anyhow::Result; -use diem_crypto::{hash::SPARSE_MERKLE_PLACEHOLDER_HASH, HashValue}; -use diem_state_view::StateView; -use diem_types::{ +use aptos_crypto::{hash::SPARSE_MERKLE_PLACEHOLDER_HASH, HashValue}; +use aptos_state_view::StateView; +use aptos_types::{ ledger_info::LedgerInfoWithSignatures, transaction::{ Transaction, TransactionListWithProof, TransactionOutput, TransactionToCommit, Version, }, vm_status::VMStatus, }; -use diem_vm::VMExecutor; +use aptos_vm::VMExecutor; use executor_types::{BlockExecutorTrait, ChunkExecutorTrait}; use storage_interface::{DbReader, DbReaderWriter, DbWriter, StartupInfo}; diff --git a/execution/executor/src/logging.rs b/execution/executor/src/logging.rs index fc64456c3728b..f7bf69cb1934e 100644 --- a/execution/executor/src/logging.rs +++ b/execution/executor/src/logging.rs @@ -1,8 +1,8 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_crypto::HashValue; -use diem_logger::Schema; +use aptos_crypto::HashValue; +use aptos_logger::Schema; use serde::Serialize; #[derive(Schema)] diff --git a/execution/executor/src/metrics.rs b/execution/executor/src/metrics.rs index 61b7c4900e71a..3c6fd5f84701b 100644 --- a/execution/executor/src/metrics.rs +++ b/execution/executor/src/metrics.rs @@ -1,7 +1,7 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_metrics::{register_histogram, register_int_counter, Histogram, IntCounter}; +use aptos_metrics::{register_histogram, register_int_counter, Histogram, IntCounter}; use once_cell::sync::Lazy; pub static DIEM_EXECUTOR_EXECUTE_CHUNK_SECONDS: Lazy = Lazy::new(|| { diff --git a/execution/executor/src/mock_vm/mock_vm_test.rs b/execution/executor/src/mock_vm/mock_vm_test.rs index 440b0a5f39f10..9bb7b6056a10d 100644 --- a/execution/executor/src/mock_vm/mock_vm_test.rs +++ b/execution/executor/src/mock_vm/mock_vm_test.rs @@ -3,9 +3,9 @@ use super::{balance_ap, encode_mint_transaction, encode_transfer_transaction, seqnum_ap, MockVM}; use anyhow::Result; -use diem_state_view::StateView; -use diem_types::{access_path::AccessPath, account_address::AccountAddress, write_set::WriteOp}; -use diem_vm::VMExecutor; +use aptos_state_view::StateView; +use aptos_types::{access_path::AccessPath, account_address::AccountAddress, write_set::WriteOp}; +use aptos_vm::VMExecutor; fn gen_address(index: u8) -> AccountAddress { AccountAddress::new([index; AccountAddress::LENGTH]) diff --git a/execution/executor/src/mock_vm/mod.rs b/execution/executor/src/mock_vm/mod.rs index 319d5401d60fc..47d70f2b21702 100644 --- a/execution/executor/src/mock_vm/mod.rs +++ b/execution/executor/src/mock_vm/mod.rs @@ -4,12 +4,12 @@ #[cfg(test)] mod mock_vm_test; -use diem_crypto::{ed25519::Ed25519PrivateKey, PrivateKey, Uniform}; -use diem_state_view::StateView; -use diem_types::{ +use aptos_crypto::{ed25519::Ed25519PrivateKey, PrivateKey, Uniform}; +use aptos_state_view::StateView; +use aptos_types::{ access_path::AccessPath, account_address::AccountAddress, - account_config::{diem_root_address, validator_set_address, XUS_NAME}, + account_config::{aptos_root_address, validator_set_address, XUS_NAME}, chain_id::ChainId, contract_event::ContractEvent, event::EventKey, @@ -24,7 +24,7 @@ use diem_types::{ vm_status::{KeptVMStatus, StatusCode, VMStatus}, write_set::{WriteOp, WriteSet, WriteSetMut}, }; -use diem_vm::VMExecutor; +use aptos_vm::VMExecutor; use move_core_types::{language_storage::TypeTag, move_resource::MoveResource}; use once_cell::sync::Lazy; use std::collections::HashMap; @@ -146,7 +146,7 @@ impl VMExecutor for MockVM { } MockVMTransaction::Reconfiguration => { read_balance_from_storage(state_view, &balance_ap(validator_set_address())); - read_balance_from_storage(state_view, &balance_ap(diem_root_address())); + read_balance_from_storage(state_view, &balance_ap(aptos_root_address())); outputs.push(TransactionOutput::new( // WriteSet cannot be empty so use genesis writeset only for testing. gen_genesis_writeset(), diff --git a/execution/executor/src/tests/chunk_executor_tests.rs b/execution/executor/src/tests/chunk_executor_tests.rs index 6060d5b15881b..b1c026aaa531f 100644 --- a/execution/executor/src/tests/chunk_executor_tests.rs +++ b/execution/executor/src/tests/chunk_executor_tests.rs @@ -10,25 +10,25 @@ use crate::{ mock_vm::{encode_mint_transaction, MockVM}, tests, }; -use diem_crypto::HashValue; -use diem_types::{ +use aptos_crypto::HashValue; +use aptos_types::{ ledger_info::LedgerInfoWithSignatures, transaction::{TransactionListWithProof, TransactionOutputListWithProof}, }; -use diemdb::DiemDB; +use aptosdb::DiemDB; use executor_types::{BlockExecutorTrait, ChunkExecutorTrait}; use proptest::prelude::Rng; use storage_interface::DbReaderWriter; pub struct TestExecutor { - _path: diem_temppath::TempPath, + _path: aptos_temppath::TempPath, pub db: DbReaderWriter, pub executor: ChunkExecutor, } impl TestExecutor { pub fn new() -> TestExecutor { - let path = diem_temppath::TempPath::new(); + let path = aptos_temppath::TempPath::new(); path.create_as_dir().unwrap(); let db = DbReaderWriter::new(DiemDB::new_for_test(path.path())); let genesis = vm_genesis::test_genesis_transaction(); diff --git a/execution/executor/src/tests/mod.rs b/execution/executor/src/tests/mod.rs index 590bea6ad0ba8..5b6ab6961c61e 100644 --- a/execution/executor/src/tests/mod.rs +++ b/execution/executor/src/tests/mod.rs @@ -11,16 +11,16 @@ use crate::{ MockVM, DISCARD_STATUS, KEEP_STATUS, }, }; -use diem_crypto::HashValue; -use diem_state_view::StateViewId; -use diem_types::{ +use aptos_crypto::HashValue; +use aptos_state_view::StateViewId; +use aptos_types::{ account_address::AccountAddress, block_info::BlockInfo, ledger_info::{LedgerInfo, LedgerInfoWithSignatures}, proof::definition::LeafCount, transaction::{Transaction, TransactionListWithProof, TransactionStatus, Version}, }; -use diemdb::DiemDB; +use aptosdb::DiemDB; use executor_types::{BlockExecutorTrait, ChunkExecutorTrait, ExecutedTrees, TransactionReplayer}; use proptest::prelude::*; use std::collections::BTreeMap; @@ -47,14 +47,14 @@ fn execute_and_commit_block( } struct TestExecutor { - _path: diem_temppath::TempPath, + _path: aptos_temppath::TempPath, db: DbReaderWriter, executor: BlockExecutor, } impl TestExecutor { fn new() -> TestExecutor { - let path = diem_temppath::TempPath::new(); + let path = aptos_temppath::TempPath::new(); path.create_as_dir().unwrap(); let db = DbReaderWriter::new(DiemDB::new_for_test(path.path())); let genesis = vm_genesis::test_genesis_transaction(); diff --git a/execution/executor/tests/db_bootstrapper_test.rs b/execution/executor/tests/db_bootstrapper_test.rs index c35eefecd42fd..796c856ae9262 100644 --- a/execution/executor/tests/db_bootstrapper_test.rs +++ b/execution/executor/tests/db_bootstrapper_test.rs @@ -4,12 +4,12 @@ #![forbid(unsafe_code)] use anyhow::Result; -use diem_crypto::{ed25519::Ed25519PrivateKey, HashValue, PrivateKey, Uniform}; -use diem_temppath::TempPath; -use diem_transaction_builder::stdlib::{ +use aptos_crypto::{ed25519::Ed25519PrivateKey, HashValue, PrivateKey, Uniform}; +use aptos_temppath::TempPath; +use aptos_transaction_builder::stdlib::{ encode_create_parent_vasp_account_script, encode_peer_to_peer_with_metadata_script, }; -use diem_types::{ +use aptos_types::{ access_path::AccessPath, account_address::AccountAddress, account_config::{ @@ -34,8 +34,8 @@ use diem_types::{ waypoint::Waypoint, write_set::{WriteOp, WriteSetMut}, }; -use diem_vm::DiemVM; -use diemdb::{DiemDB, GetRestoreHandler}; +use aptos_vm::DiemVM; +use aptosdb::{DiemDB, GetRestoreHandler}; use executor::{ block_executor::BlockExecutor, components::apply_chunk_output::IntoLedgerView, @@ -132,16 +132,16 @@ fn get_demo_accounts() -> ( } fn get_mint_transaction( - diem_root_key: &Ed25519PrivateKey, - diem_root_seq_num: u64, + aptos_root_key: &Ed25519PrivateKey, + aptos_root_seq_num: u64, account: &AccountAddress, amount: u64, ) -> Transaction { get_test_signed_transaction( testnet_dd_account_address(), - /* sequence_number = */ diem_root_seq_num, - diem_root_key.clone(), - diem_root_key.public_key(), + /* sequence_number = */ aptos_root_seq_num, + aptos_root_key.clone(), + aptos_root_key.public_key(), Some(TransactionPayload::Script( encode_peer_to_peer_with_metadata_script(xus_tag(), *account, amount, vec![], vec![]), )), @@ -149,17 +149,17 @@ fn get_mint_transaction( } fn get_account_transaction( - diem_root_key: &Ed25519PrivateKey, - diem_root_seq_num: u64, + aptos_root_key: &Ed25519PrivateKey, + aptos_root_seq_num: u64, account: &AccountAddress, account_key: &Ed25519PrivateKey, ) -> Transaction { let account_auth_key = AuthenticationKey::ed25519(&account_key.public_key()); get_test_signed_transaction( treasury_compliance_account_address(), - /* sequence_number = */ diem_root_seq_num, - diem_root_key.clone(), - diem_root_key.public_key(), + /* sequence_number = */ aptos_root_seq_num, + aptos_root_key.clone(), + aptos_root_key.public_key(), Some(TransactionPayload::Script( encode_create_parent_vasp_account_script( xus_tag(), diff --git a/execution/executor/tests/storage_integration_test.rs b/execution/executor/tests/storage_integration_test.rs index da7e11a38901c..63668ae230470 100644 --- a/execution/executor/tests/storage_integration_test.rs +++ b/execution/executor/tests/storage_integration_test.rs @@ -1,12 +1,12 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_crypto::{ed25519::*, PrivateKey, Uniform}; -use diem_transaction_builder::stdlib::{ +use aptos_crypto::{ed25519::*, PrivateKey, Uniform}; +use aptos_transaction_builder::stdlib::{ encode_peer_to_peer_with_metadata_script, encode_set_validator_config_and_reconfigure_script, }; -use diem_types::{ - account_config::{diem_root_address, treasury_compliance_account_address, xus_tag}, +use aptos_types::{ + account_config::{aptos_root_address, treasury_compliance_account_address, xus_tag}, account_state::AccountState, block_metadata::BlockMetadata, transaction::{Script, Transaction, TransactionPayload, WriteSetPayload}, @@ -25,7 +25,7 @@ use std::convert::TryFrom; #[test] fn test_genesis() { - let path = diem_temppath::TempPath::new(); + let path = aptos_temppath::TempPath::new(); path.create_as_dir().unwrap(); let genesis = vm_genesis::test_genesis_transaction(); let (_, db, _executor, waypoint) = create_db_and_executor(path.path(), &genesis); @@ -43,12 +43,12 @@ fn test_genesis() { let li = state_proof.latest_ledger_info(); assert_eq!(li.version(), 0); - let diem_root_account = db + let aptos_root_account = db .reader - .get_account_state_with_proof(diem_root_address(), 0, 0) + .get_account_state_with_proof(aptos_root_address(), 0, 0) .unwrap(); - diem_root_account - .verify(li, 0, diem_root_address()) + aptos_root_account + .verify(li, 0, aptos_root_address()) .unwrap(); } @@ -57,7 +57,7 @@ fn test_reconfiguration() { // When executing a transaction emits a validator set change, // storage should propagate the new validator set - let path = diem_temppath::TempPath::new(); + let path = aptos_temppath::TempPath::new(); path.create_as_dir().unwrap(); let (genesis, validators) = vm_genesis::test_genesis_change_set_and_validators(Some(1)); let genesis_key = &vm_genesis::GENESIS_KEYPAIR.0; @@ -74,12 +74,12 @@ fn test_reconfiguration() { .reader .get_account_state_with_proof(validator_account, current_version, current_version) .unwrap(); - let diem_root_account_state_with_proof = db + let aptos_root_account_state_with_proof = db .reader - .get_account_state_with_proof(diem_root_address(), current_version, current_version) + .get_account_state_with_proof(aptos_root_address(), current_version, current_version) .unwrap(); assert_eq!( - AccountState::try_from(&diem_root_account_state_with_proof.blob.unwrap()) + AccountState::try_from(&aptos_root_account_state_with_proof.blob.unwrap()) .unwrap() .get_validator_set() .unwrap() @@ -189,12 +189,12 @@ fn test_reconfiguration() { .reader .get_account_state_with_proof(validator_account, current_version, current_version) .unwrap(); - let diem_root_account_state_with_proof = db + let aptos_root_account_state_with_proof = db .reader - .get_account_state_with_proof(diem_root_address(), current_version, current_version) + .get_account_state_with_proof(aptos_root_address(), current_version, current_version) .unwrap(); assert_eq!( - AccountState::try_from(&diem_root_account_state_with_proof.blob.unwrap()) + AccountState::try_from(&aptos_root_account_state_with_proof.blob.unwrap()) .unwrap() .get_validator_set() .unwrap() @@ -212,11 +212,11 @@ fn test_reconfiguration() { ); // test validator's key in the validator set is as expected - let diem_root_account_state_with_proof = db + let aptos_root_account_state_with_proof = db .reader - .get_account_state_with_proof(diem_root_address(), current_version, current_version) + .get_account_state_with_proof(aptos_root_address(), current_version, current_version) .unwrap(); - let blob = &diem_root_account_state_with_proof.blob.unwrap(); + let blob = &aptos_root_account_state_with_proof.blob.unwrap(); assert_eq!( AccountState::try_from(blob) .unwrap() @@ -231,7 +231,7 @@ fn test_reconfiguration() { #[test] fn test_change_publishing_option_to_custom() { - let path = diem_temppath::TempPath::new(); + let path = aptos_temppath::TempPath::new(); path.create_as_dir().unwrap(); let (genesis, validators) = vm_genesis::test_genesis_change_set_and_validators(Some(1)); let genesis_key = &vm_genesis::GENESIS_KEYPAIR.0; @@ -241,7 +241,7 @@ fn test_change_publishing_option_to_custom() { let parent_block_id = executor.committed_block_id(); let treasury_compliance_account = treasury_compliance_account_address(); - let genesis_account = diem_root_address(); + let genesis_account = aptos_root_address(); let signer = ValidatorSigner::new(validators[0].data.address, validators[0].key.clone()); let validator_account = signer.author(); diff --git a/mempool/Cargo.toml b/mempool/Cargo.toml index 4a214e44690ff..d1ae19f836e58 100644 --- a/mempool/Cargo.toml +++ b/mempool/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "diem-mempool" +name = "aptos-mempool" version = "0.1.0" authors = ["Diem Association "] description = "Diem mempool" @@ -26,14 +26,14 @@ tokio-stream = "0.1.4" bounded-executor = { path = "../crates/bounded-executor" } channel = { path = "../crates/channel" } bcs = "0.1.2" -diem-config = { path = "../config" } -diem-crypto = { path = "../crates/diem-crypto" } -diem-logger = { path = "../crates/diem-logger" } -diem-metrics = { path = "../crates/diem-metrics" } -diem-infallible = { path = "../crates/diem-infallible" } -diem-proptest-helpers = { path = "../crates/diem-proptest-helpers", optional = true } -diem-types = { path = "../types" } -diem-workspace-hack = { version = "0.1", path = "../crates/diem-workspace-hack" } +aptos-config = { path = "../config" } +aptos-crypto = { path = "../crates/aptos-crypto" } +aptos-logger = { path = "../crates/aptos-logger" } +aptos-metrics = { path = "../crates/aptos-metrics" } +aptos-infallible = { path = "../crates/aptos-infallible" } +aptos-proptest-helpers = { path = "../crates/aptos-proptest-helpers", optional = true } +aptos-types = { path = "../types" } +aptos-workspace-hack = { version = "0.1", path = "../crates/aptos-workspace-hack" } event-notifications = { path = "../state-sync/inter-component/event-notifications" } mirai-annotations = "1.10.1" mempool-notifications = { path = "../state-sync/inter-component/mempool-notifications" } @@ -51,12 +51,12 @@ storage-service = { path = "../storage/storage-service", optional = true } enum_dispatch = "0.3.5" proptest = "1.0.0" -diem-config = { path = "../config", features = ["fuzzing"] } -diem-id-generator = { path = "../crates/diem-id-generator" } +aptos-config = { path = "../config", features = ["fuzzing"] } +aptos-id-generator = { path = "../crates/aptos-id-generator" } network = { path = "../network", features = ["fuzzing"] } storage-interface = { path = "../storage/storage-interface", features = ["fuzzing"] } [features] default = [] failpoints = ["fail/failpoints", "vm-validator/failpoints"] -fuzzing = ["proptest", "diem-types/fuzzing", "storage-interface/fuzzing", "diem-config/fuzzing"] +fuzzing = ["proptest", "aptos-types/fuzzing", "storage-interface/fuzzing", "aptos-config/fuzzing"] diff --git a/mempool/src/core_mempool/index.rs b/mempool/src/core_mempool/index.rs index c28b372a97a3f..5b890afb80068 100644 --- a/mempool/src/core_mempool/index.rs +++ b/mempool/src/core_mempool/index.rs @@ -7,8 +7,8 @@ use crate::{ counters, logging::{LogEntry, LogSchema}, }; -use diem_logger::prelude::*; -use diem_types::account_address::AccountAddress; +use aptos_logger::prelude::*; +use aptos_types::account_address::AccountAddress; use rand::seq::SliceRandom; use std::{ cmp::Ordering, diff --git a/mempool/src/core_mempool/mempool.rs b/mempool/src/core_mempool/mempool.rs index 4a41b1ef0a69a..3b89679cbe937 100644 --- a/mempool/src/core_mempool/mempool.rs +++ b/mempool/src/core_mempool/mempool.rs @@ -13,10 +13,10 @@ use crate::{ counters, logging::{LogEntry, LogSchema, TxnsLog}, }; -use diem_config::config::NodeConfig; -use diem_crypto::HashValue; -use diem_logger::prelude::*; -use diem_types::{ +use aptos_config::config::NodeConfig; +use aptos_crypto::HashValue; +use aptos_logger::prelude::*; +use aptos_types::{ account_address::AccountAddress, account_config::AccountSequenceInfo, mempool_status::{MempoolStatus, MempoolStatusCode}, @@ -159,7 +159,7 @@ impl Mempool { } let expiration_time = - diem_infallible::duration_since_epoch() + self.system_transaction_timeout; + aptos_infallible::duration_since_epoch() + self.system_transaction_timeout; if timeline_state != TimelineState::NonQualified { self.metrics_cache .insert((txn.sender(), txn.sequence_number()), SystemTime::now()); diff --git a/mempool/src/core_mempool/transaction.rs b/mempool/src/core_mempool/transaction.rs index ea3bb5f3a66b2..33825a1414149 100644 --- a/mempool/src/core_mempool/transaction.rs +++ b/mempool/src/core_mempool/transaction.rs @@ -1,8 +1,8 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_crypto::HashValue; -use diem_types::{ +use aptos_crypto::HashValue; +use aptos_types::{ account_address::AccountAddress, account_config::AccountSequenceInfo, transaction::SignedTransaction, }; diff --git a/mempool/src/core_mempool/transaction_store.rs b/mempool/src/core_mempool/transaction_store.rs index 24c0acba747ef..2bef7baba6911 100644 --- a/mempool/src/core_mempool/transaction_store.rs +++ b/mempool/src/core_mempool/transaction_store.rs @@ -13,10 +13,10 @@ use crate::{ counters, logging::{LogEntry, LogEvent, LogSchema, TxnsLog}, }; -use diem_config::config::MempoolConfig; -use diem_crypto::HashValue; -use diem_logger::prelude::*; -use diem_types::{ +use aptos_config::config::MempoolConfig; +use aptos_crypto::HashValue; +use aptos_logger::prelude::*; +use aptos_types::{ account_address::AccountAddress, account_config::AccountSequenceInfo, mempool_status::{MempoolStatus, MempoolStatusCode}, @@ -455,7 +455,7 @@ impl TransactionStore { &mut self, metrics_cache: &TtlCache<(AccountAddress, u64), SystemTime>, ) { - let now = diem_infallible::duration_since_epoch(); + let now = aptos_infallible::duration_since_epoch(); self.gc(now, true, metrics_cache); } diff --git a/mempool/src/counters.rs b/mempool/src/counters.rs index acb2f4cb9e097..27b3d4f1b597d 100644 --- a/mempool/src/counters.rs +++ b/mempool/src/counters.rs @@ -1,8 +1,8 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_config::network_id::{NetworkId, PeerNetworkId}; -use diem_metrics::{ +use aptos_config::network_id::{NetworkId, PeerNetworkId}; +use aptos_metrics::{ register_histogram, register_histogram_vec, register_int_counter, register_int_counter_vec, register_int_gauge_vec, DurationHistogram, HistogramTimer, HistogramVec, IntCounter, IntCounterVec, IntGauge, IntGaugeVec, @@ -146,7 +146,7 @@ pub static PENDING_MEMPOOL_NETWORK_EVENTS: Lazy = Lazy::new(|| { /// (e.g. # txns in block pulled by consensus, # txns committed from state sync) static MEMPOOL_SERVICE_TXNS: Lazy = Lazy::new(|| { register_histogram_vec!( - "diem_mempool_service_transactions", + "aptos_mempool_service_transactions", "Number of transactions handled in one request/response between mempool and consensus/state sync", &["type"] ) @@ -163,7 +163,7 @@ pub fn mempool_service_transactions(label: &'static str, num: usize) { /// A 'fail' result means the mempool's callback response to consensus/state sync failed. static MEMPOOL_SERVICE_LATENCY: Lazy = Lazy::new(|| { register_histogram_vec!( - "diem_mempool_service_latency_ms", + "aptos_mempool_service_latency_ms", "Latency of mempool processing request from consensus/state sync", &["type", "result"] ) @@ -179,7 +179,7 @@ pub fn mempool_service_latency(label: &'static str, result: &str, duration: Dura /// Counter for types of network messages received by shared mempool static SHARED_MEMPOOL_EVENTS: Lazy = Lazy::new(|| { register_int_counter_vec!( - "diem_shared_mempool_events", + "aptos_shared_mempool_events", "Number of network events received by shared mempool", &["event"] // type of event: "new_peer", "lost_peer", "message" ) @@ -193,7 +193,7 @@ pub fn shared_mempool_event_inc(event: &'static str) { /// Counter for tracking e2e latency for mempool to process txn submission requests from clients and peers static PROCESS_TXN_SUBMISSION_LATENCY: Lazy = Lazy::new(|| { register_histogram_vec!( - "diem_shared_mempool_request_latency", + "aptos_shared_mempool_request_latency", "Latency of mempool processing txn submission requests", &["network"] ) @@ -215,7 +215,7 @@ pub fn process_txn_submit_latency_timer_client() -> HistogramTimer { /// Counter for tracking e2e latency for mempool to process get txn by hash requests from clients and peers static PROCESS_GET_TXN_LATENCY: Lazy = Lazy::new(|| { register_histogram_vec!( - "diem_shared_mempool_get_txn_request_latency", + "aptos_shared_mempool_get_txn_request_latency", "Latency of mempool processing get txn by hash requests", &["network"] ) @@ -231,7 +231,7 @@ pub fn process_get_txn_latency_timer_client() -> HistogramTimer { /// Tracks latency of different stages of txn processing (e.g. vm validation, storage read) pub static PROCESS_TXN_BREAKDOWN_LATENCY: Lazy = Lazy::new(|| { register_histogram_vec!( - "diem_mempool_process_txn_breakdown_latency", + "aptos_mempool_process_txn_breakdown_latency", "Latency of different stages of processing txns in mempool", &["portion"] ) @@ -257,7 +257,7 @@ pub fn shared_mempool_broadcast_latency(network_id: NetworkId, latency: Duration /// Counter for tracking roundtrip-time from sending a broadcast to receiving ACK for that broadcast pub static SHARED_MEMPOOL_BROADCAST_RTT: Lazy = Lazy::new(|| { register_histogram_vec!( - "diem_shared_mempool_broadcast_roundtrip_latency", + "aptos_shared_mempool_broadcast_roundtrip_latency", "Time elapsed between sending a broadcast and receiving an ACK for that broadcast", &["network"] ) @@ -267,7 +267,7 @@ pub static SHARED_MEMPOOL_BROADCAST_RTT: Lazy = Lazy::new(|| { /// Counter tracking number of mempool broadcasts that have not been ACK'ed for static SHARED_MEMPOOL_PENDING_BROADCASTS_COUNT: Lazy = Lazy::new(|| { register_int_gauge_vec!( - "diem_shared_mempool_pending_broadcasts_count", + "aptos_shared_mempool_pending_broadcasts_count", "Number of mempool broadcasts not ACK'ed for yet", &["network", "recipient"] ) @@ -283,7 +283,7 @@ pub fn shared_mempool_pending_broadcasts(peer: &PeerNetworkId) -> IntGauge { static SHARED_MEMPOOL_TRANSACTIONS_PROCESSED: Lazy = Lazy::new(|| { register_int_counter_vec!( - "diem_shared_mempool_transactions_processed", + "aptos_shared_mempool_transactions_processed", "Number of transactions received and handled by shared mempool", &[ "status", // state of transaction processing: "received", "success", status code from failed txn processing @@ -302,7 +302,7 @@ pub fn shared_mempool_transactions_processed_inc(status: &str, network: &str) { /// Counter for number of transactions in each mempool broadcast sent static SHARED_MEMPOOL_TRANSACTION_BROADCAST_SIZE: Lazy = Lazy::new(|| { register_histogram_vec!( - "diem_shared_mempool_transaction_broadcast", + "aptos_shared_mempool_transaction_broadcast", "Number of transactions in each mempool broadcast sent", &["network"] ) @@ -317,7 +317,7 @@ pub fn shared_mempool_broadcast_size(network_id: NetworkId, num_txns: usize) { static SHARED_MEMPOOL_BROADCAST_TYPE_COUNT: Lazy = Lazy::new(|| { register_int_counter_vec!( - "diem_shared_mempool_rebroadcast_count", + "aptos_shared_mempool_rebroadcast_count", "Number of various types of broadcasts executed by shared mempool", &["network", "type"] ) @@ -332,7 +332,7 @@ pub fn shared_mempool_broadcast_type_inc(network_id: NetworkId, label: &str) { static SHARED_MEMPOOL_ACK_TYPE_COUNT: Lazy = Lazy::new(|| { register_int_counter_vec!( - "diem_shared_mempool_ack_count", + "aptos_shared_mempool_ack_count", "Number of various types of ACKs sent/received by shared mempool", &["network", "direction", "type"] ) @@ -347,7 +347,7 @@ pub fn shared_mempool_ack_inc(network_id: NetworkId, direction: &str, label: &'s static TASK_SPAWN_LATENCY: Lazy = Lazy::new(|| { register_histogram_vec!( - "diem_mempool_bounded_executor_spawn_latency", + "aptos_mempool_bounded_executor_spawn_latency", "Time it takes for mempool's coordinator to spawn async tasks", &["task", "stage"] ) @@ -362,7 +362,7 @@ pub fn task_spawn_latency_timer(task: &'static str, stage: &'static str) -> Hist pub static CORE_MEMPOOL_INVARIANT_VIOLATION_COUNT: Lazy = Lazy::new(|| { register_int_counter!( - "diem_mempool_core_mempool_invariant_violated_count", + "aptos_mempool_core_mempool_invariant_violated_count", "Number of times a core mempool invariant was violated" ) .unwrap() @@ -370,7 +370,7 @@ pub static CORE_MEMPOOL_INVARIANT_VIOLATION_COUNT: Lazy = Lazy::new( pub static VM_RECONFIG_UPDATE_FAIL_COUNT: Lazy = Lazy::new(|| { register_int_counter!( - "diem_mempool_vm_reconfig_update_fail_count", + "aptos_mempool_vm_reconfig_update_fail_count", "Number of times mempool's VM reconfig update failed" ) .unwrap() @@ -379,7 +379,7 @@ pub static VM_RECONFIG_UPDATE_FAIL_COUNT: Lazy = Lazy::new(|| { /// Counter for failed Diem network sends static NETWORK_SEND_FAIL: Lazy = Lazy::new(|| { register_int_counter_vec!( - "diem_mempool_network_send_fail_count", + "aptos_mempool_network_send_fail_count", "Number of times mempool network send failure occurs", &["type"] ) @@ -392,7 +392,7 @@ pub fn network_send_fail_inc(label: &'static str) { static UNEXPECTED_NETWORK_MSG_COUNT: Lazy = Lazy::new(|| { register_int_counter_vec!( - "diem_mempool_unexpected_network_count", + "aptos_mempool_unexpected_network_count", "Number of unexpected network msgs received", &["network"] ) @@ -408,7 +408,7 @@ pub fn unexpected_msg_count_inc(network_id: &NetworkId) { /// Counter for failed callback response to JSON RPC pub static CLIENT_CALLBACK_FAIL: Lazy = Lazy::new(|| { register_int_counter!( - "diem_mempool_json_rpc_callback_fail_count", + "aptos_mempool_json_rpc_callback_fail_count", "Number of times callback to JSON RPC failed in mempool" ) .unwrap() @@ -418,7 +418,7 @@ pub static CLIENT_CALLBACK_FAIL: Lazy = Lazy::new(|| { /// did not send static INVALID_ACK_RECEIVED_COUNT: Lazy = Lazy::new(|| { register_int_counter_vec!( - "diem_mempool_unrecognized_ack_received_count", + "aptos_mempool_unrecognized_ack_received_count", "Number of ACK messages received with an invalid request_id that this node's mempool did not send", &["network", "type"] ) @@ -434,7 +434,7 @@ pub fn invalid_ack_inc(network_id: NetworkId, label: &'static str) { /// Counter for number of times a DB read resulted in error pub static DB_ERROR: Lazy = Lazy::new(|| { register_int_counter!( - "diem_mempool_db_error_count", + "aptos_mempool_db_error_count", "Number of times a DB read error was encountered in mempool" ) .unwrap() @@ -444,7 +444,7 @@ pub static DB_ERROR: Lazy = Lazy::new(|| { /// broadcast to, summed across each of its networks static ACTIVE_UPSTREAM_PEERS_COUNT: Lazy = Lazy::new(|| { register_int_gauge_vec!( - "diem_mempool_active_upstream_peers_count", + "aptos_mempool_active_upstream_peers_count", "Number of active upstream peers for the node of this mempool", &["network"] ) @@ -459,7 +459,7 @@ pub fn active_upstream_peers(network_id: &NetworkId) -> IntGauge { pub static MAIN_LOOP: Lazy = Lazy::new(|| { DurationHistogram::new( register_histogram!( - "diem_mempool_main_loop", + "aptos_mempool_main_loop", "Duration of the each run of the event loop" ) .unwrap(), diff --git a/mempool/src/logging.rs b/mempool/src/logging.rs index 98633dd04fb80..413fbfa6ef8d0 100644 --- a/mempool/src/logging.rs +++ b/mempool/src/logging.rs @@ -3,9 +3,9 @@ use crate::shared_mempool::types::{BatchId, ConsensusRequest}; use anyhow::Error; -use diem_config::network_id::{NetworkId, PeerNetworkId}; -use diem_logger::Schema; -use diem_types::{account_address::AccountAddress, on_chain_config::OnChainConfigPayload}; +use aptos_config::network_id::{NetworkId, PeerNetworkId}; +use aptos_logger::Schema; +use aptos_types::{account_address::AccountAddress, on_chain_config::OnChainConfigPayload}; use mempool_notifications::MempoolCommitNotification; use serde::Serialize; use std::{fmt, time::SystemTime}; diff --git a/mempool/src/shared_mempool/coordinator.rs b/mempool/src/shared_mempool/coordinator.rs index 0a2f85318d182..036f0b32c046f 100644 --- a/mempool/src/shared_mempool/coordinator.rs +++ b/mempool/src/shared_mempool/coordinator.rs @@ -15,11 +15,11 @@ use crate::{ ConsensusRequest, MempoolEventsReceiver, TransactionSummary, }; use ::network::protocols::network::Event; +use aptos_config::network_id::{NetworkId, PeerNetworkId}; +use aptos_infallible::Mutex; +use aptos_logger::prelude::*; +use aptos_types::on_chain_config::OnChainConfigPayload; use bounded_executor::BoundedExecutor; -use diem_config::network_id::{NetworkId, PeerNetworkId}; -use diem_infallible::Mutex; -use diem_logger::prelude::*; -use diem_types::on_chain_config::OnChainConfigPayload; use event_notifications::ReconfigNotificationListener; use futures::{ channel::mpsc, diff --git a/mempool/src/shared_mempool/network.rs b/mempool/src/shared_mempool/network.rs index 6ab063fabd966..6ce2f1ce26c81 100644 --- a/mempool/src/shared_mempool/network.rs +++ b/mempool/src/shared_mempool/network.rs @@ -13,15 +13,15 @@ use crate::{ }, }, }; -use async_trait::async_trait; -use channel::{diem_channel, message_queues::QueueStyle}; -use diem_config::{ +use aptos_config::{ config::{MempoolConfig, PeerRole, RoleType}, network_id::{NetworkId, PeerNetworkId}, }; -use diem_infallible::Mutex; -use diem_logger::prelude::*; -use diem_types::{transaction::SignedTransaction, PeerId}; +use aptos_infallible::Mutex; +use aptos_logger::prelude::*; +use aptos_types::{transaction::SignedTransaction, PeerId}; +use async_trait::async_trait; +use channel::{aptos_channel, message_queues::QueueStyle}; use fail::fail_point; use itertools::Itertools; use netcore::transport::ConnectionOrigin; @@ -94,7 +94,7 @@ pub struct MempoolNetworkSender { pub fn network_endpoint_config(max_broadcasts_per_peer: usize) -> AppConfig { AppConfig::p2p( [ProtocolId::MempoolDirectSend], - diem_channel::Config::new(max_broadcasts_per_peer) + aptos_channel::Config::new(max_broadcasts_per_peer) .queue_style(QueueStyle::KLAST) .counters(&counters::PENDING_MEMPOOL_NETWORK_EVENTS), ) @@ -590,8 +590,8 @@ fn compare_prioritized_peers( #[cfg(test)] mod test { use super::*; - use diem_config::network_id::NetworkId; - use diem_types::PeerId; + use aptos_config::network_id::NetworkId; + use aptos_types::PeerId; #[test] fn check_peer_prioritization() { diff --git a/mempool/src/shared_mempool/runtime.rs b/mempool/src/shared_mempool/runtime.rs index 36c07ada399aa..0fca40c9c7423 100644 --- a/mempool/src/shared_mempool/runtime.rs +++ b/mempool/src/shared_mempool/runtime.rs @@ -10,8 +10,8 @@ use crate::{ }, ConsensusRequest, }; -use diem_config::{config::NodeConfig, network_id::NetworkId}; -use diem_infallible::{Mutex, RwLock}; +use aptos_config::{config::NodeConfig, network_id::NetworkId}; +use aptos_infallible::{Mutex, RwLock}; use event_notifications::ReconfigNotificationListener; use futures::channel::mpsc::{self, Receiver, UnboundedSender}; diff --git a/mempool/src/shared_mempool/tasks.rs b/mempool/src/shared_mempool/tasks.rs index dc27a9998c02c..3a01d1b41f947 100644 --- a/mempool/src/shared_mempool/tasks.rs +++ b/mempool/src/shared_mempool/tasks.rs @@ -14,12 +14,12 @@ use crate::{ ConsensusRequest, ConsensusResponse, SubmissionStatus, }; use anyhow::Result; -use diem_config::network_id::PeerNetworkId; -use diem_crypto::HashValue; -use diem_infallible::{Mutex, RwLock}; -use diem_logger::prelude::*; -use diem_metrics::HistogramTimer; -use diem_types::{ +use aptos_config::network_id::PeerNetworkId; +use aptos_crypto::HashValue; +use aptos_infallible::{Mutex, RwLock}; +use aptos_logger::prelude::*; +use aptos_metrics::HistogramTimer; +use aptos_types::{ mempool_status::{MempoolStatus, MempoolStatusCode}, on_chain_config::OnChainConfigPayload, transaction::SignedTransaction, @@ -381,7 +381,7 @@ pub(crate) fn process_consensus_request( let mut mempool = smp.mempool.lock(); // gc before pulling block as extra protection against txns that may expire in consensus // Note: this gc operation relies on the fact that consensus uses the system time to determine block timestamp - let curr_time = diem_infallible::duration_since_epoch(); + let curr_time = aptos_infallible::duration_since_epoch(); mempool.gc_by_expiration_time(curr_time); let block_size = cmp::max(max_block_size, 1); txns = mempool.get_block(block_size, exclude_transactions); diff --git a/mempool/src/shared_mempool/types.rs b/mempool/src/shared_mempool/types.rs index 9b9ddeda120e9..d8ab148b8af8f 100644 --- a/mempool/src/shared_mempool/types.rs +++ b/mempool/src/shared_mempool/types.rs @@ -7,13 +7,13 @@ use crate::{ shared_mempool::network::MempoolNetworkSender, }; use anyhow::Result; -use diem_config::{ +use aptos_config::{ config::{MempoolConfig, RoleType}, network_id::{NetworkId, PeerNetworkId}, }; -use diem_crypto::HashValue; -use diem_infallible::{Mutex, RwLock}; -use diem_types::{ +use aptos_crypto::HashValue; +use aptos_infallible::{Mutex, RwLock}; +use aptos_types::{ account_address::AccountAddress, mempool_status::MempoolStatus, transaction::SignedTransaction, vm_status::DiscardedVMStatus, }; diff --git a/mempool/src/tests/common.rs b/mempool/src/tests/common.rs index fe384acae3cee..b24df3fdd946d 100644 --- a/mempool/src/tests/common.rs +++ b/mempool/src/tests/common.rs @@ -3,9 +3,9 @@ use crate::core_mempool::{CoreMempool, TimelineState, TxnPointer}; use anyhow::{format_err, Result}; -use diem_config::config::NodeConfig; -use diem_crypto::{ed25519::Ed25519PrivateKey, PrivateKey, Uniform}; -use diem_types::{ +use aptos_config::config::NodeConfig; +use aptos_crypto::{ed25519::Ed25519PrivateKey, PrivateKey, Uniform}; +use aptos_types::{ account_address::AccountAddress, account_config::{AccountSequenceInfo, XUS_NAME}, chain_id::ChainId, diff --git a/mempool/src/tests/core_mempool_test.rs b/mempool/src/tests/core_mempool_test.rs index 18f122b09c6d0..2ee10e74ded6c 100644 --- a/mempool/src/tests/core_mempool_test.rs +++ b/mempool/src/tests/core_mempool_test.rs @@ -8,9 +8,9 @@ use crate::{ TestTransaction, }, }; -use diem_config::config::NodeConfig; -use diem_crypto::HashValue; -use diem_types::{account_config::AccountSequenceInfo, transaction::SignedTransaction}; +use aptos_config::config::NodeConfig; +use aptos_crypto::HashValue; +use aptos_types::{account_config::AccountSequenceInfo, transaction::SignedTransaction}; use std::{ collections::HashSet, time::{Duration, SystemTime}, diff --git a/mempool/src/tests/fuzzing.rs b/mempool/src/tests/fuzzing.rs index d65e1d6231474..8440c1ee3107b 100644 --- a/mempool/src/tests/fuzzing.rs +++ b/mempool/src/tests/fuzzing.rs @@ -5,9 +5,9 @@ use crate::{ core_mempool::{CoreMempool, TimelineState}, shared_mempool::{tasks, types::SharedMempool}, }; -use diem_config::{config::NodeConfig, network_id::NetworkId}; -use diem_infallible::{Mutex, RwLock}; -use diem_types::transaction::SignedTransaction; +use aptos_config::{config::NodeConfig, network_id::NetworkId}; +use aptos_infallible::{Mutex, RwLock}; +use aptos_types::transaction::SignedTransaction; use network::application::storage::PeerMetadataStorage; use proptest::{ arbitrary::any, diff --git a/mempool/src/tests/integration_tests.rs b/mempool/src/tests/integration_tests.rs index fafcdda6ea7cf..a30f6570a69f5 100644 --- a/mempool/src/tests/integration_tests.rs +++ b/mempool/src/tests/integration_tests.rs @@ -5,7 +5,7 @@ use crate::tests::{ common::TestTransaction, test_framework::{test_transaction, MempoolNode, MempoolTestFrameworkBuilder}, }; -use diem_config::network_id::PeerNetworkId; +use aptos_config::network_id::PeerNetworkId; use netcore::transport::ConnectionOrigin; use network::{ testutils::{ diff --git a/mempool/src/tests/mocks.rs b/mempool/src/tests/mocks.rs index 89d53d9fe6f7d..05bf0d294929b 100644 --- a/mempool/src/tests/mocks.rs +++ b/mempool/src/tests/mocks.rs @@ -8,16 +8,16 @@ use crate::{ ConsensusRequest, MempoolClientSender, }; use anyhow::{format_err, Result}; -use channel::{self, diem_channel, message_queues::QueueStyle}; -use diem_config::{ +use aptos_config::{ config::{NetworkConfig, NodeConfig}, network_id::NetworkId, }; -use diem_infallible::{Mutex, RwLock}; -use diem_types::{ +use aptos_infallible::{Mutex, RwLock}; +use aptos_types::{ account_config::AccountSequenceInfo, mempool_status::MempoolStatusCode, on_chain_config::ON_CHAIN_CONFIG_REGISTRY, transaction::SignedTransaction, }; +use channel::{self, aptos_channel, message_queues::QueueStyle}; use event_notifications::EventSubscriptionService; use futures::channel::mpsc; use mempool_notifications::{self, MempoolNotifier}; @@ -101,9 +101,9 @@ impl MockSharedMempool { config.validator_network = Some(NetworkConfig::network_with_id(NetworkId::Validator)); let mempool = Arc::new(Mutex::new(CoreMempool::new(&config))); - let (network_reqs_tx, _network_reqs_rx) = diem_channel::new(QueueStyle::FIFO, 8, None); - let (connection_reqs_tx, _) = diem_channel::new(QueueStyle::FIFO, 8, None); - let (_network_notifs_tx, network_notifs_rx) = diem_channel::new(QueueStyle::FIFO, 8, None); + let (network_reqs_tx, _network_reqs_rx) = aptos_channel::new(QueueStyle::FIFO, 8, None); + let (connection_reqs_tx, _) = aptos_channel::new(QueueStyle::FIFO, 8, None); + let (_network_notifs_tx, network_notifs_rx) = aptos_channel::new(QueueStyle::FIFO, 8, None); let (_, conn_notifs_rx) = conn_notifs_channel::new(); let network_sender = MempoolNetworkSender::new( PeerManagerRequestSender::new(network_reqs_tx), diff --git a/mempool/src/tests/multi_node_test.rs b/mempool/src/tests/multi_node_test.rs index 0551a4d6521f4..85bd5fb70ba37 100644 --- a/mempool/src/tests/multi_node_test.rs +++ b/mempool/src/tests/multi_node_test.rs @@ -12,11 +12,11 @@ use crate::{ }, }, }; -use diem_config::{ +use aptos_config::{ config::{NodeConfig, PeerRole}, network_id::{NetworkId, PeerNetworkId}, }; -use diem_types::{transaction::SignedTransaction, PeerId}; +use aptos_types::{transaction::SignedTransaction, PeerId}; use netcore::transport::ConnectionOrigin; use network::{ peer_manager::{PeerManagerNotification, PeerManagerRequest}, diff --git a/mempool/src/tests/node.rs b/mempool/src/tests/node.rs index 4c29de41752c2..1386bacf491d6 100644 --- a/mempool/src/tests/node.rs +++ b/mempool/src/tests/node.rs @@ -9,16 +9,16 @@ use crate::{ }, tests::common::TestTransaction, }; -use channel::{diem_channel, message_queues::QueueStyle}; -use diem_config::{ +use aptos_config::{ config::{Identity, NodeConfig, PeerRole, RoleType}, network_id::{NetworkContext, NetworkId, PeerNetworkId}, }; -use diem_crypto::{x25519::PrivateKey, Uniform}; -use diem_infallible::{Mutex, MutexGuard, RwLock}; -use diem_types::{ +use aptos_crypto::{x25519::PrivateKey, Uniform}; +use aptos_infallible::{Mutex, MutexGuard, RwLock}; +use aptos_types::{ account_config::AccountSequenceInfo, on_chain_config::ON_CHAIN_CONFIG_REGISTRY, PeerId, }; +use channel::{aptos_channel, message_queues::QueueStyle}; use enum_dispatch::enum_dispatch; use event_notifications::EventSubscriptionService; use futures::{ @@ -466,10 +466,10 @@ impl Node { /// Allows us to mock out the network without dealing with the details pub struct NodeNetworkInterface { /// Peer request receiver for messages - pub(crate) network_reqs_rx: diem_channel::Receiver<(PeerId, ProtocolId), PeerManagerRequest>, + pub(crate) network_reqs_rx: aptos_channel::Receiver<(PeerId, ProtocolId), PeerManagerRequest>, /// Peer notification sender for sending outgoing messages to other peers pub(crate) network_notifs_tx: - diem_channel::Sender<(PeerId, ProtocolId), PeerManagerNotification>, + aptos_channel::Sender<(PeerId, ProtocolId), PeerManagerNotification>, /// Sender for connecting / disconnecting peers pub(crate) network_conn_event_notifs_tx: conn_notifs_channel::Sender, } @@ -537,10 +537,10 @@ fn setup_node_network_interface( ) -> (NodeNetworkInterface, MempoolNetworkHandle) { static MAX_QUEUE_SIZE: usize = 8; let (network_reqs_tx, network_reqs_rx) = - diem_channel::new(QueueStyle::FIFO, MAX_QUEUE_SIZE, None); - let (connection_reqs_tx, _) = diem_channel::new(QueueStyle::FIFO, MAX_QUEUE_SIZE, None); + aptos_channel::new(QueueStyle::FIFO, MAX_QUEUE_SIZE, None); + let (connection_reqs_tx, _) = aptos_channel::new(QueueStyle::FIFO, MAX_QUEUE_SIZE, None); let (network_notifs_tx, network_notifs_rx) = - diem_channel::new(QueueStyle::FIFO, MAX_QUEUE_SIZE, None); + aptos_channel::new(QueueStyle::FIFO, MAX_QUEUE_SIZE, None); let (network_conn_event_notifs_tx, conn_status_rx) = conn_notifs_channel::new(); let network_sender = MempoolNetworkSender::new( PeerManagerRequestSender::new(network_reqs_tx), diff --git a/mempool/src/tests/shared_mempool_test.rs b/mempool/src/tests/shared_mempool_test.rs index f39ed8932cf67..16172ff4b1c7e 100644 --- a/mempool/src/tests/shared_mempool_test.rs +++ b/mempool/src/tests/shared_mempool_test.rs @@ -7,7 +7,7 @@ use crate::{ tests::common::{batch_add_signed_txn, TestTransaction}, ConsensusRequest, }; -use diem_types::transaction::Transaction; +use aptos_types::transaction::Transaction; use futures::{channel::oneshot, executor::block_on, sink::SinkExt}; use mempool_notifications::MempoolNotificationSender; use tokio::runtime::Builder; diff --git a/mempool/src/tests/test_framework.rs b/mempool/src/tests/test_framework.rs index bc8a237da7796..cf12018ac9cb8 100644 --- a/mempool/src/tests/test_framework.rs +++ b/mempool/src/tests/test_framework.rs @@ -8,13 +8,13 @@ use crate::{ tests::common::TestTransaction, ConsensusRequest, MempoolClientRequest, MempoolClientSender, }; -use diem_config::{ +use aptos_config::{ config::NodeConfig, network_id::{NetworkId, PeerNetworkId}, }; -use diem_id_generator::{IdGenerator, U32IdGenerator}; -use diem_infallible::{Mutex, RwLock}; -use diem_types::{ +use aptos_id_generator::{IdGenerator, U32IdGenerator}; +use aptos_infallible::{Mutex, RwLock}; +use aptos_types::{ account_address::AccountAddress, mempool_status::MempoolStatusCode, on_chain_config::ON_CHAIN_CONFIG_REGISTRY, transaction::SignedTransaction, }; diff --git a/network/Cargo.toml b/network/Cargo.toml index 47f8f0b6ccc72..4e7d83c62b438 100644 --- a/network/Cargo.toml +++ b/network/Cargo.toml @@ -32,21 +32,21 @@ tokio-retry = "0.3.0" tokio-stream = "0.1.4" tokio-util = { version = "0.6.4", features = ["compat", "codec"] } -bitvec = { path = "../crates/diem-bitvec", package = "diem-bitvec" } +bitvec = { path = "../crates/aptos-bitvec", package = "aptos-bitvec" } channel = { path = "../crates/channel" } bcs = "0.1.2" -diem-config = { path = "../config" } -diem-crypto = { path = "../crates/diem-crypto" } -diem-crypto-derive = { path = "../crates/diem-crypto-derive" } -diem-id-generator = { path = "../crates/diem-id-generator" } -diem-infallible = { path = "../crates/diem-infallible" } -diem-logger = { path = "../crates/diem-logger" } -diem-metrics = { path = "../crates/diem-metrics" } -diem-proptest-helpers = { path = "../crates/diem-proptest-helpers", optional = true } -diem-rate-limiter = { path = "../crates/diem-rate-limiter"} -diem-time-service = { path = "../crates/diem-time-service", features = ["async"] } -diem-types = { path = "../types" } -diem-workspace-hack = { version = "0.1", path = "../crates/diem-workspace-hack" } +aptos-config = { path = "../config" } +aptos-crypto = { path = "../crates/aptos-crypto" } +aptos-crypto-derive = { path = "../crates/aptos-crypto-derive" } +aptos-id-generator = { path = "../crates/aptos-id-generator" } +aptos-infallible = { path = "../crates/aptos-infallible" } +aptos-logger = { path = "../crates/aptos-logger" } +aptos-metrics = { path = "../crates/aptos-metrics" } +aptos-proptest-helpers = { path = "../crates/aptos-proptest-helpers", optional = true } +aptos-rate-limiter = { path = "../crates/aptos-rate-limiter"} +aptos-time-service = { path = "../crates/aptos-time-service", features = ["async"] } +aptos-types = { path = "../types" } +aptos-workspace-hack = { version = "0.1", path = "../crates/aptos-workspace-hack" } memsocket = { path = "./memsocket", optional = true } netcore = { path = "./netcore" } num-variants = { path = "../crates/num-variants" } @@ -54,8 +54,8 @@ short-hex-str = { path = "../crates/short-hex-str" } [dev-dependencies] criterion = "0.3.4" -diem-proptest-helpers = { path = "../crates/diem-proptest-helpers" } -diem-types = { path = "../types", features = ["fuzzing"] } +aptos-proptest-helpers = { path = "../crates/aptos-proptest-helpers" } +aptos-types = { path = "../types", features = ["fuzzing"] } maplit = "1.0.2" memsocket = { path = "./memsocket" } network-builder = {path = "./builder"} @@ -67,8 +67,8 @@ socket-bench-server = { path = "./socket-bench-server" } [features] default = [] -fuzzing = ["bitvec/fuzzing", "diem-config/fuzzing", "diem-crypto/fuzzing", "diem-types/fuzzing", "diem-proptest-helpers", "diem-time-service/testing", "diem-types/fuzzing", "memsocket/testing", "netcore/fuzzing", "proptest", "proptest-derive", "rand_core"] -testing = ["diem-config/testing", "diem-time-service/testing", "memsocket/testing", "netcore/testing"] +fuzzing = ["bitvec/fuzzing", "aptos-config/fuzzing", "aptos-crypto/fuzzing", "aptos-types/fuzzing", "aptos-proptest-helpers", "aptos-time-service/testing", "aptos-types/fuzzing", "memsocket/testing", "netcore/fuzzing", "proptest", "proptest-derive", "rand_core"] +testing = ["aptos-config/testing", "aptos-time-service/testing", "memsocket/testing", "netcore/testing"] [[bench]] name = "socket_bench" diff --git a/network/README.md b/network/README.md index 1ebb5294765e9..477a1365593b4 100644 --- a/network/README.md +++ b/network/README.md @@ -131,7 +131,7 @@ configurable static timeout. [`ConnectivityManager`]: ./src/connectivity_manager/mod.rs [DiemNet Handshake Protocol]: ../specifications/network/handshake-v1.md -[`DiemSystem::validators`]: ../diem-move/diem-framework/core/doc/DiemSystem.md#struct-diemsystem +[`DiemSystem::validators`]: ../aptos-move/diem-framework/core/doc/DiemSystem.md#struct-diemsystem [`DiemTransport`]: ./src/transport/mod.rs [`HealthChecker`]: ./src/protocols/health_checker/mod.rs [`Network Interface`]: ./src/protocols/network/mod.rs @@ -139,5 +139,5 @@ configurable static timeout. [NoiseIK]: ../specifications/network/noise.md [`PeerManager`]: ./src/peer_manager/mod.rs [`Peer`]: ./src/peer/mod.rs -[`ValidatorConfig`]: ../diem-move/diem-framework/core/doc/ValidatorConfig.md#struct-config +[`ValidatorConfig`]: ../aptos-move/diem-framework/core/doc/ValidatorConfig.md#struct-config [`validator-set-discovery`]: discovery/src/lib.rs diff --git a/network/benches/network_bench.rs b/network/benches/network_bench.rs index 2cd3828379497..c683a98b06d83 100644 --- a/network/benches/network_bench.rs +++ b/network/benches/network_bench.rs @@ -10,12 +10,12 @@ // Criterion API has changed, TODO: Remove parameterized groups, and bench() #![allow(deprecated)] +use aptos_types::PeerId; use bytes::Bytes; use criterion::{ criterion_group, criterion_main, AxisScale, Bencher, Criterion, ParameterizedBenchmark, PlotConfiguration, Throughput, }; -use diem_types::PeerId; use futures::{ channel::mpsc, executor::block_on, @@ -128,7 +128,7 @@ async fn send_rpc( } fn network_crate_benchmark(c: &mut Criterion) { - ::diem_logger::Logger::init_for_testing(); + ::aptos_logger::Logger::init_for_testing(); // Parameterize benchmarks over the message length. let msg_lens = vec![32usize, 256, 1 * KiB, 4 * KiB, 64 * KiB, 256 * KiB, 1 * MiB]; diff --git a/network/benches/socket_bench.rs b/network/benches/socket_bench.rs index d1cb3ff1c7690..ce9007ebe487d 100644 --- a/network/benches/socket_bench.rs +++ b/network/benches/socket_bench.rs @@ -39,13 +39,13 @@ //! //! Note: gnuplot must be installed to generate benchmark plots. +use aptos_logger::prelude::*; +use aptos_types::{network_address::NetworkAddress, PeerId}; use bytes::{Bytes, BytesMut}; use criterion::{ criterion_group, criterion_main, AxisScale, Bencher, Criterion, ParameterizedBenchmark, PlotConfiguration, Throughput, }; -use diem_logger::prelude::*; -use diem_types::{network_address::NetworkAddress, PeerId}; use futures::{ executor::block_on, io::{AsyncRead, AsyncWrite}, @@ -214,7 +214,7 @@ fn bench_tcp_noise_send(b: &mut Bencher, msg_len: &usize, server_addr: NetworkAd /// `$TCP_NOISE_ADDR` for /// benchmarks `remote_tcp`, `remote_tcp+noise` and `remote_tcp+nodelay` respectively. fn socket_bench(c: &mut Criterion) { - ::diem_logger::Logger::init_for_testing(); + ::aptos_logger::Logger::init_for_testing(); let rt = Runtime::new().unwrap(); let executor = rt.handle().clone(); @@ -371,7 +371,7 @@ fn bench_client_connection( /// time: [-9.0403% -4.6666% -0.6491%] (p = 0.06 > 0.05) /// thrpt: [+0.6533% +4.8951% +9.9388%] fn connection_bench(c: &mut Criterion) { - ::diem_logger::Logger::init_for_testing(); + ::aptos_logger::Logger::init_for_testing(); let concurrency_param: Vec = vec![16, 32, 64, 128]; let args = Args::from_env(); let bench = if let Some(noise_addr) = args.tcp_noise_addr { diff --git a/network/builder/Cargo.toml b/network/builder/Cargo.toml index 79c6805f9353a..e5f30f433f2d1 100644 --- a/network/builder/Cargo.toml +++ b/network/builder/Cargo.toml @@ -20,14 +20,14 @@ tokio = { version = "1.8.1", features = ["full"] } channel = { path = "../../crates/channel" } bcs = "0.1.2" -diem-config = { path = "../../config" } -diem-crypto = { path = "../../crates/diem-crypto" } -diem-infallible = { path = "../../crates/diem-infallible" } -diem-logger = { path = "../../crates/diem-logger" } -diem-secure-storage = { path = "../../secure/storage" } -diem-time-service = { path = "../../crates/diem-time-service", features = ["async"] } -diem-types = { path = "../../types" } -diem-workspace-hack = { version = "0.1", path = "../../crates/diem-workspace-hack" } +aptos-config = { path = "../../config" } +aptos-crypto = { path = "../../crates/aptos-crypto" } +aptos-infallible = { path = "../../crates/aptos-infallible" } +aptos-logger = { path = "../../crates/aptos-logger" } +aptos-secure-storage = { path = "../../secure/storage" } +aptos-time-service = { path = "../../crates/aptos-time-service", features = ["async"] } +aptos-types = { path = "../../types" } +aptos-workspace-hack = { version = "0.1", path = "../../crates/aptos-workspace-hack" } event-notifications = { path = "../../state-sync/inter-component/event-notifications" } netcore = { path = "../netcore" } network = { path = "../." } diff --git a/network/builder/src/builder.rs b/network/builder/src/builder.rs index d828f124105a1..1708eca73b64a 100644 --- a/network/builder/src/builder.rs +++ b/network/builder/src/builder.rs @@ -9,7 +9,7 @@ //! authentication -- a network end-point running with remote authentication enabled will //! connect to or accept connections from an end-point running in authenticated mode as //! long as the latter is in its trusted peers set. -use diem_config::{ +use aptos_config::{ config::{ DiscoveryMethod, NetworkConfig, Peer, PeerRole, PeerSet, RateLimitConfig, RoleType, CONNECTION_BACKOFF_BASE, CONNECTIVITY_CHECK_INTERVAL_MS, MAX_CONCURRENT_NETWORK_REQS, @@ -18,11 +18,11 @@ use diem_config::{ }, network_id::NetworkContext, }; -use diem_crypto::x25519::PublicKey; -use diem_infallible::RwLock; -use diem_logger::prelude::*; -use diem_time_service::TimeService; -use diem_types::{chain_id::ChainId, network_address::NetworkAddress}; +use aptos_crypto::x25519::PublicKey; +use aptos_infallible::RwLock; +use aptos_logger::prelude::*; +use aptos_time_service::TimeService; +use aptos_types::{chain_id::ChainId, network_address::NetworkAddress}; use event_notifications::{EventSubscriptionService, ReconfigNotificationListener}; use network::{ application::storage::PeerMetadataStorage, diff --git a/network/builder/src/dummy.rs b/network/builder/src/dummy.rs index fb6d2c53bd480..edeccfe371c2c 100644 --- a/network/builder/src/dummy.rs +++ b/network/builder/src/dummy.rs @@ -4,16 +4,16 @@ //! Integration tests for validator_network. use crate::builder::NetworkBuilder; -use async_trait::async_trait; -use channel::diem_channel; -use diem_config::{ +use aptos_config::{ config::{Peer, PeerRole, PeerSet, RoleType, NETWORK_CHANNEL_SIZE}, network_id::{NetworkContext, NetworkId}, }; -use diem_crypto::{test_utils::TEST_SEED, x25519, Uniform}; -use diem_infallible::RwLock; -use diem_time_service::TimeService; -use diem_types::{chain_id::ChainId, network_address::NetworkAddress, PeerId}; +use aptos_crypto::{test_utils::TEST_SEED, x25519, Uniform}; +use aptos_infallible::RwLock; +use aptos_time_service::TimeService; +use aptos_types::{chain_id::ChainId, network_address::NetworkAddress, PeerId}; +use async_trait::async_trait; +use channel::aptos_channel; use futures::{executor::block_on, StreamExt}; use netcore::transport::ConnectionOrigin; use network::{ @@ -49,7 +49,7 @@ pub struct DummyMsg(pub Vec); pub fn network_endpoint_config() -> AppConfig { AppConfig::p2p( [TEST_RPC_PROTOCOL, TEST_DIRECT_SEND_PROTOCOL], - diem_channel::Config::new(NETWORK_CHANNEL_SIZE), + aptos_channel::Config::new(NETWORK_CHANNEL_SIZE), ) } diff --git a/network/builder/src/test.rs b/network/builder/src/test.rs index aeb91069ad708..e5ea6d973235e 100644 --- a/network/builder/src/test.rs +++ b/network/builder/src/test.rs @@ -14,7 +14,7 @@ fn test_network_builder() { #[test] fn test_direct_send() { - ::diem_logger::Logger::init_for_testing(); + ::aptos_logger::Logger::init_for_testing(); let tn = setup_network(); let dialer_peer_id = tn.dialer_peer_id; let mut dialer_events = tn.dialer_events; @@ -59,7 +59,7 @@ fn test_direct_send() { #[test] fn test_rpc() { - ::diem_logger::Logger::init_for_testing(); + ::aptos_logger::Logger::init_for_testing(); let tn = setup_network(); let dialer_peer_id = tn.dialer_peer_id; let mut dialer_events = tn.dialer_events; diff --git a/network/discovery/Cargo.toml b/network/discovery/Cargo.toml index 4184dbfe93302..b172660559900 100644 --- a/network/discovery/Cargo.toml +++ b/network/discovery/Cargo.toml @@ -19,20 +19,20 @@ tokio = { version = "1.8.1", features = ["full"] } channel = {path = "../../crates/channel"} bcs = "0.1.2" event-notifications = { path = "../../state-sync/inter-component/event-notifications" } -diem-config = { path = "../../config"} -diem-crypto = {path = "../../crates/diem-crypto"} -diem-logger = {path = "../../crates/diem-logger"} -diem-metrics = {path = "../../crates/diem-metrics"} -diem-time-service = {path = "../../crates/diem-time-service"} -diem-secure-storage = { path = "../../secure/storage" } -diem-types = {path = "../../types"} -diem-workspace-hack = { version = "0.1", path = "../../crates/diem-workspace-hack" } +aptos-config = { path = "../../config"} +aptos-crypto = {path = "../../crates/aptos-crypto"} +aptos-logger = {path = "../../crates/aptos-logger"} +aptos-metrics = {path = "../../crates/aptos-metrics"} +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/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } network = {path = "../../network"} short-hex-str = { path = "../../crates/short-hex-str" } [dev-dependencies] -diem-config = { path = "../../config", features = ["testing"]} -diem-temppath = { path = "../../crates/diem-temppath" } +aptos-config = { path = "../../config", features = ["testing"]} +aptos-temppath = { path = "../../crates/aptos-temppath" } netcore = { path = "../netcore", features = ["fuzzing"] } rand = "0.8.3" diff --git a/network/discovery/src/counters.rs b/network/discovery/src/counters.rs index 36fabbbaa2a56..b51a62618db58 100644 --- a/network/discovery/src/counters.rs +++ b/network/discovery/src/counters.rs @@ -1,7 +1,7 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_metrics::{ +use aptos_metrics::{ register_histogram, register_int_counter_vec, register_int_gauge_vec, DurationHistogram, IntCounterVec, IntGaugeVec, }; diff --git a/network/discovery/src/file.rs b/network/discovery/src/file.rs index c5219235a1761..27b56667f4e45 100644 --- a/network/discovery/src/file.rs +++ b/network/discovery/src/file.rs @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 use crate::DiscoveryError; -use diem_config::config::PeerSet; -use diem_time_service::{Interval, TimeService, TimeServiceTrait}; +use aptos_config::config::PeerSet; +use aptos_time_service::{Interval, TimeService, TimeServiceTrait}; use futures::Stream; use std::{ path::{Path, PathBuf}, @@ -54,13 +54,13 @@ fn load_file(path: &Path) -> Result { mod tests { use super::*; use crate::DiscoveryChangeListener; - use channel::Receiver; - use diem_config::{ + use aptos_config::{ config::{Peer, PeerRole}, network_id::NetworkContext, }; - use diem_temppath::TempPath; - use diem_types::{network_address::NetworkAddress, PeerId}; + use aptos_temppath::TempPath; + use aptos_types::{network_address::NetworkAddress, PeerId}; + use channel::Receiver; use futures::StreamExt; use network::connectivity_manager::{ConnectivityRequest, DiscoverySource}; use std::{collections::HashSet, str::FromStr, sync::Arc}; diff --git a/network/discovery/src/lib.rs b/network/discovery/src/lib.rs index 65fe0231e3f04..73213cb49bc4b 100644 --- a/network/discovery/src/lib.rs +++ b/network/discovery/src/lib.rs @@ -2,10 +2,10 @@ // SPDX-License-Identifier: Apache-2.0 use crate::{counters::DISCOVERY_COUNTS, file::FileStream, validator_set::ValidatorSetStream}; -use diem_config::{config::PeerSet, network_id::NetworkContext}; -use diem_crypto::x25519; -use diem_logger::prelude::*; -use diem_time_service::TimeService; +use aptos_config::{config::PeerSet, network_id::NetworkContext}; +use aptos_crypto::x25519; +use aptos_logger::prelude::*; +use aptos_time_service::TimeService; use event_notifications::ReconfigNotificationListener; use futures::{Stream, StreamExt}; use network::{ diff --git a/network/discovery/src/validator_set.rs b/network/discovery/src/validator_set.rs index ae5ec211a1e54..8feab9e812aae 100644 --- a/network/discovery/src/validator_set.rs +++ b/network/discovery/src/validator_set.rs @@ -5,13 +5,13 @@ use crate::{ counters::{DISCOVERY_COUNTS, EVENT_PROCESSING_LOOP_BUSY_DURATION_S, NETWORK_KEY_MISMATCH}, DiscoveryError, }; -use diem_config::{ +use aptos_config::{ config::{Peer, PeerRole, PeerSet}, network_id::NetworkContext, }; -use diem_crypto::x25519; -use diem_logger::prelude::*; -use diem_types::on_chain_config::{OnChainConfigPayload, ValidatorSet}; +use aptos_crypto::x25519; +use aptos_logger::prelude::*; +use aptos_types::on_chain_config::{OnChainConfigPayload, ValidatorSet}; use event_notifications::ReconfigNotificationListener; use futures::Stream; use network::{counters::inc_by_with_context, logging::NetworkSchema}; @@ -153,17 +153,17 @@ fn extract_validator_set_updates( mod tests { use super::*; use crate::DiscoveryChangeListener; - use channel::{diem_channel, message_queues::QueueStyle}; - use diem_config::config::HANDSHAKE_VERSION; - use diem_crypto::{ + use aptos_config::config::HANDSHAKE_VERSION; + use aptos_crypto::{ ed25519::{Ed25519PrivateKey, Ed25519PublicKey}, x25519::PrivateKey, PrivateKey as PK, Uniform, }; - use diem_types::{ + use aptos_types::{ network_address::NetworkAddress, on_chain_config::OnChainConfig, validator_config::ValidatorConfig, validator_info::ValidatorInfo, PeerId, }; + use channel::{aptos_channel, message_queues::QueueStyle}; use event_notifications::ReconfigNotification; use futures::executor::block_on; use rand::{rngs::StdRng, SeedableRng}; @@ -175,17 +175,17 @@ mod tests { #[test] fn metric_if_key_mismatch() { - diem_logger::DiemLogger::init_for_testing(); + aptos_logger::DiemLogger::init_for_testing(); let runtime = Runtime::new().unwrap(); let consensus_private_key = Ed25519PrivateKey::generate_for_testing(); let consensus_pubkey = consensus_private_key.public_key(); let pubkey = test_pubkey([0u8; 32]); let different_pubkey = test_pubkey([1u8; 32]); - let peer_id = diem_types::account_address::from_identity_public_key(pubkey); + let peer_id = aptos_types::account_address::from_identity_public_key(pubkey); // Build up the Reconfig Listener let (conn_mgr_reqs_tx, _rx) = channel::new_test(1); - let (mut reconfig_sender, reconfig_events) = diem_channel::new(QueueStyle::LIFO, 1, None); + let (mut reconfig_sender, reconfig_events) = aptos_channel::new(QueueStyle::LIFO, 1, None); let reconfig_listener = ReconfigNotificationListener { notification_receiver: reconfig_events, }; @@ -239,7 +239,7 @@ mod tests { peer_id: PeerId, consensus_pubkey: Ed25519PublicKey, pubkey: x25519::PublicKey, - reconfig_tx: &mut channel::diem_channel::Sender<(), ReconfigNotification>, + reconfig_tx: &mut channel::aptos_channel::Sender<(), ReconfigNotification>, ) { let validator_address = NetworkAddress::mock().append_prod_protos(pubkey, HANDSHAKE_VERSION); diff --git a/network/memsocket/Cargo.toml b/network/memsocket/Cargo.toml index ccd3a0f102f07..be8ac3fea1fdf 100644 --- a/network/memsocket/Cargo.toml +++ b/network/memsocket/Cargo.toml @@ -13,8 +13,8 @@ publish = false futures = "0.3.12" bytes = "1.0.1" once_cell = "1.7.2" -diem-infallible = { path = "../../crates/diem-infallible" } -diem-workspace-hack = { version = "0.1", path = "../../crates/diem-workspace-hack" } +aptos-infallible = { path = "../../crates/aptos-infallible" } +aptos-workspace-hack = { version = "0.1", path = "../../crates/aptos-workspace-hack" } [features] default = [] diff --git a/network/memsocket/src/lib.rs b/network/memsocket/src/lib.rs index 00ca070aa4c3b..1a706a2cc51c6 100644 --- a/network/memsocket/src/lib.rs +++ b/network/memsocket/src/lib.rs @@ -1,8 +1,8 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 +use aptos_infallible::Mutex; use bytes::{Buf, Bytes}; -use diem_infallible::Mutex; use futures::{ channel::mpsc::{self, UnboundedReceiver, UnboundedSender}, io::{AsyncRead, AsyncWrite, Error, ErrorKind, Result}, diff --git a/network/netcore/Cargo.toml b/network/netcore/Cargo.toml index 7fe2b78770202..d3d9123a9eae5 100644 --- a/network/netcore/Cargo.toml +++ b/network/netcore/Cargo.toml @@ -17,16 +17,16 @@ serde = { version = "1.0.124", default-features = false } tokio = { version = "1.8.1", features = ["full"] } tokio-util = { version = "0.6.4", features = ["compat"] } url = { version = "2.2.1" } -diem-workspace-hack = { version = "0.1", path = "../../crates/diem-workspace-hack" } -diem-types = { path = "../../types" } +aptos-workspace-hack = { version = "0.1", path = "../../crates/aptos-workspace-hack" } +aptos-types = { path = "../../types" } memsocket = { path = "../memsocket", optional = true } proxy = { path = "../../crates/proxy" } [dev-dependencies] -diem-logger = { path = "../../crates/diem-logger" } +aptos-logger = { path = "../../crates/aptos-logger" } memsocket = { path = "../memsocket" } [features] default = [] -fuzzing = ["memsocket/fuzzing", "diem-types/fuzzing"] +fuzzing = ["memsocket/fuzzing", "aptos-types/fuzzing"] testing = ["memsocket/testing"] diff --git a/network/netcore/src/transport/and_then.rs b/network/netcore/src/transport/and_then.rs index 62096919f2fbc..b5fd0060ff057 100644 --- a/network/netcore/src/transport/and_then.rs +++ b/network/netcore/src/transport/and_then.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 use crate::transport::{ConnectionOrigin, Transport}; -use diem_types::{network_address::NetworkAddress, PeerId}; +use aptos_types::{network_address::NetworkAddress, PeerId}; use futures::{future::Future, stream::Stream}; use pin_project::pin_project; use std::{ diff --git a/network/netcore/src/transport/boxed.rs b/network/netcore/src/transport/boxed.rs index d6fe95463ef2d..a943cf78d0ff5 100644 --- a/network/netcore/src/transport/boxed.rs +++ b/network/netcore/src/transport/boxed.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 use crate::transport::Transport; -use diem_types::{network_address::NetworkAddress, PeerId}; +use aptos_types::{network_address::NetworkAddress, PeerId}; use futures::{ future::{Future, FutureExt}, stream::{Stream, StreamExt}, diff --git a/network/netcore/src/transport/memory.rs b/network/netcore/src/transport/memory.rs index dba5fd8824dc9..60327cc165fae 100644 --- a/network/netcore/src/transport/memory.rs +++ b/network/netcore/src/transport/memory.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 use crate::transport::Transport; -use diem_types::{ +use aptos_types::{ network_address::{parse_memory, NetworkAddress, Protocol}, PeerId, }; @@ -101,7 +101,7 @@ impl Stream for Listener { #[cfg(test)] mod test { use crate::transport::{memory::MemoryTransport, Transport}; - use diem_types::PeerId; + use aptos_types::PeerId; use futures::{ executor::block_on, future::join, diff --git a/network/netcore/src/transport/mod.rs b/network/netcore/src/transport/mod.rs index 1816b7865e29d..8e5c3ae3c8f35 100644 --- a/network/netcore/src/transport/mod.rs +++ b/network/netcore/src/transport/mod.rs @@ -11,7 +11,7 @@ //! [`Transport`]: crate::transport::Transport //! [`TransportExt`]: crate::transport::TransportExt -use diem_types::{network_address::NetworkAddress, PeerId}; +use aptos_types::{network_address::NetworkAddress, PeerId}; use futures::{future::Future, stream::Stream}; use serde::Serialize; use std::fmt; diff --git a/network/netcore/src/transport/proxy_protocol.rs b/network/netcore/src/transport/proxy_protocol.rs index a092d4983c7d8..b80a509781563 100644 --- a/network/netcore/src/transport/proxy_protocol.rs +++ b/network/netcore/src/transport/proxy_protocol.rs @@ -15,7 +15,7 @@ //! - An address space that doesn't match the size expected is rejected e.g. too big for IPv4 //! - Address space that's larger than the current supported requests is rejected -use diem_types::network_address::NetworkAddress; +use aptos_types::network_address::NetworkAddress; use futures::io::{AsyncRead, AsyncReadExt}; use std::{ convert::TryInto, diff --git a/network/netcore/src/transport/tcp.rs b/network/netcore/src/transport/tcp.rs index a2e67a9867363..07b9c6e087f6e 100644 --- a/network/netcore/src/transport/tcp.rs +++ b/network/netcore/src/transport/tcp.rs @@ -3,7 +3,7 @@ //! TCP Transport use crate::transport::Transport; -use diem_types::{ +use aptos_types::{ network_address::{parse_dns_tcp, parse_ip_tcp, parse_tcp, IpFilter, NetworkAddress}, PeerId, }; @@ -97,7 +97,7 @@ impl Transport for TcpTransport { let proxy = Proxy::new(); let proxy_addr = { - use diem_types::network_address::Protocol::*; + use aptos_types::network_address::Protocol::*; let addr = match protos.first() { Some(Ip4(ip)) => proxy.https(&ip.to_string()), @@ -322,7 +322,7 @@ impl AsyncWrite for TcpSocket { mod test { use super::*; use crate::transport::{ConnectionOrigin, Transport, TransportExt}; - use diem_types::PeerId; + use aptos_types::PeerId; use futures::{ future::{join, FutureExt}, io::{AsyncReadExt, AsyncWriteExt}, diff --git a/network/socket-bench-server/Cargo.toml b/network/socket-bench-server/Cargo.toml index 07290b1792bd9..16fe7ea84c46d 100644 --- a/network/socket-bench-server/Cargo.toml +++ b/network/socket-bench-server/Cargo.toml @@ -14,11 +14,11 @@ futures = "0.3.12" tokio = { version = "1.8.1", features = ["full"] } tokio-util = { version = "0.6.4", features = ["compat", "codec"] } -diem-crypto = { path = "../../crates/diem-crypto" } -diem-config = { path = "../../config" } -diem-logger = { path = "../../crates/diem-logger" } -diem-types = { path = "../../types" } -diem-workspace-hack = { version = "0.1", path = "../../crates/diem-workspace-hack" } +aptos-crypto = { path = "../../crates/aptos-crypto" } +aptos-config = { path = "../../config" } +aptos-logger = { path = "../../crates/aptos-logger" } +aptos-types = { path = "../../types" } +aptos-workspace-hack = { version = "0.1", path = "../../crates/aptos-workspace-hack" } memsocket = { path = "../memsocket" } netcore = { path = "../netcore", features = ["fuzzing", "testing"] } network = { path = "../.", features = ["testing", "fuzzing"] } diff --git a/network/socket-bench-server/src/lib.rs b/network/socket-bench-server/src/lib.rs index 257d7910fa8a7..4ec9a6b3b93df 100644 --- a/network/socket-bench-server/src/lib.rs +++ b/network/socket-bench-server/src/lib.rs @@ -3,10 +3,10 @@ #![forbid(unsafe_code)] -use diem_config::network_id::NetworkContext; -use diem_crypto::{test_utils::TEST_SEED, x25519, Uniform as _}; -use diem_logger::prelude::*; -use diem_types::network_address::NetworkAddress; +use aptos_config::network_id::NetworkContext; +use aptos_crypto::{test_utils::TEST_SEED, x25519, Uniform as _}; +use aptos_logger::prelude::*; +use aptos_types::network_address::NetworkAddress; use futures::{ future::Future, io::{AsyncRead, AsyncWrite}, @@ -83,7 +83,7 @@ pub fn build_memsocket_noise_transport() -> impl Transport impl Transport (Peer, Ne struct TestHarness { trusted_peers: Arc>, mock_time: MockTimeService, - connection_reqs_rx: diem_channel::Receiver, + connection_reqs_rx: aptos_channel::Receiver, connection_notifs_tx: conn_notifs_channel::Sender, conn_mgr_reqs_tx: channel::Sender, } @@ -85,7 +85,8 @@ impl TestHarness { fn new(seeds: PeerSet) -> (Self, ConnectivityManager) { let network_context = NetworkContext::mock(); let time_service = TimeService::mock(); - let (connection_reqs_tx, connection_reqs_rx) = diem_channel::new(QueueStyle::FIFO, 1, None); + let (connection_reqs_tx, connection_reqs_rx) = + aptos_channel::new(QueueStyle::FIFO, 1, None); let (connection_notifs_tx, connection_notifs_rx) = conn_notifs_channel::new(); let (conn_mgr_reqs_tx, conn_mgr_reqs_rx) = channel::new_test(0); let trusted_peers = Arc::new(RwLock::new(HashMap::new())); diff --git a/network/src/counters.rs b/network/src/counters.rs index 99f6aec7dab0d..5f9c9014a8899 100644 --- a/network/src/counters.rs +++ b/network/src/counters.rs @@ -2,12 +2,12 @@ // SPDX-License-Identifier: Apache-2.0 use crate::protocols::wire::handshake::v1::ProtocolId; -use diem_config::network_id::NetworkContext; -use diem_metrics::{ +use aptos_config::network_id::NetworkContext; +use aptos_metrics::{ register_histogram_vec, register_int_counter_vec, register_int_gauge, register_int_gauge_vec, Histogram, HistogramVec, IntCounter, IntCounterVec, IntGauge, IntGaugeVec, }; -use diem_types::PeerId; +use aptos_types::PeerId; use netcore::transport::ConnectionOrigin; use once_cell::sync::Lazy; use short_hex_str::AsShortHexStr; diff --git a/network/src/fuzzing.rs b/network/src/fuzzing.rs index 982dead66abcd..ae3f7ece0488f 100644 --- a/network/src/fuzzing.rs +++ b/network/src/fuzzing.rs @@ -8,8 +8,8 @@ use crate::{ }, testutils::fake_socket::ReadOnlyTestSocketVec, }; -use diem_config::network_id::NetworkId; -use diem_types::chain_id::ChainId; +use aptos_config::network_id::NetworkId; +use aptos_types::chain_id::ChainId; use futures::executor::block_on; use proptest::{collection::btree_map, prelude::*}; diff --git a/network/src/logging.rs b/network/src/logging.rs index 64f10273f9556..7891e391de8b6 100644 --- a/network/src/logging.rs +++ b/network/src/logging.rs @@ -5,9 +5,9 @@ //! This module is to contain all networking logging information. //! //! ``` -//! use diem_config::network_id::NetworkContext; -//! use diem_logger::info; -//! use diem_types::{PeerId, network_address::NetworkAddress}; +//! use aptos_config::network_id::NetworkContext; +//! use aptos_logger::info; +//! use aptos_types::{PeerId, network_address::NetworkAddress}; //! use network::logging::NetworkSchema; //! //! info!( @@ -24,9 +24,9 @@ use crate::{ connectivity_manager::DiscoverySource, transport::{ConnectionId, ConnectionMetadata}, }; -use diem_config::network_id::NetworkContext; -use diem_logger::Schema; -use diem_types::{network_address::NetworkAddress, PeerId}; +use aptos_config::network_id::NetworkContext; +use aptos_logger::Schema; +use aptos_types::{network_address::NetworkAddress, PeerId}; use netcore::transport::ConnectionOrigin; #[derive(Schema)] diff --git a/network/src/noise/error.rs b/network/src/noise/error.rs index a6d5657d18d4a..7dc235db99121 100644 --- a/network/src/noise/error.rs +++ b/network/src/noise/error.rs @@ -1,8 +1,8 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_crypto::noise::NoiseError; -use diem_types::PeerId; +use aptos_crypto::noise::NoiseError; +use aptos_types::PeerId; use short_hex_str::ShortHexStr; use std::io; use thiserror::Error; diff --git a/network/src/noise/fuzzing.rs b/network/src/noise/fuzzing.rs index 8075ad72bccbd..47677b9c33852 100644 --- a/network/src/noise/fuzzing.rs +++ b/network/src/noise/fuzzing.rs @@ -12,9 +12,9 @@ use crate::{ noise::{stream::NoiseStream, AntiReplayTimestamps, HandshakeAuthMode, NoiseUpgrader}, testutils::fake_socket::{ReadOnlyTestSocket, ReadWriteTestSocket}, }; -use diem_config::network_id::NetworkContext; -use diem_crypto::{noise::NoiseSession, test_utils::TEST_SEED, x25519, Uniform as _}; -use diem_types::PeerId; +use aptos_config::network_id::NetworkContext; +use aptos_crypto::{noise::NoiseSession, test_utils::TEST_SEED, x25519, Uniform as _}; +use aptos_types::PeerId; use futures::{executor::block_on, future::join}; use futures_util::io::AsyncReadExt; use once_cell::sync::Lazy; @@ -39,12 +39,12 @@ pub static KEYPAIRS: Lazy<( let initiator_private_key = x25519::PrivateKey::generate(&mut rng); let initiator_public_key = initiator_private_key.public_key(); let initiator_peer_id = - diem_types::account_address::from_identity_public_key(initiator_public_key); + aptos_types::account_address::from_identity_public_key(initiator_public_key); let responder_private_key = x25519::PrivateKey::generate(&mut rng); let responder_public_key = responder_private_key.public_key(); let responder_peer_id = - diem_types::account_address::from_identity_public_key(responder_public_key); + aptos_types::account_address::from_identity_public_key(responder_public_key); ( ( @@ -103,7 +103,7 @@ fn generate_first_two_messages() -> (Vec, Vec) { (init_msg, resp_msg) } -pub fn generate_corpus(gen: &mut diem_proptest_helpers::ValueGenerator) -> Vec { +pub fn generate_corpus(gen: &mut aptos_proptest_helpers::ValueGenerator) -> Vec { let (init_msg, resp_msg) = generate_first_two_messages(); // choose a random one let strategy = proptest::arbitrary::any::(); diff --git a/network/src/noise/handshake.rs b/network/src/noise/handshake.rs index 2e2766d2905e9..15b495266b53a 100644 --- a/network/src/noise/handshake.rs +++ b/network/src/noise/handshake.rs @@ -11,14 +11,14 @@ //! [stream]: crate::noise::stream use crate::noise::{error::NoiseHandshakeError, stream::NoiseStream}; -use diem_config::{ +use aptos_config::{ config::{Peer, PeerRole, PeerSet}, network_id::NetworkContext, }; -use diem_crypto::{noise, x25519}; -use diem_infallible::{duration_since_epoch, RwLock}; -use diem_logger::trace; -use diem_types::PeerId; +use aptos_crypto::{noise, x25519}; +use aptos_infallible::{duration_since_epoch, RwLock}; +use aptos_logger::trace; +use aptos_types::PeerId; use futures::io::{AsyncRead, AsyncReadExt, AsyncWrite, AsyncWriteExt}; use netcore::transport::ConnectionOrigin; use short_hex_str::{AsShortHexStr, ShortHexStr}; @@ -367,7 +367,7 @@ impl NoiseUpgrader { None => { // if not, verify that their peerid is constructed correctly from their public key let derived_remote_peer_id = - diem_types::account_address::from_identity_public_key( + aptos_types::account_address::from_identity_public_key( remote_public_key, ); if derived_remote_peer_id != remote_peer_id { @@ -465,8 +465,8 @@ impl NoiseUpgrader { mod test { use super::*; use crate::testutils::fake_socket::ReadWriteTestSocket; - use diem_config::config::{Peer, PeerRole}; - use diem_crypto::{test_utils::TEST_SEED, traits::Uniform as _}; + use aptos_config::config::{Peer, PeerRole}; + use aptos_crypto::{test_utils::TEST_SEED, traits::Uniform as _}; use futures::{executor::block_on, future::join}; use memsocket::MemorySocket; use rand::SeedableRng as _; @@ -512,9 +512,9 @@ mod test { (client_auth, server_auth, client_peer_id, server_peer_id) } else { let client_peer_id = - diem_types::account_address::from_identity_public_key(client_public_key); + aptos_types::account_address::from_identity_public_key(client_public_key); let server_peer_id = - diem_types::account_address::from_identity_public_key(server_public_key); + aptos_types::account_address::from_identity_public_key(server_public_key); ( HandshakeAuthMode::server_only(), HandshakeAuthMode::server_only(), @@ -688,7 +688,7 @@ mod test { #[test] fn test_handshake_client_peerid_mismatch_fails_server_only_auth() { - ::diem_logger::Logger::init_for_testing(); + ::aptos_logger::Logger::init_for_testing(); let ((mut client, _), (server, server_public_key)) = build_peers(false /* is_mutual_auth */); diff --git a/network/src/noise/mod.rs b/network/src/noise/mod.rs index 36bba4746d5bc..78034b6cd40b0 100644 --- a/network/src/noise/mod.rs +++ b/network/src/noise/mod.rs @@ -14,11 +14,11 @@ //! use network::noise::{AntiReplayTimestamps, HandshakeAuthMode, NoiseUpgrader}; //! use futures::{executor, future, io::{AsyncReadExt, AsyncWriteExt}}; //! use memsocket::MemorySocket; -//! use diem_config::{config::{Peer, PeerRole, RoleType}, network_id::{NetworkContext, NetworkId}}; -//! use diem_crypto::{x25519, ed25519, Uniform, PrivateKey, test_utils::TEST_SEED}; -//! use diem_infallible::RwLock; +//! use aptos_config::{config::{Peer, PeerRole, RoleType}, network_id::{NetworkContext, NetworkId}}; +//! use aptos_crypto::{x25519, ed25519, Uniform, PrivateKey, test_utils::TEST_SEED}; +//! use aptos_infallible::RwLock; //! use rand::{rngs::StdRng, SeedableRng}; -//! use diem_types::PeerId; +//! use aptos_types::PeerId; //! use std::{collections::{HashSet, HashMap}, io, sync::Arc}; //! //! fn example() -> io::Result<()> { @@ -95,7 +95,7 @@ //! //! [noise]: http://noiseprotocol.org/ //! [ik]: https://noiseexplorer.com/patterns/IK -//! [crypto]: ../diem_crypto/noise/index.html +//! [crypto]: ../aptos_crypto/noise/index.html pub mod error; pub mod handshake; diff --git a/network/src/noise/stream.rs b/network/src/noise/stream.rs index 323fc50562542..b673c038ad3e4 100644 --- a/network/src/noise/stream.rs +++ b/network/src/noise/stream.rs @@ -19,8 +19,8 @@ use std::{ task::{Context, Poll}, }; -use diem_crypto::{noise, x25519}; -use diem_logger::prelude::*; +use aptos_crypto::{noise, x25519}; +use aptos_logger::prelude::*; // // NoiseStream @@ -551,8 +551,8 @@ mod test { noise::{AntiReplayTimestamps, HandshakeAuthMode, NoiseUpgrader}, testutils::fake_socket::{ReadOnlyTestSocket, ReadWriteTestSocket}, }; - use diem_config::network_id::NetworkContext; - use diem_crypto::{test_utils::TEST_SEED, traits::Uniform as _, x25519}; + use aptos_config::network_id::NetworkContext; + use aptos_crypto::{test_utils::TEST_SEED, traits::Uniform as _, x25519}; use futures::{ executor::block_on, future::join, @@ -571,11 +571,11 @@ mod test { let client_private = x25519::PrivateKey::generate(&mut rng); let client_public = client_private.public_key(); - let client_peer_id = diem_types::account_address::from_identity_public_key(client_public); + let client_peer_id = aptos_types::account_address::from_identity_public_key(client_public); let server_private = x25519::PrivateKey::generate(&mut rng); let server_public = server_private.public_key(); - let server_peer_id = diem_types::account_address::from_identity_public_key(server_public); + let server_peer_id = aptos_types::account_address::from_identity_public_key(server_public); let client = NoiseUpgrader::new( NetworkContext::mock_with_peer_id(client_peer_id), diff --git a/network/src/peer/fuzzing.rs b/network/src/peer/fuzzing.rs index 606d8a8003b1e..2f0607f1b4322 100644 --- a/network/src/peer/fuzzing.rs +++ b/network/src/peer/fuzzing.rs @@ -11,11 +11,11 @@ use crate::{ testutils::fake_socket::ReadOnlyTestSocketVec, transport::{Connection, ConnectionId, ConnectionMetadata}, }; -use channel::{diem_channel, message_queues::QueueStyle}; -use diem_config::{config::PeerRole, network_id::NetworkContext}; -use diem_proptest_helpers::ValueGenerator; -use diem_time_service::TimeService; -use diem_types::{network_address::NetworkAddress, PeerId}; +use aptos_config::{config::PeerRole, network_id::NetworkContext}; +use aptos_proptest_helpers::ValueGenerator; +use aptos_time_service::TimeService; +use aptos_types::{network_address::NetworkAddress, PeerId}; +use channel::{aptos_channel, message_queues::QueueStyle}; use futures::{executor::block_on, future, io::AsyncReadExt, sink::SinkExt, stream::StreamExt}; use memsocket::MemorySocket; use netcore::transport::ConnectionOrigin; @@ -90,8 +90,8 @@ pub fn fuzz(data: &[u8]) { let (connection_notifs_tx, connection_notifs_rx) = channel::new_test(8); let channel_size = 8; - let (peer_reqs_tx, peer_reqs_rx) = diem_channel::new(QueueStyle::FIFO, channel_size, None); - let (peer_notifs_tx, peer_notifs_rx) = diem_channel::new(QueueStyle::FIFO, channel_size, None); + let (peer_reqs_tx, peer_reqs_rx) = aptos_channel::new(QueueStyle::FIFO, channel_size, None); + let (peer_notifs_tx, peer_notifs_rx) = aptos_channel::new(QueueStyle::FIFO, channel_size, None); // Spin up a new `Peer` actor let peer = Peer::new( diff --git a/network/src/peer/mod.rs b/network/src/peer/mod.rs index bb54c8dd1a00b..31be6b6c0ca31 100644 --- a/network/src/peer/mod.rs +++ b/network/src/peer/mod.rs @@ -29,13 +29,13 @@ use crate::{ transport::{self, Connection, ConnectionMetadata}, ProtocolId, }; +use aptos_config::network_id::NetworkContext; +use aptos_logger::prelude::*; +use aptos_rate_limiter::rate_limit::SharedBucket; +use aptos_time_service::{TimeService, TimeServiceTrait}; +use aptos_types::PeerId; use bytes::Bytes; -use channel::diem_channel; -use diem_config::network_id::NetworkContext; -use diem_logger::prelude::*; -use diem_rate_limiter::rate_limit::SharedBucket; -use diem_time_service::{TimeService, TimeServiceTrait}; -use diem_types::PeerId; +use channel::aptos_channel; use futures::{ self, channel::oneshot, @@ -118,9 +118,9 @@ pub struct Peer { /// Channel to notify PeerManager that we've disconnected. connection_notifs_tx: channel::Sender>, /// Channel to receive requests from PeerManager to send messages and rpcs. - peer_reqs_rx: diem_channel::Receiver, + peer_reqs_rx: aptos_channel::Receiver, /// Channel to notifty PeerManager of new inbound messages and rpcs. - peer_notifs_tx: diem_channel::Sender, + peer_notifs_tx: aptos_channel::Sender, /// Inbound rpc request queue for handling requests from remote peer. inbound_rpcs: InboundRpcs, /// Outbound rpc request queue for sending requests to remote peer and handling responses. @@ -146,8 +146,8 @@ where time_service: TimeService, connection: Connection, connection_notifs_tx: channel::Sender>, - peer_reqs_rx: diem_channel::Receiver, - peer_notifs_tx: diem_channel::Sender, + peer_reqs_rx: aptos_channel::Receiver, + peer_notifs_tx: aptos_channel::Sender, inbound_rpc_timeout: Duration, max_concurrent_inbound_rpcs: u32, max_concurrent_outbound_rpcs: u32, diff --git a/network/src/peer/test.rs b/network/src/peer/test.rs index 8525530b3db1a..081d3c057f24a 100644 --- a/network/src/peer/test.rs +++ b/network/src/peer/test.rs @@ -22,11 +22,11 @@ use crate::{ transport::{Connection, ConnectionId, ConnectionMetadata}, ProtocolId, }; +use aptos_config::{config::PeerRole, network_id::NetworkContext}; +use aptos_time_service::{MockTimeService, TimeService}; +use aptos_types::{network_address::NetworkAddress, PeerId}; use bytes::Bytes; -use channel::{self, diem_channel, message_queues::QueueStyle}; -use diem_config::{config::PeerRole, network_id::NetworkContext}; -use diem_time_service::{MockTimeService, TimeService}; -use diem_types::{network_address::NetworkAddress, PeerId}; +use channel::{self, aptos_channel, message_queues::QueueStyle}; use futures::{ channel::oneshot, future::{self, FutureExt}, @@ -53,7 +53,7 @@ fn build_test_peer( PeerHandle, MemorySocket, channel::Receiver>, - diem_channel::Receiver, + aptos_channel::Receiver, ) { let (a, b) = MemorySocket::new_pair(); let peer_id = PeerId::random(); @@ -72,9 +72,9 @@ fn build_test_peer( let (connection_notifs_tx, connection_notifs_rx) = channel::new_test(1); let (peer_reqs_tx, peer_reqs_rx) = - diem_channel::new(QueueStyle::FIFO, NETWORK_CHANNEL_SIZE, None); + aptos_channel::new(QueueStyle::FIFO, NETWORK_CHANNEL_SIZE, None); let (peer_notifs_tx, peer_notifs_rx) = - diem_channel::new(QueueStyle::FIFO, NETWORK_CHANNEL_SIZE, None); + aptos_channel::new(QueueStyle::FIFO, NETWORK_CHANNEL_SIZE, None); let peer = Peer::new( NetworkContext::mock(), @@ -104,13 +104,13 @@ fn build_test_connected_peers( Peer, PeerHandle, channel::Receiver>, - diem_channel::Receiver, + aptos_channel::Receiver, ), ( Peer, PeerHandle, channel::Receiver>, - diem_channel::Receiver, + aptos_channel::Receiver, ), ) { let (peer_a, peer_handle_a, connection_a, connection_notifs_rx_a, peer_notifs_rx_a) = @@ -167,7 +167,7 @@ async fn assert_disconnected_event( } #[derive(Clone)] -struct PeerHandle(diem_channel::Sender); +struct PeerHandle(aptos_channel::Sender); impl PeerHandle { fn send_direct_send(&mut self, message: Message) { @@ -198,7 +198,7 @@ impl PeerHandle { // Sending an outbound DirectSend should write it to the wire. #[test] fn peer_send_message() { - ::diem_logger::Logger::init_for_testing(); + ::aptos_logger::Logger::init_for_testing(); let rt = Runtime::new().unwrap(); let (peer, mut peer_handle, mut connection, _connection_notifs_rx, _peer_notifs_rx) = build_test_peer( @@ -241,7 +241,7 @@ fn peer_send_message() { // an inbound DirectSend. #[test] fn peer_recv_message() { - ::diem_logger::Logger::init_for_testing(); + ::aptos_logger::Logger::init_for_testing(); let rt = Runtime::new().unwrap(); let (peer, _peer_handle, connection, _connection_notifs_rx, mut peer_notifs_rx) = build_test_peer( @@ -284,7 +284,7 @@ fn peer_recv_message() { // other and then shutdown gracefully. #[test] fn peers_send_message_concurrent() { - ::diem_logger::Logger::init_for_testing(); + ::aptos_logger::Logger::init_for_testing(); let rt = Runtime::new().unwrap(); let ( (peer_a, mut peer_handle_a, mut connection_notifs_rx_a, mut peer_notifs_rx_a), @@ -338,7 +338,7 @@ fn peers_send_message_concurrent() { #[test] fn peer_recv_rpc() { - ::diem_logger::Logger::init_for_testing(); + ::aptos_logger::Logger::init_for_testing(); let rt = Runtime::new().unwrap(); let (peer, _peer_handle, mut connection, _connection_notifs_rx, mut peer_notifs_rx) = build_test_peer( @@ -397,7 +397,7 @@ fn peer_recv_rpc() { #[test] fn peer_recv_rpc_concurrent() { - ::diem_logger::Logger::init_for_testing(); + ::aptos_logger::Logger::init_for_testing(); let rt = Runtime::new().unwrap(); let (peer, _peer_handle, mut connection, _connection_notifs_rx, mut peer_notifs_rx) = build_test_peer( @@ -463,7 +463,7 @@ fn peer_recv_rpc_concurrent() { #[test] fn peer_recv_rpc_timeout() { - ::diem_logger::Logger::init_for_testing(); + ::aptos_logger::Logger::init_for_testing(); let rt = Runtime::new().unwrap(); let mock_time = MockTimeService::new(); let (peer, _peer_handle, mut connection, _connection_notifs_rx, mut peer_notifs_rx) = @@ -522,7 +522,7 @@ fn peer_recv_rpc_timeout() { #[test] fn peer_recv_rpc_cancel() { - ::diem_logger::Logger::init_for_testing(); + ::aptos_logger::Logger::init_for_testing(); let rt = Runtime::new().unwrap(); let (peer, _peer_handle, mut connection, _connection_notifs_rx, mut peer_notifs_rx) = build_test_peer( @@ -576,7 +576,7 @@ fn peer_recv_rpc_cancel() { #[test] fn peer_send_rpc() { - ::diem_logger::Logger::init_for_testing(); + ::aptos_logger::Logger::init_for_testing(); let rt = Runtime::new().unwrap(); let (peer, mut peer_handle, mut connection, _connection_notifs_rx, _peer_notifs_rx) = build_test_peer( @@ -635,7 +635,7 @@ fn peer_send_rpc() { #[test] fn peer_send_rpc_concurrent() { - ::diem_logger::Logger::init_for_testing(); + ::aptos_logger::Logger::init_for_testing(); let rt = Runtime::new().unwrap(); let (peer, peer_handle, mut connection, _connection_notifs_rx, _peer_notifs_rx) = build_test_peer( @@ -704,7 +704,7 @@ fn peer_send_rpc_concurrent() { #[test] fn peer_send_rpc_cancel() { - ::diem_logger::Logger::init_for_testing(); + ::aptos_logger::Logger::init_for_testing(); let rt = Runtime::new().unwrap(); let (peer, peer_handle, mut connection, _connection_notifs_rx, _peer_notifs_rx) = build_test_peer( @@ -764,7 +764,7 @@ fn peer_send_rpc_cancel() { #[test] fn peer_send_rpc_timeout() { - ::diem_logger::Logger::init_for_testing(); + ::aptos_logger::Logger::init_for_testing(); let rt = Runtime::new().unwrap(); let mock_time = MockTimeService::new(); let (peer, peer_handle, mut connection, _connection_notifs_rx, _peer_notifs_rx) = @@ -829,7 +829,7 @@ fn peer_send_rpc_timeout() { // PeerManager can request a Peer to shutdown. #[test] fn peer_disconnect_request() { - ::diem_logger::Logger::init_for_testing(); + ::aptos_logger::Logger::init_for_testing(); let rt = Runtime::new().unwrap(); let (peer, peer_handle, _connection, mut connection_notifs_rx, _peer_notifs_rx) = build_test_peer( @@ -855,7 +855,7 @@ fn peer_disconnect_request() { // Peer will shutdown if the underlying connection is lost. #[test] fn peer_disconnect_connection_lost() { - ::diem_logger::Logger::init_for_testing(); + ::aptos_logger::Logger::init_for_testing(); let rt = Runtime::new().unwrap(); let (peer, _peer_handle, mut connection, mut connection_notifs_rx, _peer_notifs_rx) = build_test_peer( @@ -879,7 +879,7 @@ fn peer_disconnect_connection_lost() { #[test] fn peer_terminates_when_request_tx_has_dropped() { - ::diem_logger::Logger::init_for_testing(); + ::aptos_logger::Logger::init_for_testing(); let rt = Runtime::new().unwrap(); let (peer, peer_handle, _connection, _connection_notifs_rx, _peer_notifs_rx) = build_test_peer( rt.handle().clone(), diff --git a/network/src/peer_manager/builder.rs b/network/src/peer_manager/builder.rs index ee558c5d47236..109439afacc58 100644 --- a/network/src/peer_manager/builder.rs +++ b/network/src/peer_manager/builder.rs @@ -14,17 +14,17 @@ use crate::{ transport::{self, Connection, DiemNetTransport, DIEM_TCP_TRANSPORT}, ProtocolId, }; -use channel::{self, diem_channel, message_queues::QueueStyle}; -use diem_config::{ +use aptos_config::{ config::{PeerSet, RateLimitConfig, HANDSHAKE_VERSION}, network_id::NetworkContext, }; -use diem_crypto::x25519; -use diem_infallible::RwLock; -use diem_logger::prelude::*; -use diem_rate_limiter::rate_limit::TokenBucketRateLimiter; -use diem_time_service::TimeService; -use diem_types::{chain_id::ChainId, network_address::NetworkAddress, PeerId}; +use aptos_crypto::x25519; +use aptos_infallible::RwLock; +use aptos_logger::prelude::*; +use aptos_rate_limiter::rate_limit::TokenBucketRateLimiter; +use aptos_time_service::TimeService; +use aptos_types::{chain_id::ChainId, network_address::NetworkAddress, PeerId}; +use channel::{self, aptos_channel, message_queues::QueueStyle}; #[cfg(any(test, feature = "testing", feature = "fuzzing"))] use netcore::transport::memory::MemoryTransport; use netcore::transport::{ @@ -64,15 +64,15 @@ impl TransportContext { struct PeerManagerContext { // TODO(philiphayes): better support multiple listening addrs - pm_reqs_tx: diem_channel::Sender<(PeerId, ProtocolId), PeerManagerRequest>, - pm_reqs_rx: diem_channel::Receiver<(PeerId, ProtocolId), PeerManagerRequest>, - connection_reqs_tx: diem_channel::Sender, - connection_reqs_rx: diem_channel::Receiver, + pm_reqs_tx: aptos_channel::Sender<(PeerId, ProtocolId), PeerManagerRequest>, + pm_reqs_rx: aptos_channel::Receiver<(PeerId, ProtocolId), PeerManagerRequest>, + connection_reqs_tx: aptos_channel::Sender, + connection_reqs_rx: aptos_channel::Receiver, peer_metadata_storage: Arc, trusted_peers: Arc>, upstream_handlers: - HashMap>, + HashMap>, connection_event_handlers: Vec, max_concurrent_network_reqs: usize, @@ -86,16 +86,16 @@ struct PeerManagerContext { impl PeerManagerContext { #[allow(clippy::too_many_arguments)] fn new( - pm_reqs_tx: diem_channel::Sender<(PeerId, ProtocolId), PeerManagerRequest>, - pm_reqs_rx: diem_channel::Receiver<(PeerId, ProtocolId), PeerManagerRequest>, - connection_reqs_tx: diem_channel::Sender, - connection_reqs_rx: diem_channel::Receiver, + pm_reqs_tx: aptos_channel::Sender<(PeerId, ProtocolId), PeerManagerRequest>, + pm_reqs_rx: aptos_channel::Receiver<(PeerId, ProtocolId), PeerManagerRequest>, + connection_reqs_tx: aptos_channel::Sender, + connection_reqs_rx: aptos_channel::Receiver, peer_metadata_storage: Arc, trusted_peers: Arc>, upstream_handlers: HashMap< ProtocolId, - diem_channel::Sender<(PeerId, ProtocolId), PeerManagerNotification>, + aptos_channel::Sender<(PeerId, ProtocolId), PeerManagerNotification>, >, connection_event_handlers: Vec, @@ -129,7 +129,7 @@ impl PeerManagerContext { fn add_upstream_handler( &mut self, protocol_id: ProtocolId, - channel: diem_channel::Sender<(PeerId, ProtocolId), PeerManagerNotification>, + channel: aptos_channel::Sender<(PeerId, ProtocolId), PeerManagerNotification>, ) -> &mut Self { self.upstream_handlers.insert(protocol_id, channel); self @@ -184,14 +184,14 @@ impl PeerManagerBuilder { outbound_rate_limit_config: Option, ) -> Self { // Setup channel to send requests to peer manager. - let (pm_reqs_tx, pm_reqs_rx) = diem_channel::new( + let (pm_reqs_tx, pm_reqs_rx) = aptos_channel::new( QueueStyle::FIFO, channel_size, Some(&counters::PENDING_PEER_MANAGER_REQUESTS), ); // Setup channel to send connection requests to peer manager. let (connection_reqs_tx, connection_reqs_rx) = - diem_channel::new(QueueStyle::FIFO, channel_size, None); + aptos_channel::new(QueueStyle::FIFO, channel_size, None); Self { network_context, @@ -228,7 +228,7 @@ impl PeerManagerBuilder { self.listen_address.clone() } - pub fn connection_reqs_tx(&self) -> diem_channel::Sender { + pub fn connection_reqs_tx(&self) -> aptos_channel::Sender { self.peer_manager_context .as_ref() .expect("Cannot access connection_reqs once PeerManager has been built") @@ -251,7 +251,7 @@ impl PeerManagerBuilder { /// Create the configured transport and start PeerManager. /// Return the actual NetworkAddress over which this peer is listening. pub fn build(&mut self, executor: &Handle) -> &mut Self { - use diem_types::network_address::Protocol::*; + use aptos_types::network_address::Protocol::*; let transport_context = self .transport_context @@ -408,7 +408,7 @@ impl PeerManagerBuilder { ) -> ( (PeerManagerRequestSender, ConnectionRequestSender), ( - diem_channel::Receiver<(PeerId, ProtocolId), PeerManagerNotification>, + aptos_channel::Receiver<(PeerId, ProtocolId), PeerManagerNotification>, conn_notifs_channel::Receiver, ), ) { @@ -434,7 +434,7 @@ impl PeerManagerBuilder { &mut self, config: &AppConfig, ) -> ( - diem_channel::Receiver<(PeerId, ProtocolId), PeerManagerNotification>, + aptos_channel::Receiver<(PeerId, ProtocolId), PeerManagerNotification>, conn_notifs_channel::Receiver, ) { self.transport_context().add_protocols(&config.protocols); diff --git a/network/src/peer_manager/conn_notifs_channel.rs b/network/src/peer_manager/conn_notifs_channel.rs index 3557f5f504e64..347369c511f96 100644 --- a/network/src/peer_manager/conn_notifs_channel.rs +++ b/network/src/peer_manager/conn_notifs_channel.rs @@ -9,21 +9,21 @@ //! and `conn_notifs_channel::Sender` which behave similarly to existing mpsc data structures. use crate::peer_manager::ConnectionNotification; -use channel::{diem_channel, message_queues::QueueStyle}; -use diem_types::PeerId; +use aptos_types::PeerId; +use channel::{aptos_channel, message_queues::QueueStyle}; -pub type Sender = diem_channel::Sender; -pub type Receiver = diem_channel::Receiver; +pub type Sender = aptos_channel::Sender; +pub type Receiver = aptos_channel::Receiver; pub fn new() -> (Sender, Receiver) { - diem_channel::new(QueueStyle::LIFO, 1, None) + aptos_channel::new(QueueStyle::LIFO, 1, None) } #[cfg(test)] mod test { use super::*; use crate::{peer::DisconnectReason, transport::ConnectionMetadata}; - use diem_config::network_id::NetworkContext; + use aptos_config::network_id::NetworkContext; use futures::{executor::block_on, future::FutureExt, stream::StreamExt}; fn send_new_peer(sender: &mut Sender, connection: ConnectionMetadata) { diff --git a/network/src/peer_manager/error.rs b/network/src/peer_manager/error.rs index f7ecae9be48c0..01277d8c28e8c 100644 --- a/network/src/peer_manager/error.rs +++ b/network/src/peer_manager/error.rs @@ -4,7 +4,7 @@ //! Errors that originate from the PeerManager module use crate::protocols::wire::messaging::v1 as wire; -use diem_types::{network_address::NetworkAddress, PeerId}; +use aptos_types::{network_address::NetworkAddress, PeerId}; use futures::channel::{mpsc, oneshot}; use thiserror::Error; diff --git a/network/src/peer_manager/mod.rs b/network/src/peer_manager/mod.rs index 9199c67393fbb..6445c86313b5e 100644 --- a/network/src/peer_manager/mod.rs +++ b/network/src/peer_manager/mod.rs @@ -21,12 +21,12 @@ use crate::{ }, ProtocolId, }; -use channel::{self, diem_channel, message_queues::QueueStyle}; -use diem_config::network_id::NetworkContext; -use diem_logger::prelude::*; -use diem_rate_limiter::rate_limit::TokenBucketRateLimiter; -use diem_time_service::{TimeService, TimeServiceTrait}; -use diem_types::{network_address::NetworkAddress, PeerId}; +use aptos_config::network_id::NetworkContext; +use aptos_logger::prelude::*; +use aptos_rate_limiter::rate_limit::TokenBucketRateLimiter; +use aptos_time_service::{TimeService, TimeServiceTrait}; +use aptos_types::{network_address::NetworkAddress, PeerId}; +use channel::{self, aptos_channel, message_queues::QueueStyle}; use futures::{ channel::oneshot, io::{AsyncRead, AsyncWrite, AsyncWriteExt}, @@ -59,8 +59,8 @@ use crate::{ peer_manager::transport::{TransportHandler, TransportRequest}, protocols::network::SerializedRequest, }; -use diem_config::config::{PeerRole, PeerSet}; -use diem_infallible::RwLock; +use aptos_config::config::{PeerRole, PeerSet}; +use aptos_infallible::RwLock; pub use senders::*; pub use types::*; @@ -86,7 +86,7 @@ where PeerId, ( ConnectionMetadata, - diem_channel::Sender, + aptos_channel::Sender, ), >, /// Shared metadata storage about peers @@ -94,11 +94,11 @@ where /// Known trusted peers from discovery trusted_peers: Arc>, /// Channel to receive requests from other actors. - requests_rx: diem_channel::Receiver<(PeerId, ProtocolId), PeerManagerRequest>, + requests_rx: aptos_channel::Receiver<(PeerId, ProtocolId), PeerManagerRequest>, /// Upstream handlers for RPC and DirectSend protocols. The handlers are promised fair delivery /// of messages across (PeerId, ProtocolId). upstream_handlers: - HashMap>, + HashMap>, /// Channels to send NewPeer/LostPeer notifications to. connection_event_handlers: Vec, /// Channel used to send Dial requests to the ConnectionHandler actor @@ -106,7 +106,7 @@ where /// Sender for connection events. transport_notifs_tx: channel::Sender>, /// Receiver for connection requests. - connection_reqs_rx: diem_channel::Receiver, + connection_reqs_rx: aptos_channel::Receiver, /// Receiver for connection events. transport_notifs_rx: channel::Receiver>, /// A map of outstanding disconnect requests. @@ -143,11 +143,11 @@ where listen_addr: NetworkAddress, peer_metadata_storage: Arc, trusted_peers: Arc>, - requests_rx: diem_channel::Receiver<(PeerId, ProtocolId), PeerManagerRequest>, - connection_reqs_rx: diem_channel::Receiver, + requests_rx: aptos_channel::Receiver<(PeerId, ProtocolId), PeerManagerRequest>, + connection_reqs_rx: aptos_channel::Receiver, upstream_handlers: HashMap< ProtocolId, - diem_channel::Sender<(PeerId, ProtocolId), PeerManagerNotification>, + aptos_channel::Sender<(PeerId, ProtocolId), PeerManagerNotification>, >, connection_event_handlers: Vec, channel_size: usize, @@ -659,13 +659,13 @@ where let outbound_rate_limiter = self.outbound_rate_limiters.bucket(ip_addr); // TODO: Add label for peer. - let (peer_reqs_tx, peer_reqs_rx) = diem_channel::new( + let (peer_reqs_tx, peer_reqs_rx) = aptos_channel::new( QueueStyle::FIFO, self.channel_size, Some(&counters::PENDING_NETWORK_REQUESTS), ); // TODO: Add label for peer. - let (peer_notifs_tx, peer_notifs_rx) = diem_channel::new( + let (peer_notifs_tx, peer_notifs_rx) = aptos_channel::new( QueueStyle::FIFO, self.channel_size, Some(&counters::PENDING_NETWORK_NOTIFICATIONS), @@ -726,7 +726,7 @@ where fn spawn_peer_network_events_handler( &self, peer_id: PeerId, - network_events: diem_channel::Receiver, + network_events: aptos_channel::Receiver, ) { let mut upstream_handlers = self.upstream_handlers.clone(); let network_context = self.network_context; @@ -752,7 +752,7 @@ fn handle_inbound_request( peer_id: PeerId, upstream_handlers: &mut HashMap< ProtocolId, - diem_channel::Sender<(PeerId, ProtocolId), PeerManagerNotification>, + aptos_channel::Sender<(PeerId, ProtocolId), PeerManagerNotification>, >, ) { let (protocol_id, notification) = match inbound_event { diff --git a/network/src/peer_manager/senders.rs b/network/src/peer_manager/senders.rs index f89a99b59c4d6..03db46e399362 100644 --- a/network/src/peer_manager/senders.rs +++ b/network/src/peer_manager/senders.rs @@ -8,9 +8,9 @@ use crate::{ }, ProtocolId, }; +use aptos_types::{network_address::NetworkAddress, PeerId}; use bytes::Bytes; -use channel::{self, diem_channel}; -use diem_types::{network_address::NetworkAddress, PeerId}; +use channel::{self, aptos_channel}; use futures::channel::oneshot; use std::time::Duration; @@ -20,19 +20,19 @@ use crate::peer_manager::{types::PeerManagerRequest, ConnectionRequest, PeerMana /// from PeerManager. #[derive(Clone, Debug)] pub struct PeerManagerRequestSender { - inner: diem_channel::Sender<(PeerId, ProtocolId), PeerManagerRequest>, + inner: aptos_channel::Sender<(PeerId, ProtocolId), PeerManagerRequest>, } /// Convenience wrapper which makes it easy to issue connection requests and await the responses /// from PeerManager. #[derive(Clone, Debug)] pub struct ConnectionRequestSender { - inner: diem_channel::Sender, + inner: aptos_channel::Sender, } impl PeerManagerRequestSender { /// Construct a new PeerManagerRequestSender with a raw channel::Sender - pub fn new(inner: diem_channel::Sender<(PeerId, ProtocolId), PeerManagerRequest>) -> Self { + pub fn new(inner: aptos_channel::Sender<(PeerId, ProtocolId), PeerManagerRequest>) -> Self { Self { inner } } @@ -109,8 +109,8 @@ impl PeerManagerRequestSender { } impl ConnectionRequestSender { - /// Construct a new ConnectionRequestSender with a raw diem_channel::Sender - pub fn new(inner: diem_channel::Sender) -> Self { + /// Construct a new ConnectionRequestSender with a raw aptos_channel::Sender + pub fn new(inner: aptos_channel::Sender) -> Self { Self { inner } } diff --git a/network/src/peer_manager/tests.rs b/network/src/peer_manager/tests.rs index 4dc11f7150c6a..3306603296802 100644 --- a/network/src/peer_manager/tests.rs +++ b/network/src/peer_manager/tests.rs @@ -18,16 +18,16 @@ use crate::{ ProtocolId, }; use anyhow::anyhow; -use bytes::Bytes; -use channel::{diem_channel, message_queues::QueueStyle}; -use diem_config::{ +use aptos_config::{ config::{PeerRole, MAX_INBOUND_CONNECTIONS}, network_id::NetworkContext, }; -use diem_infallible::RwLock; -use diem_rate_limiter::rate_limit::TokenBucketRateLimiter; -use diem_time_service::TimeService; -use diem_types::{network_address::NetworkAddress, PeerId}; +use aptos_infallible::RwLock; +use aptos_rate_limiter::rate_limit::TokenBucketRateLimiter; +use aptos_time_service::TimeService; +use aptos_types::{network_address::NetworkAddress, PeerId}; +use bytes::Bytes; +use channel::{aptos_channel, message_queues::QueueStyle}; use futures::{channel::oneshot, io::AsyncWriteExt, stream::StreamExt}; use memsocket::MemorySocket; use netcore::transport::{ @@ -85,15 +85,15 @@ fn build_test_peer_manager( BoxedTransport, impl std::error::Error + Sync + Send + 'static>, MemorySocket, >, - diem_channel::Sender<(PeerId, ProtocolId), PeerManagerRequest>, - diem_channel::Sender, - diem_channel::Receiver<(PeerId, ProtocolId), PeerManagerNotification>, + aptos_channel::Sender<(PeerId, ProtocolId), PeerManagerRequest>, + aptos_channel::Sender, + aptos_channel::Receiver<(PeerId, ProtocolId), PeerManagerNotification>, conn_notifs_channel::Receiver, ) { let (peer_manager_request_tx, peer_manager_request_rx) = - diem_channel::new(QueueStyle::FIFO, 1, None); - let (connection_reqs_tx, connection_reqs_rx) = diem_channel::new(QueueStyle::FIFO, 1, None); - let (hello_tx, hello_rx) = diem_channel::new(QueueStyle::FIFO, 1, None); + aptos_channel::new(QueueStyle::FIFO, 1, None); + let (connection_reqs_tx, connection_reqs_rx) = aptos_channel::new(QueueStyle::FIFO, 1, None); + let (hello_tx, hello_rx) = aptos_channel::new(QueueStyle::FIFO, 1, None); let (conn_status_tx, conn_status_rx) = conn_notifs_channel::new(); let peer_manager = PeerManager::new( @@ -246,7 +246,7 @@ fn create_connection( #[test] fn peer_manager_simultaneous_dial_two_inbound() { - ::diem_logger::Logger::init_for_testing(); + ::aptos_logger::Logger::init_for_testing(); let runtime = ::tokio::runtime::Runtime::new().unwrap(); // Create a list of ordered PeerIds so we can ensure how PeerIds will be compared. @@ -294,7 +294,7 @@ fn peer_manager_simultaneous_dial_two_inbound() { #[test] fn peer_manager_simultaneous_dial_inbound_outbound_remote_id_larger() { - ::diem_logger::Logger::init_for_testing(); + ::aptos_logger::Logger::init_for_testing(); let runtime = ::tokio::runtime::Runtime::new().unwrap(); // Create a list of ordered PeerIds so we can ensure how PeerIds will be compared. @@ -343,7 +343,7 @@ fn peer_manager_simultaneous_dial_inbound_outbound_remote_id_larger() { #[test] fn peer_manager_simultaneous_dial_inbound_outbound_own_id_larger() { - ::diem_logger::Logger::init_for_testing(); + ::aptos_logger::Logger::init_for_testing(); let runtime = ::tokio::runtime::Runtime::new().unwrap(); // Create a list of ordered PeerIds so we can ensure how PeerIds will be compared. @@ -392,7 +392,7 @@ fn peer_manager_simultaneous_dial_inbound_outbound_own_id_larger() { #[test] fn peer_manager_simultaneous_dial_outbound_inbound_remote_id_larger() { - ::diem_logger::Logger::init_for_testing(); + ::aptos_logger::Logger::init_for_testing(); let runtime = ::tokio::runtime::Runtime::new().unwrap(); // Create a list of ordered PeerIds so we can ensure how PeerIds will be compared. @@ -441,7 +441,7 @@ fn peer_manager_simultaneous_dial_outbound_inbound_remote_id_larger() { #[test] fn peer_manager_simultaneous_dial_outbound_inbound_own_id_larger() { - ::diem_logger::Logger::init_for_testing(); + ::aptos_logger::Logger::init_for_testing(); let runtime = ::tokio::runtime::Runtime::new().unwrap(); // Create a list of ordered PeerIds so we can ensure how PeerIds will be compared. @@ -490,7 +490,7 @@ fn peer_manager_simultaneous_dial_outbound_inbound_own_id_larger() { #[test] fn peer_manager_simultaneous_dial_two_outbound() { - ::diem_logger::Logger::init_for_testing(); + ::aptos_logger::Logger::init_for_testing(); let runtime = ::tokio::runtime::Runtime::new().unwrap(); // Create a list of ordered PeerIds so we can ensure how PeerIds will be compared. @@ -578,7 +578,7 @@ fn peer_manager_simultaneous_dial_disconnect_event() { #[test] fn test_dial_disconnect() { - ::diem_logger::Logger::init_for_testing(); + ::aptos_logger::Logger::init_for_testing(); let runtime = ::tokio::runtime::Runtime::new().unwrap(); // Create a list of ordered PeerIds so we can ensure how PeerIds will be compared. diff --git a/network/src/peer_manager/transport.rs b/network/src/peer_manager/transport.rs index 96bbf03bc3cb5..bd70b771abaec 100644 --- a/network/src/peer_manager/transport.rs +++ b/network/src/peer_manager/transport.rs @@ -7,11 +7,11 @@ use crate::{ transport::Connection, }; use anyhow::format_err; +use aptos_config::network_id::NetworkContext; +use aptos_logger::prelude::*; +use aptos_time_service::{TimeService, TimeServiceTrait}; +use aptos_types::{network_address::NetworkAddress, PeerId}; use channel::{self}; -use diem_config::network_id::NetworkContext; -use diem_logger::prelude::*; -use diem_time_service::{TimeService, TimeServiceTrait}; -use diem_types::{network_address::NetworkAddress, PeerId}; use futures::{ channel::oneshot, future::{BoxFuture, FutureExt}, diff --git a/network/src/peer_manager/types.rs b/network/src/peer_manager/types.rs index d99aba837ffda..b1a8c97c96d9e 100644 --- a/network/src/peer_manager/types.rs +++ b/network/src/peer_manager/types.rs @@ -9,8 +9,8 @@ use crate::{ }, transport::{Connection, ConnectionMetadata}, }; -use diem_config::network_id::NetworkContext; -use diem_types::{network_address::NetworkAddress, PeerId}; +use aptos_config::network_id::NetworkContext; +use aptos_types::{network_address::NetworkAddress, PeerId}; use futures::channel::oneshot; use serde::Serialize; use std::fmt; diff --git a/network/src/protocols/health_checker/builder.rs b/network/src/protocols/health_checker/builder.rs index d7b9fafbaff45..b4b78a481bfdd 100644 --- a/network/src/protocols/health_checker/builder.rs +++ b/network/src/protocols/health_checker/builder.rs @@ -8,8 +8,8 @@ use crate::{ HealthCheckerNetworkSender, }, }; -use diem_config::network_id::NetworkContext; -use diem_time_service::TimeService; +use aptos_config::network_id::NetworkContext; +use aptos_time_service::TimeService; use std::{sync::Arc, time::Duration}; use tokio::runtime::Handle; diff --git a/network/src/protocols/health_checker/interface.rs b/network/src/protocols/health_checker/interface.rs index 4186e6bb60cb0..44360edc85a11 100644 --- a/network/src/protocols/health_checker/interface.rs +++ b/network/src/protocols/health_checker/interface.rs @@ -15,9 +15,9 @@ use crate::{ network::Event, }, }; +use aptos_config::network_id::PeerNetworkId; +use aptos_types::PeerId; use async_trait::async_trait; -use diem_config::network_id::PeerNetworkId; -use diem_types::PeerId; use futures::{stream::FusedStream, Stream}; use std::{ collections::hash_map::Entry, diff --git a/network/src/protocols/health_checker/mod.rs b/network/src/protocols/health_checker/mod.rs index 9b05b53e0e01f..94124eef8bb49 100644 --- a/network/src/protocols/health_checker/mod.rs +++ b/network/src/protocols/health_checker/mod.rs @@ -34,13 +34,13 @@ use crate::{ }, ProtocolId, }; +use aptos_config::network_id::{NetworkContext, PeerNetworkId}; +use aptos_logger::prelude::*; +use aptos_time_service::{TimeService, TimeServiceTrait}; +use aptos_types::PeerId; use async_trait::async_trait; use bytes::Bytes; -use channel::{diem_channel, message_queues::QueueStyle}; -use diem_config::network_id::{NetworkContext, PeerNetworkId}; -use diem_logger::prelude::*; -use diem_time_service::{TimeService, TimeServiceTrait}; -use diem_types::PeerId; +use channel::{aptos_channel, message_queues::QueueStyle}; use futures::{ channel::oneshot, stream::{FuturesUnordered, StreamExt}, @@ -80,7 +80,7 @@ pub struct HealthCheckerNetworkSender { pub fn network_endpoint_config() -> AppConfig { AppConfig::p2p( [ProtocolId::HealthCheckerRpc], - diem_channel::Config::new(NETWORK_CHANNEL_SIZE) + aptos_channel::Config::new(NETWORK_CHANNEL_SIZE) .queue_style(QueueStyle::LIFO) .counters(&counters::PENDING_HEALTH_CHECKER_NETWORK_EVENTS), ) diff --git a/network/src/protocols/health_checker/test.rs b/network/src/protocols/health_checker/test.rs index 11dbde5ab705e..6f0978a1cea4a 100644 --- a/network/src/protocols/health_checker/test.rs +++ b/network/src/protocols/health_checker/test.rs @@ -14,8 +14,8 @@ use crate::{ transport::ConnectionMetadata, ProtocolId, }; -use channel::{diem_channel, message_queues::QueueStyle}; -use diem_time_service::{MockTimeService, TimeService}; +use aptos_time_service::{MockTimeService, TimeService}; +use channel::{aptos_channel, message_queues::QueueStyle}; use futures::{executor::block_on, future}; const PING_INTERVAL: Duration = Duration::from_secs(1); @@ -23,20 +23,22 @@ const PING_TIMEOUT: Duration = Duration::from_millis(500); struct TestHarness { mock_time: MockTimeService, - peer_mgr_reqs_rx: diem_channel::Receiver<(PeerId, ProtocolId), PeerManagerRequest>, - peer_mgr_notifs_tx: diem_channel::Sender<(PeerId, ProtocolId), PeerManagerNotification>, - connection_reqs_rx: diem_channel::Receiver, + peer_mgr_reqs_rx: aptos_channel::Receiver<(PeerId, ProtocolId), PeerManagerRequest>, + peer_mgr_notifs_tx: aptos_channel::Sender<(PeerId, ProtocolId), PeerManagerNotification>, + connection_reqs_rx: aptos_channel::Receiver, connection_notifs_tx: conn_notifs_channel::Sender, } impl TestHarness { fn new_permissive(ping_failures_tolerated: u64) -> (Self, HealthChecker) { - ::diem_logger::Logger::init_for_testing(); + ::aptos_logger::Logger::init_for_testing(); let mock_time = TimeService::mock(); - let (peer_mgr_reqs_tx, peer_mgr_reqs_rx) = diem_channel::new(QueueStyle::FIFO, 1, None); - let (connection_reqs_tx, connection_reqs_rx) = diem_channel::new(QueueStyle::FIFO, 1, None); - let (peer_mgr_notifs_tx, peer_mgr_notifs_rx) = diem_channel::new(QueueStyle::FIFO, 1, None); + let (peer_mgr_reqs_tx, peer_mgr_reqs_rx) = aptos_channel::new(QueueStyle::FIFO, 1, None); + let (connection_reqs_tx, connection_reqs_rx) = + aptos_channel::new(QueueStyle::FIFO, 1, None); + let (peer_mgr_notifs_tx, peer_mgr_notifs_rx) = + aptos_channel::new(QueueStyle::FIFO, 1, None); let (connection_notifs_tx, connection_notifs_rx) = conn_notifs_channel::new(); let hc_network_tx = HealthCheckerNetworkSender::new( diff --git a/network/src/protocols/identity.rs b/network/src/protocols/identity.rs index 10d043bbb1d73..cf10b61ffc924 100644 --- a/network/src/protocols/identity.rs +++ b/network/src/protocols/identity.rs @@ -48,8 +48,8 @@ mod tests { }, ProtocolId, }; - use diem_config::network_id::NetworkId; - use diem_types::chain_id::ChainId; + use aptos_config::network_id::NetworkId; + use aptos_types::chain_id::ChainId; use futures::{executor::block_on, future::join}; use memsocket::MemorySocket; use std::{collections::BTreeMap, iter::FromIterator}; diff --git a/network/src/protocols/network/mod.rs b/network/src/protocols/network/mod.rs index c63813bca9674..4f75cd8a98bae 100644 --- a/network/src/protocols/network/mod.rs +++ b/network/src/protocols/network/mod.rs @@ -13,11 +13,11 @@ use crate::{ transport::ConnectionMetadata, ProtocolId, }; +use aptos_logger::prelude::*; +use aptos_types::{network_address::NetworkAddress, PeerId}; use async_trait::async_trait; use bytes::Bytes; -use channel::diem_channel; -use diem_logger::prelude::*; -use diem_types::{network_address::NetworkAddress, PeerId}; +use channel::aptos_channel; use futures::{ channel::oneshot, future, @@ -92,7 +92,7 @@ pub struct AppConfig { /// capacity. // TODO(philiphayes): only relevant for services // TODO(philiphayes): in the future, use a Service trait here instead? - pub inbound_queue: Option, + pub inbound_queue: Option, } impl AppConfig { @@ -109,7 +109,7 @@ impl AppConfig { /// service can handle and the queue configuration. pub fn service( protocols: impl IntoIterator, - inbound_queue: diem_channel::Config, + inbound_queue: aptos_channel::Config, ) -> Self { Self { protocols: ProtocolIdSet::from_iter(protocols), @@ -121,7 +121,7 @@ impl AppConfig { /// a client and a service. pub fn p2p( protocols: impl IntoIterator, - inbound_queue: diem_channel::Config, + inbound_queue: aptos_channel::Config, ) -> Self { Self { protocols: ProtocolIdSet::from_iter(protocols), @@ -142,12 +142,12 @@ pub struct NetworkEvents { #[pin] event_stream: Select< FilterMap< - diem_channel::Receiver<(PeerId, ProtocolId), PeerManagerNotification>, + aptos_channel::Receiver<(PeerId, ProtocolId), PeerManagerNotification>, future::Ready>>, fn(PeerManagerNotification) -> future::Ready>>, >, Map< - diem_channel::Receiver, + aptos_channel::Receiver, fn(ConnectionNotification) -> Event, >, >, @@ -157,15 +157,15 @@ pub struct NetworkEvents { /// Trait specifying the signature for `new()` `NetworkEvents` pub trait NewNetworkEvents { fn new( - peer_mgr_notifs_rx: diem_channel::Receiver<(PeerId, ProtocolId), PeerManagerNotification>, - connection_notifs_rx: diem_channel::Receiver, + peer_mgr_notifs_rx: aptos_channel::Receiver<(PeerId, ProtocolId), PeerManagerNotification>, + connection_notifs_rx: aptos_channel::Receiver, ) -> Self; } impl NewNetworkEvents for NetworkEvents { fn new( - peer_mgr_notifs_rx: diem_channel::Receiver<(PeerId, ProtocolId), PeerManagerNotification>, - connection_notifs_rx: diem_channel::Receiver, + peer_mgr_notifs_rx: aptos_channel::Receiver<(PeerId, ProtocolId), PeerManagerNotification>, + connection_notifs_rx: aptos_channel::Receiver, ) -> Self { let data_event_stream = peer_mgr_notifs_rx.filter_map( peer_mgr_notif_to_event @@ -250,7 +250,7 @@ impl FusedStream for NetworkEvents { /// keys. /// /// `NetworkSender` is in fact a thin wrapper around a `PeerManagerRequestSender`, which in turn is -/// a thin wrapper on `diem_channel::Sender<(PeerId, ProtocolId), PeerManagerRequest>`, +/// a thin wrapper on `aptos_channel::Sender<(PeerId, ProtocolId), PeerManagerRequest>`, /// mostly focused on providing a more ergonomic API. However, network applications will usually /// provide their own thin wrapper around `NetworkSender` that narrows the API to the specific /// interface they need. For instance, `mempool` only requires direct-send functionality so its diff --git a/network/src/protocols/rpc/error.rs b/network/src/protocols/rpc/error.rs index 1c7f7ba89ffb9..421ba3d5d3a64 100644 --- a/network/src/protocols/rpc/error.rs +++ b/network/src/protocols/rpc/error.rs @@ -5,7 +5,7 @@ use crate::peer_manager::PeerManagerError; use anyhow::anyhow; -use diem_types::PeerId; +use aptos_types::PeerId; use futures::channel::{mpsc, oneshot}; use std::io; use thiserror::Error; diff --git a/network/src/protocols/rpc/mod.rs b/network/src/protocols/rpc/mod.rs index eebae300d56cd..ed396a9c9ae83 100644 --- a/network/src/protocols/rpc/mod.rs +++ b/network/src/protocols/rpc/mod.rs @@ -58,13 +58,13 @@ use crate::{ ProtocolId, }; use anyhow::anyhow; +use aptos_config::network_id::NetworkContext; +use aptos_id_generator::{IdGenerator, U32IdGenerator}; +use aptos_logger::prelude::*; +use aptos_time_service::{timeout, TimeService, TimeServiceTrait}; +use aptos_types::PeerId; use bytes::Bytes; -use channel::diem_channel; -use diem_config::network_id::NetworkContext; -use diem_id_generator::{IdGenerator, U32IdGenerator}; -use diem_logger::prelude::*; -use diem_time_service::{timeout, TimeService, TimeServiceTrait}; -use diem_types::PeerId; +use channel::aptos_channel; use error::RpcError; use futures::{ channel::oneshot, @@ -205,7 +205,7 @@ impl InboundRpcs { /// Handle a new inbound `RpcRequest` message off the wire. pub fn handle_inbound_request( &mut self, - peer_notifs_tx: &mut diem_channel::Sender, + peer_notifs_tx: &mut aptos_channel::Sender, request: RpcRequest, ) -> Result<(), RpcError> { let network_context = &self.network_context; diff --git a/network/src/protocols/wire/handshake/v1/mod.rs b/network/src/protocols/wire/handshake/v1/mod.rs index 2ac69245849bb..818398497a918 100644 --- a/network/src/protocols/wire/handshake/v1/mod.rs +++ b/network/src/protocols/wire/handshake/v1/mod.rs @@ -13,8 +13,8 @@ //! [DiemNet Handshake v1 Specification]: https://github.com/diem/diem/blob/main/specifications/network/handshake-v1.md use anyhow::anyhow; -use diem_config::network_id::NetworkId; -use diem_types::chain_id::ChainId; +use aptos_config::network_id::NetworkId; +use aptos_types::chain_id::ChainId; use serde::{Deserialize, Serialize}; use std::{ collections::BTreeMap, @@ -244,13 +244,13 @@ impl fmt::Display for MessagingProtocolVersion { /// An enum to list the possible errors during the diem handshake negotiation #[derive(Debug, Error, Eq, PartialEq)] pub enum HandshakeError { - #[error("diem-handshake: the received message has a different chain id: {0}, expected: {1}")] + #[error("aptos-handshake: the received message has a different chain id: {0}, expected: {1}")] InvalidChainId(ChainId, ChainId), #[error( - "diem-handshake: the received message has an different network id: {0}, expected: {1}" + "aptos-handshake: the received message has an different network id: {0}, expected: {1}" )] InvalidNetworkId(NetworkId, NetworkId), - #[error("diem-handshake: could not find an intersection of supported protocol with the peer")] + #[error("aptos-handshake: could not find an intersection of supported protocol with the peer")] NoCommonProtocols, } diff --git a/network/src/protocols/wire/messaging/v1/mod.rs b/network/src/protocols/wire/messaging/v1/mod.rs index 3311b7ebe268d..19ae803817144 100644 --- a/network/src/protocols/wire/messaging/v1/mod.rs +++ b/network/src/protocols/wire/messaging/v1/mod.rs @@ -10,8 +10,8 @@ //! over-the-wire. use crate::protocols::wire::handshake::v1::ProtocolId; +use aptos_rate_limiter::{async_lib::AsyncRateLimiter, rate_limit::SharedBucket}; use bytes::Bytes; -use diem_rate_limiter::{async_lib::AsyncRateLimiter, rate_limit::SharedBucket}; use futures::{ io::{AsyncRead, AsyncWrite}, sink::Sink, diff --git a/network/src/testutils/builder.rs b/network/src/testutils/builder.rs index e554f0f9f3103..276b5df405439 100644 --- a/network/src/testutils/builder.rs +++ b/network/src/testutils/builder.rs @@ -5,7 +5,7 @@ use crate::testutils::{ test_framework::TestFramework, test_node::{NodeId, NodeType, TestNode}, }; -use diem_config::{ +use aptos_config::{ config::NodeConfig, network_id::{NetworkId, PeerNetworkId}, }; diff --git a/network/src/testutils/test_framework.rs b/network/src/testutils/test_framework.rs index b135842d13792..ed03810588704 100644 --- a/network/src/testutils/test_framework.rs +++ b/network/src/testutils/test_framework.rs @@ -10,11 +10,11 @@ use crate::{ OutboundMessageReceiver, }, }; -use channel::message_queues::QueueStyle; -use diem_config::{ +use aptos_config::{ config::NodeConfig, network_id::{NetworkId, PeerNetworkId}, }; +use channel::message_queues::QueueStyle; use std::{collections::HashMap, hash::Hash, sync::Arc, vec::Vec}; /// A trait describing a test framework for a specific application @@ -74,9 +74,9 @@ fn setup_network() -> ( - channel::diem_channel::Sender, - channel::diem_channel::Receiver, +fn aptos_channel() -> ( + channel::aptos_channel::Sender, + channel::aptos_channel::Receiver, ) { static MAX_QUEUE_SIZE: usize = 8; - channel::diem_channel::new(QueueStyle::FIFO, MAX_QUEUE_SIZE, None) + channel::aptos_channel::new(QueueStyle::FIFO, MAX_QUEUE_SIZE, None) } diff --git a/network/src/testutils/test_node.rs b/network/src/testutils/test_node.rs index 45dca983fbbfd..5ce4f3e401415 100644 --- a/network/src/testutils/test_node.rs +++ b/network/src/testutils/test_node.rs @@ -11,26 +11,26 @@ use crate::{ transport::ConnectionMetadata, DisconnectReason, ProtocolId, }; -use async_trait::async_trait; -use diem_config::{ +use aptos_config::{ config::{PeerRole, RoleType}, network_id::{NetworkContext, NetworkId, PeerNetworkId}, }; -use diem_types::PeerId; +use aptos_types::PeerId; +use async_trait::async_trait; use futures::StreamExt; use netcore::transport::ConnectionOrigin; use std::{collections::HashMap, sync::Arc, time::Duration}; /// A sender to a node to mock an inbound network message from [`PeerManager`] pub type InboundMessageSender = - channel::diem_channel::Sender<(PeerId, ProtocolId), PeerManagerNotification>; + channel::aptos_channel::Sender<(PeerId, ProtocolId), PeerManagerNotification>; /// A sender to a node to mock an inbound connection from [`PeerManager`] pub type ConnectionUpdateSender = crate::peer_manager::conn_notifs_channel::Sender; /// A receiver to get outbound network messages to [`PeerManager`] pub type OutboundMessageReceiver = - channel::diem_channel::Receiver<(PeerId, ProtocolId), PeerManagerRequest>; + channel::aptos_channel::Receiver<(PeerId, ProtocolId), PeerManagerRequest>; /// A connection handle describing the network for a node. /// diff --git a/network/src/transport/mod.rs b/network/src/transport/mod.rs index d609a00304695..5747570cf0c29 100644 --- a/network/src/transport/mod.rs +++ b/network/src/transport/mod.rs @@ -9,15 +9,15 @@ use crate::{ wire::handshake::v1::{HandshakeMsg, MessagingProtocolVersion, ProtocolIdSet}, }, }; -use diem_config::{ +use aptos_config::{ config::{PeerRole, HANDSHAKE_VERSION}, network_id::{NetworkContext, NetworkId}, }; -use diem_crypto::x25519; -use diem_id_generator::{IdGenerator, U32IdGenerator}; -use diem_logger::prelude::*; -use diem_time_service::{timeout, TimeService, TimeServiceTrait}; -use diem_types::{ +use aptos_crypto::x25519; +use aptos_id_generator::{IdGenerator, U32IdGenerator}; +use aptos_logger::prelude::*; +use aptos_time_service::{timeout, TimeService, TimeServiceTrait}; +use aptos_types::{ chain_id::ChainId, network_address::{parse_dns_tcp, parse_ip_tcp, parse_memory, NetworkAddress}, PeerId, @@ -454,7 +454,7 @@ where fn parse_dial_addr( addr: &NetworkAddress, ) -> io::Result<(NetworkAddress, x25519::PublicKey, u8)> { - use diem_types::network_address::Protocol::*; + use aptos_types::network_address::Protocol::*; let protos = addr.as_slice(); diff --git a/network/src/transport/test.rs b/network/src/transport/test.rs index ca3c2199d1307..a95fcce527941 100644 --- a/network/src/transport/test.rs +++ b/network/src/transport/test.rs @@ -5,19 +5,19 @@ use crate::{ protocols::wire::handshake::v1::{MessagingProtocolVersion, ProtocolId, ProtocolIdSet}, transport::*, }; -use bytes::{Bytes, BytesMut}; -use diem_config::{ +use aptos_config::{ config::{Peer, PeerRole, PeerSet, HANDSHAKE_VERSION}, network_id::NetworkContext, }; -use diem_crypto::{test_utils::TEST_SEED, traits::Uniform, x25519}; -use diem_infallible::RwLock; -use diem_time_service::MockTimeService; -use diem_types::{ +use aptos_crypto::{test_utils::TEST_SEED, traits::Uniform, x25519}; +use aptos_infallible::RwLock; +use aptos_time_service::MockTimeService; +use aptos_types::{ chain_id::ChainId, network_address::{NetworkAddress, Protocol::*}, PeerId, }; +use bytes::{Bytes, BytesMut}; use futures::{future, io::AsyncWriteExt, stream::StreamExt}; use netcore::{ framing::{read_u16frame, write_u16frame}, @@ -103,11 +103,11 @@ where ) } Auth::MaybeMutual => { - let listener_peer_id = diem_types::account_address::from_identity_public_key( + let listener_peer_id = aptos_types::account_address::from_identity_public_key( listener_key.public_key(), ); let dialer_peer_id = - diem_types::account_address::from_identity_public_key(dialer_key.public_key()); + aptos_types::account_address::from_identity_public_key(dialer_key.public_key()); let trusted_peers = build_trusted_peers( dialer_peer_id, &dialer_key, @@ -126,11 +126,11 @@ where ) } Auth::ServerOnly => { - let listener_peer_id = diem_types::account_address::from_identity_public_key( + let listener_peer_id = aptos_types::account_address::from_identity_public_key( listener_key.public_key(), ); let dialer_peer_id = - diem_types::account_address::from_identity_public_key(dialer_key.public_key()); + aptos_types::account_address::from_identity_public_key(dialer_key.public_key()); let trusted_peers = Arc::new(RwLock::new(HashMap::new())); ( diff --git a/scripts/fgi/run b/scripts/fgi/run index 51ecb59cf7b07..b450845b16a89 100755 --- a/scripts/fgi/run +++ b/scripts/fgi/run @@ -224,7 +224,7 @@ except Exception as e: end_ts_ms = int(time.time() * 1000) DASHBOARD_LINK = f"{grafana_url}/d/overview/overview?from={start_ts_ms}&to={end_ts_ms}&orgId=1" -LOGGING_LINK = "https://diem-development.kb.us-west1.gcp.cloud.es.io:9243/app/discover#/?_g=(filters:!()," \ +LOGGING_LINK = "https://aptos-development.kb.us-west1.gcp.cloud.es.io:9243/app/discover#/?_g=(filters:!()," \ "refreshInterval:(pause:!t,value:0),time:(from:now-15m,to:now))&_a=(columns:!(),filters:!()," \ "index:'2da2a6e0-f70a-11eb-ad53-b979a6c9b83a',interval:auto,query:(language:kuery,query:'')," \ "sort:!(!('@timestamp',desc)))" diff --git a/scripts/weekly-dep-report.sh b/scripts/weekly-dep-report.sh index b1b09a803d757..668cc8dd7213d 100755 --- a/scripts/weekly-dep-report.sh +++ b/scripts/weekly-dep-report.sh @@ -26,19 +26,19 @@ format_change_in_dependency_output () { } get_total_deps () { - cargo guppy resolve-cargo --resolver-version v2 --target-platform x86_64-unknown-linux-gnu --host-platform x86_64-unknown-linux-gnu --build-kind target --kind thirdparty --omit-edges-into diem-workspace-hack | wc -l | tr -d ' ' + cargo guppy resolve-cargo --resolver-version v2 --target-platform x86_64-unknown-linux-gnu --host-platform x86_64-unknown-linux-gnu --build-kind target --kind thirdparty --omit-edges-into aptos-workspace-hack | wc -l | tr -d ' ' } get_total_direct_deps() { - cargo guppy resolve-cargo --resolver-version v2 --target-platform x86_64-unknown-linux-gnu --host-platform x86_64-unknown-linux-gnu --build-kind target --kind directthirdparty --omit-edges-into diem-workspace-hack | wc -l | tr -d ' ' + cargo guppy resolve-cargo --resolver-version v2 --target-platform x86_64-unknown-linux-gnu --host-platform x86_64-unknown-linux-gnu --build-kind target --kind directthirdparty --omit-edges-into aptos-workspace-hack | wc -l | tr -d ' ' } get_total_dsr_deps () { - cargo guppy resolve-cargo --resolver-version v2 --target-platform x86_64-unknown-linux-gnu --host-platform x86_64-unknown-linux-gnu --build-kind target --kind thirdparty --omit-edges-into diem-workspace-hack -p safety-rules | wc -l | tr -d ' ' + cargo guppy resolve-cargo --resolver-version v2 --target-platform x86_64-unknown-linux-gnu --host-platform x86_64-unknown-linux-gnu --build-kind target --kind thirdparty --omit-edges-into aptos-workspace-hack -p safety-rules | wc -l | tr -d ' ' } get_total_direct_dsr_deps () { - cargo guppy resolve-cargo --resolver-version v2 --target-platform x86_64-unknown-linux-gnu --host-platform x86_64-unknown-linux-gnu --build-kind target --kind directthirdparty --omit-edges-into diem-workspace-hack -p safety-rules | wc -l | tr -d ' ' + cargo guppy resolve-cargo --resolver-version v2 --target-platform x86_64-unknown-linux-gnu --host-platform x86_64-unknown-linux-gnu --build-kind target --kind directthirdparty --omit-edges-into aptos-workspace-hack -p safety-rules | wc -l | tr -d ' ' } get_total_dups () { diff --git a/sdk/Cargo.toml b/sdk/Cargo.toml index b305e2a510a6f..ee10c9e305ed3 100644 --- a/sdk/Cargo.toml +++ b/sdk/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "diem-sdk" +name = "aptos-sdk" version = "0.0.3" authors = ["Diem Association "] description = "The Official Diem SDK" @@ -14,8 +14,8 @@ bcs = "0.1" rand_core = "0.6.2" serde = { version = "1.0.124", features = ["derive"] } -diem-crypto = { path = "../crates/diem-crypto", version = "0.0.3" } -diem-types = { path = "../types", version = "0.0.3"} +aptos-crypto = { path = "../crates/aptos-crypto", version = "0.0.3" } +aptos-types = { path = "../types", version = "0.0.3"} move-core-types = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860", version = "0.0.3" } -diem-transaction-builder = { path = "./transaction-builder", version = "0.0.3" } -diem-workspace-hack = { version = "0.1", path = "../crates/diem-workspace-hack" } +aptos-transaction-builder = { path = "./transaction-builder", version = "0.0.3" } +aptos-workspace-hack = { version = "0.1", path = "../crates/aptos-workspace-hack" } diff --git a/sdk/README.md b/sdk/README.md index 78c422be15c2c..6f539c5605e36 100644 --- a/sdk/README.md +++ b/sdk/README.md @@ -1,8 +1,8 @@ -# diem-sdk +# aptos-sdk -[![diem-sdk on crates.io](https://img.shields.io/crates/v/diem-sdk)](https://crates.io/crates/diem-sdk) -[![Documentation (latest release)](https://docs.rs/diem-sdk/badge.svg)](https://docs.rs/diem-sdk/) -[![Documentation (master)](https://img.shields.io/badge/docs-master-59f)](https://diem.github.io/diem/diem_sdk/) +[![aptos-sdk on crates.io](https://img.shields.io/crates/v/aptos-sdk)](https://crates.io/crates/aptos-sdk) +[![Documentation (latest release)](https://docs.rs/aptos-sdk/badge.svg)](https://docs.rs/aptos-sdk/) +[![Documentation (master)](https://img.shields.io/badge/docs-master-59f)](https://diem.github.io/diem/aptos_sdk/) [![License](https://img.shields.io/badge/license-Apache-green.svg)](https://github.com/diem/diem/blob/main/LICENSE) The official Rust SDK for Diem. diff --git a/sdk/offchain/Cargo.toml b/sdk/offchain/Cargo.toml index 20a332b545944..107ffca526e4a 100644 --- a/sdk/offchain/Cargo.toml +++ b/sdk/offchain/Cargo.toml @@ -22,8 +22,8 @@ thiserror = "1.0.24" url = "2.2.2" uuid = { version = "0.8.2", features = ["serde"] } -diem-sdk = { path = ".." } -diem-workspace-hack = { version = "0.1", path = "../../crates/diem-workspace-hack" } +aptos-sdk = { path = ".." } +aptos-workspace-hack = { version = "0.1", path = "../../crates/aptos-workspace-hack" } [dev-dependencies] rand_core = "0.6" diff --git a/sdk/offchain/src/identifier.rs b/sdk/offchain/src/identifier.rs index f808afbc93605..da3d8e51ea91f 100644 --- a/sdk/offchain/src/identifier.rs +++ b/sdk/offchain/src/identifier.rs @@ -2,8 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 use crate::subaddress::{Subaddress, SubaddressParseError}; -use bech32::{self, u5, FromBase32, ToBase32}; -use diem_sdk::{ +use aptos_sdk::{ move_types::account_address::AccountAddressParseError, transaction_builder::Currency, types::{ @@ -11,6 +10,7 @@ use diem_sdk::{ account_config::{allowed_currency_code_string, XDX_NAME, XUS_NAME}, }, }; +use bech32::{self, u5, FromBase32, ToBase32}; use std::{collections::HashMap, str::FromStr}; use thiserror::Error; use url::Url; @@ -274,8 +274,8 @@ fn currency_from_str(currency: &str) -> Result #[cfg(test)] mod tests { use super::*; + use aptos_sdk::types::account_address::AccountAddress; use bech32::{self, FromBase32, ToBase32}; - use diem_sdk::types::account_address::AccountAddress; use rstest::rstest; const ACCOUNT_ADDRESS: &str = "f72589b71ff4f8d139674a3f7369c69b"; diff --git a/sdk/offchain/src/jws.rs b/sdk/offchain/src/jws.rs index 36a86af4d9d08..2ddbf4132a2d1 100644 --- a/sdk/offchain/src/jws.rs +++ b/sdk/offchain/src/jws.rs @@ -1,7 +1,7 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_sdk::crypto::ed25519::ed25519_dalek::{self, Signature, Signer, Verifier}; +use aptos_sdk::crypto::ed25519::ed25519_dalek::{self, Signature, Signer, Verifier}; use serde::{de::DeserializeOwned, Deserialize, Serialize}; use std::{convert::TryFrom, str}; @@ -150,7 +150,7 @@ impl std::error::Error for JwsError { mod test { use super::*; use crate::types::{CommandResponseObject, CommandStatus}; - use diem_sdk::crypto::ed25519::ed25519_dalek::{Keypair, PublicKey}; + use aptos_sdk::crypto::ed25519::ed25519_dalek::{Keypair, PublicKey}; #[test] fn deserialize_example() { diff --git a/sdk/publishing.md b/sdk/publishing.md index 43e4e19415896..a7d6e4e8b384b 100644 --- a/sdk/publishing.md +++ b/sdk/publishing.md @@ -8,14 +8,14 @@ When preparing to make a release of the SDK follow these steps: 3. Create a PR and get it merged into master. 4. Once the PR has landed in master, check out the commit which does the versions bump. 5. Publish to crates.io -6. Create a git tag `git tag diem-sdk-v0.0.X HEAD` and push that tag to the diem/diem repository. +6. Create a git tag `git tag aptos-sdk-v0.0.X HEAD` and push that tag to the diem/diem repository. -Here is the set of currently published packages that make up the diem-sdk: +Here is the set of currently published packages that make up the aptos-sdk: * move-core-types -* diem-crypto-derive -* diem-crypto -* diem-types -* diem-transaction-builder -* diem-json-rpc-types -* diem-client -* diem-sdk +* aptos-crypto-derive +* aptos-crypto +* aptos-types +* aptos-transaction-builder +* aptos-json-rpc-types +* aptos-client +* aptos-sdk diff --git a/sdk/src/lib.rs b/sdk/src/lib.rs index 0adda666f134e..7cad0d4452208 100644 --- a/sdk/src/lib.rs +++ b/sdk/src/lib.rs @@ -18,7 +18,7 @@ //! pub mod crypto { - pub use diem_crypto::*; + pub use aptos_crypto::*; } pub mod transaction_builder; diff --git a/sdk/src/transaction_builder.rs b/sdk/src/transaction_builder.rs index 9ec718c966e39..013285d91aa93 100644 --- a/sdk/src/transaction_builder.rs +++ b/sdk/src/transaction_builder.rs @@ -12,8 +12,8 @@ use crate::{ use serde::{Deserialize, Serialize}; use std::fmt; -pub use diem_transaction_builder::{experimental_stdlib, stdlib}; -use diem_types::transaction::{ChangeSet, ModuleBundle, Script, ScriptFunction, WriteSetPayload}; +pub use aptos_transaction_builder::{experimental_stdlib, stdlib}; +use aptos_types::transaction::{ChangeSet, ModuleBundle, Script, ScriptFunction, WriteSetPayload}; pub struct TransactionBuilder { sender: Option, diff --git a/sdk/src/types.rs b/sdk/src/types.rs index bd9eab8c8e376..62fdc31a395ce 100644 --- a/sdk/src/types.rs +++ b/sdk/src/types.rs @@ -13,7 +13,7 @@ use crate::{ }, }; -pub use diem_types::*; +pub use aptos_types::*; #[derive(Debug)] pub struct LocalAccount { diff --git a/sdk/transaction-builder/Cargo.toml b/sdk/transaction-builder/Cargo.toml index 1f7b73e2e8fd5..284f0c2ce5182 100644 --- a/sdk/transaction-builder/Cargo.toml +++ b/sdk/transaction-builder/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "diem-transaction-builder" +name = "aptos-transaction-builder" version = "0.0.3" authors = ["Diem Association "] description = "Generated transaction builders" @@ -16,11 +16,11 @@ once_cell = "1.7.2" serde = { version = "1.0.124", features = ["derive"] } move-core-types = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860", version = "0.0.3" } -diem-types = { path = "../../types", version = "0.0.3" } +aptos-types = { path = "../../types", version = "0.0.3" } proptest = { version = "1.0.0", optional = true } proptest-derive = { version = "0.3.0", optional = true } -diem-workspace-hack = { version = "0.1", path = "../../crates/diem-workspace-hack" } +aptos-workspace-hack = { version = "0.1", path = "../../crates/aptos-workspace-hack" } [dev-dependencies] proptest = "1.0.0" diff --git a/sdk/transaction-builder/src/aptos_stdlib.rs b/sdk/transaction-builder/src/aptos_stdlib.rs index ce8f93a0c40c7..57002da9cd879 100644 --- a/sdk/transaction-builder/src/aptos_stdlib.rs +++ b/sdk/transaction-builder/src/aptos_stdlib.rs @@ -12,7 +12,7 @@ #![allow(clippy::unnecessary_wraps)] #![allow(unused_imports)] -use diem_types::{ +use aptos_types::{ account_address::AccountAddress, transaction::{Script, ScriptFunction, TransactionArgument, TransactionPayload, VecBytes}, }; @@ -654,7 +654,7 @@ pub enum ScriptCall { /// `DualAttestation::get_cur_microdiem_limit` XDX and `payer` and `payee` are distinct VASPs. /// However, a transaction sender can opt in to dual attestation even when it is not required /// (e.g., a DesignatedDealer -> VASP payment) by providing a non-empty `metadata_signature`. - /// Standardized `metadata` BCS format can be found in `diem_types::transaction::metadata::Metadata`. + /// Standardized `metadata` BCS format can be found in `aptos_types::transaction::metadata::Metadata`. /// /// ## Events /// Successful execution of this script emits two events: @@ -2535,7 +2535,7 @@ pub fn encode_freeze_account_script( /// `DualAttestation::get_cur_microdiem_limit` XDX and `payer` and `payee` are distinct VASPs. /// However, a transaction sender can opt in to dual attestation even when it is not required /// (e.g., a DesignatedDealer -> VASP payment) by providing a non-empty `metadata_signature`. -/// Standardized `metadata` BCS format can be found in `diem_types::transaction::metadata::Metadata`. +/// Standardized `metadata` BCS format can be found in `aptos_types::transaction::metadata::Metadata`. /// /// ## Events /// Successful execution of this script emits two events: diff --git a/sdk/transaction-builder/src/experimental_stdlib.rs b/sdk/transaction-builder/src/experimental_stdlib.rs index 09dc18fa32f95..185d1f96ff98a 100644 --- a/sdk/transaction-builder/src/experimental_stdlib.rs +++ b/sdk/transaction-builder/src/experimental_stdlib.rs @@ -12,7 +12,7 @@ #![allow(clippy::unnecessary_wraps)] #![allow(unused_imports)] -use diem_types::{ +use aptos_types::{ account_address::AccountAddress, transaction::{Script, ScriptFunction, TransactionArgument, TransactionPayload, VecBytes}, }; @@ -654,7 +654,7 @@ pub enum ScriptCall { /// `DualAttestation::get_cur_microdiem_limit` XDX and `payer` and `payee` are distinct VASPs. /// However, a transaction sender can opt in to dual attestation even when it is not required /// (e.g., a DesignatedDealer -> VASP payment) by providing a non-empty `metadata_signature`. - /// Standardized `metadata` BCS format can be found in `diem_types::transaction::metadata::Metadata`. + /// Standardized `metadata` BCS format can be found in `aptos_types::transaction::metadata::Metadata`. /// /// ## Events /// Successful execution of this script emits two events: @@ -3285,7 +3285,7 @@ pub fn encode_freeze_account_script( /// `DualAttestation::get_cur_microdiem_limit` XDX and `payer` and `payee` are distinct VASPs. /// However, a transaction sender can opt in to dual attestation even when it is not required /// (e.g., a DesignatedDealer -> VASP payment) by providing a non-empty `metadata_signature`. -/// Standardized `metadata` BCS format can be found in `diem_types::transaction::metadata::Metadata`. +/// Standardized `metadata` BCS format can be found in `aptos_types::transaction::metadata::Metadata`. /// /// ## Events /// Successful execution of this script emits two events: diff --git a/sdk/transaction-builder/src/stdlib.rs b/sdk/transaction-builder/src/stdlib.rs index bcaf53e1a8341..030076a0ad286 100644 --- a/sdk/transaction-builder/src/stdlib.rs +++ b/sdk/transaction-builder/src/stdlib.rs @@ -12,7 +12,7 @@ #![allow(clippy::unnecessary_wraps)] #![allow(unused_imports)] -use diem_types::{ +use aptos_types::{ account_address::AccountAddress, transaction::{Script, ScriptFunction, TransactionArgument, TransactionPayload, VecBytes}, }; @@ -654,7 +654,7 @@ pub enum ScriptCall { /// `DualAttestation::get_cur_microdiem_limit` XDX and `payer` and `payee` are distinct VASPs. /// However, a transaction sender can opt in to dual attestation even when it is not required /// (e.g., a DesignatedDealer -> VASP payment) by providing a non-empty `metadata_signature`. - /// Standardized `metadata` BCS format can be found in `diem_types::transaction::metadata::Metadata`. + /// Standardized `metadata` BCS format can be found in `aptos_types::transaction::metadata::Metadata`. /// /// ## Events /// Successful execution of this script emits two events: @@ -2226,7 +2226,7 @@ pub enum ScriptFunctionCall { /// Transfers `amount` coins of type `Currency` from `payer` to `payee` with (optional) associated /// `metadata`. /// Dual attestation is not applied to this script as payee is also a signer of the transaction. - /// Standardized `metadata` BCS format can be found in `diem_types::transaction::metadata::Metadata`. + /// Standardized `metadata` BCS format can be found in `aptos_types::transaction::metadata::Metadata`. /// /// # Events /// Successful execution of this script emits two events: @@ -2284,7 +2284,7 @@ pub enum ScriptFunctionCall { /// `DualAttestation::get_cur_microdiem_limit` XDX and `payer` and `payee` are distinct VASPs. /// However, a transaction sender can opt in to dual attestation even when it is not required /// (e.g., a DesignatedDealer -> VASP payment) by providing a non-empty `metadata_signature`. - /// Standardized `metadata` BCS format can be found in `diem_types::transaction::metadata::Metadata`. + /// Standardized `metadata` BCS format can be found in `aptos_types::transaction::metadata::Metadata`. /// /// # Events /// Successful execution of this script emits two events: @@ -4769,7 +4769,7 @@ pub fn encode_opt_in_to_crsn_script_function(crsn_size: u64) -> TransactionPaylo /// Transfers `amount` coins of type `Currency` from `payer` to `payee` with (optional) associated /// `metadata`. /// Dual attestation is not applied to this script as payee is also a signer of the transaction. -/// Standardized `metadata` BCS format can be found in `diem_types::transaction::metadata::Metadata`. +/// Standardized `metadata` BCS format can be found in `aptos_types::transaction::metadata::Metadata`. /// /// # Events /// Successful execution of this script emits two events: @@ -4840,7 +4840,7 @@ pub fn encode_peer_to_peer_by_signers_script_function( /// `DualAttestation::get_cur_microdiem_limit` XDX and `payer` and `payee` are distinct VASPs. /// However, a transaction sender can opt in to dual attestation even when it is not required /// (e.g., a DesignatedDealer -> VASP payment) by providing a non-empty `metadata_signature`. -/// Standardized `metadata` BCS format can be found in `diem_types::transaction::metadata::Metadata`. +/// Standardized `metadata` BCS format can be found in `aptos_types::transaction::metadata::Metadata`. /// /// # Events /// Successful execution of this script emits two events: @@ -6770,7 +6770,7 @@ pub fn encode_freeze_account_script( /// `DualAttestation::get_cur_microdiem_limit` XDX and `payer` and `payee` are distinct VASPs. /// However, a transaction sender can opt in to dual attestation even when it is not required /// (e.g., a DesignatedDealer -> VASP payment) by providing a non-empty `metadata_signature`. -/// Standardized `metadata` BCS format can be found in `diem_types::transaction::metadata::Metadata`. +/// Standardized `metadata` BCS format can be found in `aptos_types::transaction::metadata::Metadata`. /// /// ## Events /// Successful execution of this script emits two events: diff --git a/secure/net/Cargo.toml b/secure/net/Cargo.toml index 71ebbdc1c7fbc..665937bbf3ee3 100644 --- a/secure/net/Cargo.toml +++ b/secure/net/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "diem-secure-net" +name = "aptos-secure-net" version = "0.1.0" authors = ["Diem Association "] repository = "https://github.com/diem/diem" @@ -14,9 +14,9 @@ once_cell = "1.7.2" serde = { version = "1.0.124", features = ["rc"], default-features = false } thiserror = "1.0.24" -diem-logger = { path = "../../crates/diem-logger" } -diem-secure-push-metrics = { path = "../push-metrics" } -diem-workspace-hack = { version = "0.1", path = "../../crates/diem-workspace-hack" } +aptos-logger = { path = "../../crates/aptos-logger" } +aptos-secure-push-metrics = { path = "../push-metrics" } +aptos-workspace-hack = { version = "0.1", path = "../../crates/aptos-workspace-hack" } [dev-dependencies] -diem-config = { path = "../../config" } +aptos-config = { path = "../../config" } diff --git a/secure/net/src/lib.rs b/secure/net/src/lib.rs index efb2929608cc2..ff96a51545b64 100644 --- a/secure/net/src/lib.rs +++ b/secure/net/src/lib.rs @@ -15,8 +15,8 @@ //! Internally both the client and server leverage a NetworkStream that communications in blocks //! where a block is a length prefixed array of bytes. -use diem_logger::{info, trace, warn, Schema}; -use diem_secure_push_metrics::{register_int_counter_vec, IntCounterVec}; +use aptos_logger::{info, trace, warn, Schema}; +use aptos_secure_push_metrics::{register_int_counter_vec, IntCounterVec}; use once_cell::sync::Lazy; use serde::Serialize; use std::{ @@ -78,7 +78,7 @@ impl NetworkMode { static EVENT_COUNTER: Lazy = Lazy::new(|| { register_int_counter_vec!( - "diem_secure_net_events", + "aptos_secure_net_events", "Outcome of secure net events", &["service", "mode", "method", "result"] ) @@ -517,7 +517,7 @@ impl NetworkStream { #[cfg(test)] mod test { use super::*; - use diem_config::utils; + use aptos_config::utils; use std::net::{IpAddr, Ipv4Addr, SocketAddr}; /// Read, Write, Connect timeout in milliseconds. diff --git a/secure/push-metrics/Cargo.toml b/secure/push-metrics/Cargo.toml index 32165c1ffb7dd..41225a9958b36 100644 --- a/secure/push-metrics/Cargo.toml +++ b/secure/push-metrics/Cargo.toml @@ -1,8 +1,8 @@ [package] -name = "diem-secure-push-metrics" +name = "aptos-secure-push-metrics" version = "0.1.0" authors = ["Diem Association "] -description = "Diem diem-util" +description = "Diem aptos-util" repository = "https://github.com/diem/diem" homepage = "https://diem.com" license = "Apache-2.0" @@ -11,6 +11,6 @@ edition = "2018" [dependencies] ureq = { version = "1.5.4", features = ["json", "native-tls"], default-features = false } -diem-logger = { path = "../../crates/diem-logger" } -diem-metrics-core = { path = "../../crates/diem-metrics-core" } -diem-workspace-hack = { version = "0.1", path = "../../crates/diem-workspace-hack" } +aptos-logger = { path = "../../crates/aptos-logger" } +aptos-metrics-core = { path = "../../crates/aptos-metrics-core" } +aptos-workspace-hack = { version = "0.1", path = "../../crates/aptos-workspace-hack" } diff --git a/secure/push-metrics/src/lib.rs b/secure/push-metrics/src/lib.rs index fef9942b3e4ca..b90240ad04ab1 100644 --- a/secure/push-metrics/src/lib.rs +++ b/secure/push-metrics/src/lib.rs @@ -4,14 +4,14 @@ #![forbid(unsafe_code)] // Re-export counter types from prometheus crate -pub use diem_metrics_core::{ +pub use aptos_metrics_core::{ register_histogram, register_histogram_vec, register_int_counter, register_int_counter_vec, register_int_gauge, register_int_gauge_vec, Histogram, HistogramTimer, HistogramVec, IntCounter, IntCounterVec, IntGauge, IntGaugeVec, }; -use diem_logger::{error, info}; -use diem_metrics_core::{Encoder, TextEncoder}; +use aptos_logger::{error, info}; +use aptos_metrics_core::{Encoder, TextEncoder}; use std::{env, sync::mpsc, thread, thread::JoinHandle, time::Duration}; const DEFAULT_PUSH_FREQUENCY_SECS: u64 = 15; @@ -29,7 +29,7 @@ impl MetricsPusher { fn push(push_metrics_endpoint: &str) { let mut buffer = Vec::new(); - if let Err(e) = TextEncoder::new().encode(&diem_metrics_core::gather(), &mut buffer) { + if let Err(e) = TextEncoder::new().encode(&aptos_metrics_core::gather(), &mut buffer) { error!("Failed to encode push metrics: {}.", e.to_string()); } else { let response = ureq::post(push_metrics_endpoint) diff --git a/secure/storage/Cargo.toml b/secure/storage/Cargo.toml index 41c9d8e0a1e2a..5063a6933d397 100644 --- a/secure/storage/Cargo.toml +++ b/secure/storage/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "diem-secure-storage" +name = "aptos-secure-storage" version = "0.1.0" authors = ["Diem Association "] repository = "https://github.com/diem/diem" @@ -19,20 +19,20 @@ serde_json = "1.0.64" thiserror = "1.0.24" bcs = "0.1.2" -diem-crypto = { path = "../../crates/diem-crypto" } -diem-github-client = { path = "github" } -diem-infallible = { path = "../../crates/diem-infallible" } -diem-logger = { path = "../../crates/diem-logger" } -diem-temppath = { path = "../../crates/diem-temppath" } -diem-time-service = { path = "../../crates/diem-time-service" } -diem-vault-client = { path = "vault" } -diem-workspace-hack = { version = "0.1", path = "../../crates/diem-workspace-hack" } +aptos-crypto = { path = "../../crates/aptos-crypto" } +aptos-github-client = { path = "github" } +aptos-infallible = { path = "../../crates/aptos-infallible" } +aptos-logger = { path = "../../crates/aptos-logger" } +aptos-temppath = { path = "../../crates/aptos-temppath" } +aptos-time-service = { path = "../../crates/aptos-time-service" } +aptos-vault-client = { path = "vault" } +aptos-workspace-hack = { version = "0.1", path = "../../crates/aptos-workspace-hack" } [dev-dependencies] -diem-crypto = { path = "../../crates/diem-crypto", features = ["fuzzing"] } -diem-crypto-derive = { path = "../../crates/diem-crypto-derive" } +aptos-crypto = { path = "../../crates/aptos-crypto", features = ["fuzzing"] } +aptos-crypto-derive = { path = "../../crates/aptos-crypto-derive" } rand = "0.8.3" [features] -fuzzing = ["diem-crypto/fuzzing"] +fuzzing = ["aptos-crypto/fuzzing"] testing = [] diff --git a/secure/storage/github/Cargo.toml b/secure/storage/github/Cargo.toml index 70017f0f94a89..fe5b2ac63b0d6 100644 --- a/secure/storage/github/Cargo.toml +++ b/secure/storage/github/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "diem-github-client" +name = "aptos-github-client" version = "0.1.0" authors = ["Diem Association "] repository = "https://github.com/diem/diem" @@ -14,7 +14,7 @@ serde = { version = "1.0.124", features = ["derive"], default-features = false } serde_json = "1.0.64" thiserror = "1.0.24" ureq = { version = "1.5.4", features = ["json", "native-tls"], default-features = false } -diem-workspace-hack = { version = "0.1", path = "../../../crates/diem-workspace-hack" } +aptos-workspace-hack = { version = "0.1", path = "../../../crates/aptos-workspace-hack" } proxy = { path = "../../../crates/proxy" } [dev-dependencies] diff --git a/secure/storage/github/src/lib.rs b/secure/storage/github/src/lib.rs index 00603afaeefdf..95c45a98e94f0 100644 --- a/secure/storage/github/src/lib.rs +++ b/secure/storage/github/src/lib.rs @@ -92,7 +92,7 @@ impl Client { let resp = self .upgrade_request(ureq::delete(&self.post_url(path))) .send_json( - json!({ "branch": self.branch.to_string(), "message": "diem-secure", "sha": hash }), + json!({ "branch": self.branch.to_string(), "message": "aptos-secure", "sha": hash }), ); match resp.status() { @@ -168,10 +168,10 @@ impl Client { pub fn put(&self, path: &str, content: &str) -> Result<(), Error> { let json = match self.get_sha(path) { Ok(hash) => { - json!({ "branch": self.branch.to_string(), "content": content, "message": format!("[diem-management] {}", path), "sha": hash }) + json!({ "branch": self.branch.to_string(), "content": content, "message": format!("[aptos-management] {}", path), "sha": hash }) } Err(Error::NotFound(_)) => { - json!({ "branch": self.branch.to_string(), "content": content, "message": format!("[diem-management] {}", path) }) + json!({ "branch": self.branch.to_string(), "content": content, "message": format!("[aptos-management] {}", path) }) } Err(e) => return Err(e), }; diff --git a/secure/storage/src/crypto_kv_storage.rs b/secure/storage/src/crypto_kv_storage.rs index a7f9f1bac0368..6c11561ed0344 100644 --- a/secure/storage/src/crypto_kv_storage.rs +++ b/secure/storage/src/crypto_kv_storage.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 use crate::{CryptoStorage, Error, KVStorage, PublicKeyResponse}; -use diem_crypto::{ +use aptos_crypto::{ ed25519::{Ed25519PrivateKey, Ed25519PublicKey, Ed25519Signature}, hash::CryptoHash, PrivateKey, SigningKey, Uniform, diff --git a/secure/storage/src/crypto_storage.rs b/secure/storage/src/crypto_storage.rs index 9c2e396b97654..74cfb9d47664e 100644 --- a/secure/storage/src/crypto_storage.rs +++ b/secure/storage/src/crypto_storage.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 use crate::Error; -use diem_crypto::ed25519::{Ed25519PrivateKey, Ed25519PublicKey, Ed25519Signature}; +use aptos_crypto::ed25519::{Ed25519PrivateKey, Ed25519PublicKey, Ed25519Signature}; use enum_dispatch::enum_dispatch; use serde::{Deserialize, Serialize}; @@ -47,7 +47,7 @@ pub trait CryptoStorage { /// Signs the provided securely-hashable struct, using the 'named' private /// key. // The FQDNs on the next line help macros don't remove them - fn sign( + fn sign( &self, name: &str, message: &T, @@ -56,7 +56,7 @@ pub trait CryptoStorage { /// Signs the provided securely-hashable struct, using the 'named' and 'versioned' private key. This may fail /// even if the 'named' key exists but the version is not present. // The FQDNs on the next line help macros, don't remove them - fn sign_using_version( + fn sign_using_version( &self, name: &str, version: Ed25519PublicKey, diff --git a/secure/storage/src/error.rs b/secure/storage/src/error.rs index 382e954569b3d..6848bf3291b82 100644 --- a/secure/storage/src/error.rs +++ b/secure/storage/src/error.rs @@ -53,21 +53,21 @@ impl From for Error { } } -impl From for Error { - fn from(error: diem_vault_client::Error) -> Self { +impl From for Error { + fn from(error: aptos_vault_client::Error) -> Self { match error { - diem_vault_client::Error::NotFound(_, key) => Self::KeyNotSet(key), - diem_vault_client::Error::HttpError(403, _, _) => Self::PermissionDenied, + aptos_vault_client::Error::NotFound(_, key) => Self::KeyNotSet(key), + aptos_vault_client::Error::HttpError(403, _, _) => Self::PermissionDenied, _ => Self::InternalError(format!("{}", error)), } } } -impl From for Error { - fn from(error: diem_github_client::Error) -> Self { +impl From for Error { + fn from(error: aptos_github_client::Error) -> Self { match error { - diem_github_client::Error::NotFound(key) => Self::KeyNotSet(key), - diem_github_client::Error::HttpError(403, _, _) => Self::PermissionDenied, + aptos_github_client::Error::NotFound(key) => Self::KeyNotSet(key), + aptos_github_client::Error::HttpError(403, _, _) => Self::PermissionDenied, _ => Self::InternalError(format!("{}", error)), } } diff --git a/secure/storage/src/github.rs b/secure/storage/src/github.rs index 827f229c8dc54..76b3edb4989d5 100644 --- a/secure/storage/src/github.rs +++ b/secure/storage/src/github.rs @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 use crate::{CryptoKVStorage, Error, GetResponse, KVStorage}; -use diem_github_client::Client; -use diem_time_service::{TimeService, TimeServiceTrait}; +use aptos_github_client::Client; +use aptos_time_service::{TimeService, TimeServiceTrait}; use serde::{de::DeserializeOwned, Serialize}; /// GitHubStorage leverages a GitHub repository to provide a file system approach to key / value diff --git a/secure/storage/src/in_memory.rs b/secure/storage/src/in_memory.rs index 7f3c973faab1c..90cdf748c7f8e 100644 --- a/secure/storage/src/in_memory.rs +++ b/secure/storage/src/in_memory.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 use crate::{CryptoKVStorage, Error, GetResponse, KVStorage}; -use diem_time_service::{TimeService, TimeServiceTrait}; +use aptos_time_service::{TimeService, TimeServiceTrait}; use serde::{de::DeserializeOwned, Serialize}; use std::collections::HashMap; diff --git a/secure/storage/src/namespaced.rs b/secure/storage/src/namespaced.rs index 7d988ec568fee..75f9a1d9ef945 100644 --- a/secure/storage/src/namespaced.rs +++ b/secure/storage/src/namespaced.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 use crate::{CryptoStorage, Error, GetResponse, KVStorage, PublicKeyResponse}; -use diem_crypto::{ +use aptos_crypto::{ ed25519::{Ed25519PrivateKey, Ed25519PublicKey, Ed25519Signature}, hash::CryptoHash, }; @@ -136,7 +136,7 @@ impl CryptoStorage for Namespaced { mod test { use super::*; use crate::OnDiskStorage; - use diem_temppath::TempPath; + use aptos_temppath::TempPath; #[test] fn test_different_namespaces() { diff --git a/secure/storage/src/on_disk.rs b/secure/storage/src/on_disk.rs index 5152b5751e15d..06bd3fe814089 100644 --- a/secure/storage/src/on_disk.rs +++ b/secure/storage/src/on_disk.rs @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 use crate::{CryptoKVStorage, Error, GetResponse, KVStorage}; -use diem_temppath::TempPath; -use diem_time_service::{TimeService, TimeServiceTrait}; +use aptos_temppath::TempPath; +use aptos_time_service::{TimeService, TimeServiceTrait}; use serde::{de::DeserializeOwned, Serialize}; use serde_json::Value; use std::{ diff --git a/secure/storage/src/storage.rs b/secure/storage/src/storage.rs index a9b9806f0519d..5145dddcc9b81 100644 --- a/secure/storage/src/storage.rs +++ b/secure/storage/src/storage.rs @@ -4,7 +4,7 @@ use crate::{ CryptoStorage, Error, GetResponse, GitHubStorage, InMemoryStorage, KVStorage, Namespaced, OnDiskStorage, PublicKeyResponse, VaultStorage, }; -use diem_crypto::ed25519::{Ed25519PrivateKey, Ed25519PublicKey, Ed25519Signature}; +use aptos_crypto::ed25519::{Ed25519PrivateKey, Ed25519PublicKey, Ed25519Signature}; use enum_dispatch::enum_dispatch; use serde::{de::DeserializeOwned, Serialize}; @@ -75,7 +75,7 @@ impl CryptoStorage for Box { Storage::rotate_key(self, name) } - fn sign( + fn sign( &self, name: &str, message: &T, @@ -83,7 +83,7 @@ impl CryptoStorage for Box { Storage::sign(self, name, message) } - fn sign_using_version( + fn sign_using_version( &self, name: &str, version: Ed25519PublicKey, diff --git a/secure/storage/src/tests/on_disk.rs b/secure/storage/src/tests/on_disk.rs index c329d78317751..248980866dab5 100644 --- a/secure/storage/src/tests/on_disk.rs +++ b/secure/storage/src/tests/on_disk.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 use crate::{tests::suite, OnDiskStorage, Storage}; -use diem_temppath::TempPath; +use aptos_temppath::TempPath; #[test] fn on_disk() { diff --git a/secure/storage/src/tests/suite.rs b/secure/storage/src/tests/suite.rs index 9cbd3032f0930..4c56bc6c357f0 100644 --- a/secure/storage/src/tests/suite.rs +++ b/secure/storage/src/tests/suite.rs @@ -3,7 +3,7 @@ use crate::{CryptoStorage, Error, KVStorage, Storage}; -use diem_crypto::{ +use aptos_crypto::{ ed25519::Ed25519PrivateKey, test_utils::TestDiemCrypto, HashValue, PrivateKey, Signature, Uniform, }; diff --git a/secure/storage/src/tests/vault.rs b/secure/storage/src/tests/vault.rs index 283fc2048e6b7..442d13519826a 100644 --- a/secure/storage/src/tests/vault.rs +++ b/secure/storage/src/tests/vault.rs @@ -9,8 +9,8 @@ use crate::{ }, Capability, CryptoStorage, Error, Identity, KVStorage, Namespaced, Permission, Policy, Storage, }; -use diem_crypto::{test_utils::TestDiemCrypto, Signature}; -use diem_vault_client::dev::{self, ROOT_TOKEN}; +use aptos_crypto::{test_utils::TestDiemCrypto, Signature}; +use aptos_vault_client::dev::{self, ROOT_TOKEN}; /// VaultStorage namespace constants const VAULT_NAMESPACE_1: &str = "namespace_1"; diff --git a/secure/storage/src/vault.rs b/secure/storage/src/vault.rs index ce75025f61fe6..a84898e874455 100644 --- a/secure/storage/src/vault.rs +++ b/secure/storage/src/vault.rs @@ -5,14 +5,14 @@ use crate::{ namespaced::NAMESPACE_SEPARATOR, CryptoStorage, Error, GetResponse, KVStorage, PublicKeyResponse, }; -use chrono::DateTime; -use diem_crypto::{ +use aptos_crypto::{ ed25519::{Ed25519PrivateKey, Ed25519PublicKey, Ed25519Signature}, hash::CryptoHash, }; -use diem_infallible::RwLock; -use diem_time_service::{TimeService, TimeServiceTrait}; -use diem_vault_client::Client; +use aptos_infallible::RwLock; +use aptos_time_service::{TimeService, TimeServiceTrait}; +use aptos_vault_client::Client; +use chrono::DateTime; use serde::{de::DeserializeOwned, Serialize}; use std::{ collections::HashMap, @@ -20,7 +20,7 @@ use std::{ }; #[cfg(any(test, feature = "testing"))] -use diem_vault_client::ReadResponse; +use aptos_vault_client::ReadResponse; const TRANSIT_NAMESPACE_SEPARATOR: &str = "__"; @@ -77,7 +77,7 @@ impl VaultStorage { let next_renewal = now + (ttl as u64) / 2; self.next_renewal.store(next_renewal, Ordering::Relaxed); } else if let Err(e) = result { - diem_logger::error!("Unable to renew lease: {}", e.to_string()); + aptos_logger::error!("Unable to renew lease: {}", e.to_string()); } } } @@ -103,7 +103,7 @@ impl VaultStorage { let keys = match self.client().list_keys() { Ok(keys) => keys, // No keys were found, so there's no need to reset. - Err(diem_vault_client::Error::NotFound(_, _)) => return Ok(()), + Err(aptos_vault_client::Error::NotFound(_, _)) => return Ok(()), Err(e) => return Err(e.into()), }; for key in keys { @@ -278,7 +278,7 @@ impl CryptoStorage for VaultStorage { message: &T, ) -> Result { let name = self.crypto_name(name); - let mut bytes = ::seed().to_vec(); + let mut bytes = ::seed().to_vec(); bcs::serialize_into(&mut bytes, &message).map_err(|e| { Error::InternalError(format!( "Serialization of signable material should not fail, yet returned Error:{}", @@ -296,7 +296,7 @@ impl CryptoStorage for VaultStorage { ) -> Result { let name = self.crypto_name(name); let vers = self.key_version(&name, &version)?; - let mut bytes = ::seed().to_vec(); + let mut bytes = ::seed().to_vec(); bcs::serialize_into(&mut bytes, &message).map_err(|e| { Error::InternalError(format!( "Serialization of signable material should not fail, yet returned Error:{}", @@ -311,7 +311,7 @@ impl CryptoStorage for VaultStorage { pub mod policy { use super::*; use crate::{Capability, Identity, Policy}; - use diem_vault_client as vault; + use aptos_vault_client as vault; const DIEM_DEFAULT: &str = "diem_default"; @@ -340,7 +340,7 @@ pub mod policy { fn reset_policies(&self) -> Result<(), Error> { let policies = match self.client().list_policies() { Ok(policies) => policies, - Err(diem_vault_client::Error::NotFound(_, _)) => return Ok(()), + Err(aptos_vault_client::Error::NotFound(_, _)) => return Ok(()), Err(e) => return Err(e.into()), }; diff --git a/secure/storage/vault/Cargo.toml b/secure/storage/vault/Cargo.toml index 6beab92129a74..cc477f5afd4a8 100644 --- a/secure/storage/vault/Cargo.toml +++ b/secure/storage/vault/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "diem-vault-client" +name = "aptos-vault-client" version = "0.1.0" authors = ["Diem Association "] repository = "https://github.com/diem/diem" @@ -20,16 +20,16 @@ serde_json = "1.0.64" thiserror = "1.0.24" ureq = { version = "1.5.4", features = ["json", "native-tls"], default-features = false } -diem-crypto = { path = "../../../crates/diem-crypto" } -diem-proptest-helpers = { path = "../../../crates/diem-proptest-helpers", optional = true } -diem-types = { path = "../../../types", optional = true } -diem-workspace-hack = { version = "0.1", path = "../../../crates/diem-workspace-hack" } +aptos-crypto = { path = "../../../crates/aptos-crypto" } +aptos-proptest-helpers = { path = "../../../crates/aptos-proptest-helpers", optional = true } +aptos-types = { path = "../../../types", optional = true } +aptos-workspace-hack = { version = "0.1", path = "../../../crates/aptos-workspace-hack" } [dev-dependencies] proptest = "1.0.0" -diem-proptest-helpers = { path = "../../../crates/diem-proptest-helpers" } -diem-types = { path = "../../../types", features = ["fuzzing"] } +aptos-proptest-helpers = { path = "../../../crates/aptos-proptest-helpers" } +aptos-types = { path = "../../../types", features = ["fuzzing"] } [features] -fuzzing = ["proptest", "diem-proptest-helpers", "diem-types", "diem-types/fuzzing"] +fuzzing = ["proptest", "aptos-proptest-helpers", "aptos-types", "aptos-types/fuzzing"] diff --git a/secure/storage/vault/src/fuzzing.rs b/secure/storage/vault/src/fuzzing.rs index 352eee02cdea9..1904a470d1908 100644 --- a/secure/storage/vault/src/fuzzing.rs +++ b/secure/storage/vault/src/fuzzing.rs @@ -7,7 +7,7 @@ use crate::{ ReadSecretListResponse, ReadSecretMetadata, ReadSecretResponse, RenewTokenAuth, RenewTokenResponse, SealStatusResponse, Signature, SignatureResponse, }; -use diem_types::proptest_types::arb_json_value; +use aptos_types::proptest_types::arb_json_value; use proptest::prelude::*; use serde_json::Value; use ureq::Response; diff --git a/secure/storage/vault/src/lib.rs b/secure/storage/vault/src/lib.rs index b2fdc65655d0e..299a0237eb8ab 100644 --- a/secure/storage/vault/src/lib.rs +++ b/secure/storage/vault/src/lib.rs @@ -5,7 +5,7 @@ pub mod dev; -use diem_crypto::{ +use aptos_crypto::{ ed25519::{Ed25519PrivateKey, Ed25519PublicKey, Ed25519Signature, ED25519_PRIVATE_KEY_LENGTH}, PrivateKey, }; @@ -60,8 +60,8 @@ impl From for Error { } } -impl From for Error { - fn from(error: diem_crypto::traits::CryptoMaterialError) -> Self { +impl From for Error { + fn from(error: aptos_crypto::traits::CryptoMaterialError) -> Self { Self::SerializationError(format!("{}", error)) } } diff --git a/specifications/crypto/README.md b/specifications/crypto/README.md index 61f9280643fcc..5f452d4c17625 100644 --- a/specifications/crypto/README.md +++ b/specifications/crypto/README.md @@ -215,7 +215,7 @@ multi-signatures, with signer accountability. This type of signature supports K out-of N semantics, for K ≤ N ≤ 32. The implementation, exposed as a Move standard library module -[(Authenticator)](https://github.com/diem/diem/blob/main/diem-move/diem-framework/core/sources/Authenticator.move), +[(Authenticator)](https://github.com/diem/diem/blob/main/aptos-move/diem-framework/core/sources/Authenticator.move), is currently simply a multiple-signature container —rather than a distinct signing scheme (e.g. MuSig). Nonetheless, we plan to improve it in further DIPs, while expanding the scope of threshold signing. diff --git a/specifications/db_backup/spec.md b/specifications/db_backup/spec.md index 333c5c499d803..f58d3bb2d8cfd 100644 --- a/specifications/db_backup/spec.md +++ b/specifications/db_backup/spec.md @@ -1,6 +1,6 @@ # DiemDB Backup -Diem nodes runs on top of [DiemDB](../../storage/diemdb) that serves the [core data stucture](../data_structure/spec.md) to other parts of the system. While the DiemDB is designed to provide efficient access to the recent history of the block chain, and append data to it, the DiemDB Backup is a concise data format to archive the full history of the chain, away from the running Diem validator network. It's useful in at least these situations: +Diem nodes runs on top of [DiemDB](../../storage/aptosdb) that serves the [core data stucture](../data_structure/spec.md) to other parts of the system. While the DiemDB is designed to provide efficient access to the recent history of the block chain, and append data to it, the DiemDB Backup is a concise data format to archive the full history of the chain, away from the running Diem validator network. It's useful in at least these situations: * In case a validator lost its DiemDB, restoring the full transaction history from a backup is supposed to be 10x or more faster than replying on synchronizing from a peer. * In case of a fatal bug in the software destroying the DB on every single Diem Node, we can recover the network using the backups. The backups are not likely to be corrupt at the same time because the format is 1. Different; 2. Simple. @@ -294,7 +294,7 @@ Example config for a S3 storage based on the aws-cli command line: ```toml [[env_vars]] key = "BUCKET_AND_PREFIX" -value = "diem-backup/backup1" +value = "aptos-backup/backup1" [commands] create_backup = 'echo "$BACKUP_NAME"' @@ -304,10 +304,10 @@ save_metadata_line= 'aws s3 cp - "s3://$BUCKET_AND_PREFIX/metadata/$FILE_NAME"' list_metadata_files = 'aws s3 ls s3://$BUCKET_AND_PREFIX/metadata/ | sed -ne "s/.* //p" | xargs -I{} echo s3://$BUCKET/metadata/{}' ``` -This will create a folder structure like the following in the s3 bucket diem-backup: +This will create a folder structure like the following in the s3 bucket aptos-backup: ``` -s3://diem-backup/backup1/ +s3://aptos-backup/backup1/ metadata/ epoch_ending_0-0.meta state_snapshot_ver_0.meta diff --git a/specifications/images/diem_network.png b/specifications/images/aptos_network.png similarity index 100% rename from specifications/images/diem_network.png rename to specifications/images/aptos_network.png diff --git a/specifications/images/diemnet_network_topology.png b/specifications/images/aptosnet_network_topology.png similarity index 100% rename from specifications/images/diemnet_network_topology.png rename to specifications/images/aptosnet_network_topology.png diff --git a/specifications/move_adapter/README.md b/specifications/move_adapter/README.md index 9591ae8b0f02e..f4f296211a0c7 100644 --- a/specifications/move_adapter/README.md +++ b/specifications/move_adapter/README.md @@ -313,7 +313,7 @@ functions are defined in the `DiemAccount` module of the Diem Framework: * Single-agent `ScriptFunction` and `Script`: The prologue function is `script_prologue`. In addition to the common checks listed below, it also calls the `is_script_allowed` function in the `DiemTransactionPublishingOption` module to determine if the script -should be allowed. A script sent by an account with `has_diem_root_role` is always +should be allowed. A script sent by an account with `has_aptos_root_role` is always allowed. Otherwise, a `Script` payload is allowed if the hash of the script bytecode is on the list of allowed scripts published at `0x1::DiemTransactionPublishingOption::DiemTransactionPublishingOption.script_allowlist`. @@ -342,7 +342,7 @@ for the transaction sender. If not, validation fails with a * `WriteSet`: The prologue function is `writeset_prologue`. In addition to the common checks listed below, it also checks that the sender is the Diem root -address and that `Roles::has_diem_root_role(sender)` is true. If those checks +address and that `Roles::has_aptos_root_role(sender)` is true. If those checks fail, the status code is set to `REJECTED_WRITE_SET`. The following checks are performed by all the prologue functions: @@ -457,11 +457,11 @@ the entire system. * Monitoring: - - `diem_vm_transactions_validated`: Number of transactions processed by + - `aptos_vm_transactions_validated`: Number of transactions processed by the validator, with either "success" or "failure" labels - - `diem_vm_txn_validation_seconds`: Histogram of validation time (in + - `aptos_vm_txn_validation_seconds`: Histogram of validation time (in seconds) per transaction - - `diem_vm_critical_errors`: Counter for critical internal errors; + - `aptos_vm_critical_errors`: Counter for critical internal errors; intended to trigger alerts, not for display on a dashboard * Logging on catastrophic events must report enough info to debug. @@ -793,14 +793,14 @@ certain error type. * Monitoring: - - `diem_vm_user_transactions_executed`: Number of user transactions executed, + - `aptos_vm_user_transactions_executed`: Number of user transactions executed, with either "success" or "failure" labels - - `diem_vm_system_transactions_executed`: Number of system transactions + - `aptos_vm_system_transactions_executed`: Number of system transactions executed, with either "success" or "failure" labels - - `diem_vm_txn_total_seconds`: Histogram of execution time (in seconds) per + - `aptos_vm_txn_total_seconds`: Histogram of execution time (in seconds) per user transaction - - `diem_vm_num_txns_per_block`: Histogram of number of transactions per block - - `diem_vm_critical_errors`: Counter for critical internal errors; intended + - `aptos_vm_num_txns_per_block`: Histogram of number of transactions per block + - `aptos_vm_critical_errors`: Counter for critical internal errors; intended to trigger alerts, not for display on a dashboard * Logging on catastrophic events must report enough info to debug. diff --git a/specifications/transactions/onchain/README.md b/specifications/transactions/onchain/README.md index c75a9fab62aa4..b86e338eae9bd 100644 --- a/specifications/transactions/onchain/README.md +++ b/specifications/transactions/onchain/README.md @@ -1,10 +1,10 @@ # On-Chain Data and Transactions -Diem transactions mutate and create state (or resources) within the set of [on-chain modules](https://github.com/diem/diem/tree/main/diem-move/diem-framework/core/sources), primarily the [Diem Account](https://github.com/diem/diem/blob/main/diem-move/diem-framework/doc/DiemAccount.md). The transaction format is defined in the [Move Adapter Specification](https://github.com/diem/diem/blob/main/specifications/move_adapter/README.md). Most participants of the Diem Payment Network (DPN) will submit SignedTransactions containing a [script function](https://github.com/diem/diem/blob/main/diem-move/diem-framework/script_documentation/script_documentation.md). Before release 1.2, clients used scripts. These can be accessed in [compiled form](https://github.com/diem/diem/tree/release-1.1/language/stdlib/compiled/transaction_scripts) and in their [original form](https://github.com/diem/diem/tree/release-1.1/language/stdlib/transaction_scripts). The DPN MainNet only allows script functions and this set of pre-registerd scripts to be submitted. Due to the evolving nature of Move and the Move compiler, compiling existing scripts may not result in the form stored in the directory stored above. Hence, it is recommended to use script functions where available or otherwise the compiled scripts. +Diem transactions mutate and create state (or resources) within the set of [on-chain modules](https://github.com/diem/diem/tree/main/aptos-move/diem-framework/core/sources), primarily the [Diem Account](https://github.com/diem/diem/blob/main/aptos-move/diem-framework/doc/DiemAccount.md). The transaction format is defined in the [Move Adapter Specification](https://github.com/diem/diem/blob/main/specifications/move_adapter/README.md). Most participants of the Diem Payment Network (DPN) will submit SignedTransactions containing a [script function](https://github.com/diem/diem/blob/main/aptos-move/diem-framework/script_documentation/script_documentation.md). Before release 1.2, clients used scripts. These can be accessed in [compiled form](https://github.com/diem/diem/tree/release-1.1/language/stdlib/compiled/transaction_scripts) and in their [original form](https://github.com/diem/diem/tree/release-1.1/language/stdlib/transaction_scripts). The DPN MainNet only allows script functions and this set of pre-registerd scripts to be submitted. Due to the evolving nature of Move and the Move compiler, compiling existing scripts may not result in the form stored in the directory stored above. Hence, it is recommended to use script functions where available or otherwise the compiled scripts. ## Peer to Peer Payments and Transaction Metadata -Most transactions will use the [peer_to_peer_with_metadata script function](https://github.com/diem/diem/blob/main/diem-move/diem-framework/script_documentation/script_documentation.md#0x1_PaymentScripts_peer_to_peer_with_metadata). This single transaction represents all current transfers between two participants and distinguishes the types of transfers via the embedded metadata. +Most transactions will use the [peer_to_peer_with_metadata script function](https://github.com/diem/diem/blob/main/aptos-move/diem-framework/script_documentation/script_documentation.md#0x1_PaymentScripts_peer_to_peer_with_metadata). This single transaction represents all current transfers between two participants and distinguishes the types of transfers via the embedded metadata. The metadata is represented by the following `Rust` enum encoded in [Binary Canonical Serialization (BCS)](https://github.com/diem/bcs): @@ -105,4 +105,4 @@ For transactions that exceed the travel rule limit must use the off-chain travel ## Dual Attestation Credentials -Diem defines a [DualAttestation::Credential](https://github.com/diem/diem/blob/main/diem-move/diem-framework/core/sources/DualAttestation.move) resource to support off-chain protocols. This resource contains the `human_name`, `base_url`, and `compliance_public_key` for a VASP. The `base_url` specifies where the VASP hosts its off-chain API and the `compliance_public_key` is used to verify signed transaction metadata and establish authentication in off-chain communication. The values can be set and updated via the [rotate_dual_attestation_info](https://github.com/diem/diem/blob/main/diem-move/diem-framework/transaction_scripts/rotate_dual_attestation_info.move) script. +Diem defines a [DualAttestation::Credential](https://github.com/diem/diem/blob/main/aptos-move/diem-framework/core/sources/DualAttestation.move) resource to support off-chain protocols. This resource contains the `human_name`, `base_url`, and `compliance_public_key` for a VASP. The `base_url` specifies where the VASP hosts its off-chain API and the `compliance_public_key` is used to verify signed transaction metadata and establish authentication in off-chain communication. The values can be set and updated via the [rotate_dual_attestation_info](https://github.com/diem/diem/blob/main/aptos-move/diem-framework/transaction_scripts/rotate_dual_attestation_info.move) script. diff --git a/state-sync/diem-data-client/Cargo.toml b/state-sync/aptos-data-client/Cargo.toml similarity index 57% rename from state-sync/diem-data-client/Cargo.toml rename to state-sync/aptos-data-client/Cargo.toml index d6faba64f0bf3..a12bd2cc62376 100644 --- a/state-sync/diem-data-client/Cargo.toml +++ b/state-sync/aptos-data-client/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "diem-data-client" +name = "aptos-data-client" version = "0.1.0" authors = ["Diem Association "] description = "The Diem data client" @@ -17,15 +17,15 @@ rand = "0.8.3" serde = { version = "1.0.124", default-features = false } thiserror = "1.0.24" -diem-config = { path = "../../config" } -diem-crypto = { path = "../../crates/diem-crypto" } -diem-id-generator = { path = "../../crates/diem-id-generator" } -diem-infallible = { path = "../../crates/diem-infallible" } -diem-logger = { path = "../../crates/diem-logger" } -diem-metrics = { path = "../../crates/diem-metrics" } -diem-time-service = { path = "../../crates/diem-time-service", features = ["async"] } -diem-types = { path = "../../types" } -diem-workspace-hack = { version = "0.1", path = "../../crates/diem-workspace-hack" } +aptos-config = { path = "../../config" } +aptos-crypto = { path = "../../crates/aptos-crypto" } +aptos-id-generator = { path = "../../crates/aptos-id-generator" } +aptos-infallible = { path = "../../crates/aptos-infallible" } +aptos-logger = { path = "../../crates/aptos-logger" } +aptos-metrics = { path = "../../crates/aptos-metrics" } +aptos-time-service = { path = "../../crates/aptos-time-service", features = ["async"] } +aptos-types = { path = "../../types" } +aptos-workspace-hack = { version = "0.1", path = "../../crates/aptos-workspace-hack" } network = { path = "../../network" } storage-service-client = { path = "../storage-service/client" } storage-service-types = { path = "../storage-service/types" } @@ -38,5 +38,5 @@ tokio = { version = "1.8.1", features = ["rt", "macros"], default-features = fal bcs = "0.1.2" channel = { path = "../../crates/channel" } -diem-time-service = { path = "../../crates/diem-time-service", features = ["async", "testing"] } +aptos-time-service = { path = "../../crates/aptos-time-service", features = ["async", "testing"] } network = { path = "../../network", features = ["fuzzing"] } diff --git a/state-sync/diem-data-client/README.md b/state-sync/aptos-data-client/README.md similarity index 87% rename from state-sync/diem-data-client/README.md rename to state-sync/aptos-data-client/README.md index 3b7da1ca3b515..f3a0af2aab184 100644 --- a/state-sync/diem-data-client/README.md +++ b/state-sync/aptos-data-client/README.md @@ -1,7 +1,7 @@ --- id: diem data client title: Diem Data Client -custom_edit_url: https://github.com/diem/diem/edit/main/state-sync/diem-data-client/README.md +custom_edit_url: https://github.com/diem/diem/edit/main/state-sync/aptos-data-client/README.md --- # Diem Data Client diff --git a/state-sync/diem-data-client/src/diemnet/logging.rs b/state-sync/aptos-data-client/src/diemnet/logging.rs similarity index 95% rename from state-sync/diem-data-client/src/diemnet/logging.rs rename to state-sync/aptos-data-client/src/diemnet/logging.rs index e5afe66c7dd10..9813f61fc76a1 100644 --- a/state-sync/diem-data-client/src/diemnet/logging.rs +++ b/state-sync/aptos-data-client/src/diemnet/logging.rs @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 use crate::Error; -use diem_config::network_id::PeerNetworkId; -use diem_logger::Schema; +use aptos_config::network_id::PeerNetworkId; +use aptos_logger::Schema; use serde::Serialize; use storage_service_types::StorageServiceRequest; diff --git a/state-sync/diem-data-client/src/diemnet/metrics.rs b/state-sync/aptos-data-client/src/diemnet/metrics.rs similarity index 87% rename from state-sync/diem-data-client/src/diemnet/metrics.rs rename to state-sync/aptos-data-client/src/diemnet/metrics.rs index db03b959b8ace..7aacc5d864295 100644 --- a/state-sync/diem-data-client/src/diemnet/metrics.rs +++ b/state-sync/aptos-data-client/src/diemnet/metrics.rs @@ -1,8 +1,8 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_crypto::_once_cell::sync::Lazy; -use diem_metrics::{ +use aptos_crypto::_once_cell::sync::Lazy; +use aptos_metrics::{ register_histogram_vec, register_int_counter_vec, HistogramTimer, HistogramVec, IntCounterVec, }; @@ -12,7 +12,7 @@ pub const TOTAL_COUNT_LABEL: &str = "TOTAL_COUNT"; /// Counter for tracking sent requests pub static SENT_REQUESTS: Lazy = Lazy::new(|| { register_int_counter_vec!( - "diem_data_client_sent_requests", + "aptos_data_client_sent_requests", "Counters related to sent requests", &["request_types"] ) @@ -22,7 +22,7 @@ pub static SENT_REQUESTS: Lazy = Lazy::new(|| { /// Counter for tracking success responses pub static SUCCESS_RESPONSES: Lazy = Lazy::new(|| { register_int_counter_vec!( - "diem_data_client_success_responses", + "aptos_data_client_success_responses", "Counters related to success responses", &["response_type"] ) @@ -32,7 +32,7 @@ pub static SUCCESS_RESPONSES: Lazy = Lazy::new(|| { /// Counter for tracking error responses pub static ERROR_RESPONSES: Lazy = Lazy::new(|| { register_int_counter_vec!( - "diem_data_client_error_responses", + "aptos_data_client_error_responses", "Counters related to error responses", &["response_type"] ) @@ -42,7 +42,7 @@ pub static ERROR_RESPONSES: Lazy = Lazy::new(|| { /// Counter for tracking request latencies pub static REQUEST_LATENCIES: Lazy = Lazy::new(|| { register_histogram_vec!( - "diem_data_client_request_latencies", + "aptos_data_client_request_latencies", "Counters related to request latencies", &["request_type"] ) diff --git a/state-sync/diem-data-client/src/diemnet/mod.rs b/state-sync/aptos-data-client/src/diemnet/mod.rs similarity index 98% rename from state-sync/diem-data-client/src/diemnet/mod.rs rename to state-sync/aptos-data-client/src/diemnet/mod.rs index 67ce2dc0fa851..79b0dcb361c3f 100644 --- a/state-sync/diem-data-client/src/diemnet/mod.rs +++ b/state-sync/aptos-data-client/src/diemnet/mod.rs @@ -10,21 +10,21 @@ use crate::{ DiemDataClient, Error, GlobalDataSummary, Response, ResponseCallback, ResponseContext, ResponseError, ResponseId, Result, }; -use async_trait::async_trait; -use diem_config::{ +use aptos_config::{ config::{DiemDataClientConfig, StorageServiceConfig}, network_id::PeerNetworkId, }; -use diem_id_generator::{IdGenerator, U64IdGenerator}; -use diem_infallible::RwLock; -use diem_logger::prelude::*; -use diem_time_service::{TimeService, TimeServiceTrait}; -use diem_types::{ +use aptos_id_generator::{IdGenerator, U64IdGenerator}; +use aptos_infallible::RwLock; +use aptos_logger::prelude::*; +use aptos_time_service::{TimeService, TimeServiceTrait}; +use aptos_types::{ account_state_blob::AccountStatesChunkWithProof, epoch_change::EpochChangeProof, ledger_info::LedgerInfoWithSignatures, transaction::{TransactionListWithProof, TransactionOutputListWithProof, Version}, }; +use async_trait::async_trait; use futures::StreamExt; use network::{ application::interface::NetworkInterface, diff --git a/state-sync/diem-data-client/src/diemnet/state.rs b/state-sync/aptos-data-client/src/diemnet/state.rs similarity index 98% rename from state-sync/diem-data-client/src/diemnet/state.rs rename to state-sync/aptos-data-client/src/diemnet/state.rs index 4a8bf66480ce7..3bf7f606f5134 100644 --- a/state-sync/diem-data-client/src/diemnet/state.rs +++ b/state-sync/aptos-data-client/src/diemnet/state.rs @@ -5,8 +5,8 @@ use crate::{ diemnet::logging::{LogEntry, LogEvent, LogSchema}, AdvertisedData, GlobalDataSummary, OptimalChunkSizes, ResponseError, }; -use diem_config::{config::StorageServiceConfig, network_id::PeerNetworkId}; -use diem_logger::debug; +use aptos_config::{config::StorageServiceConfig, network_id::PeerNetworkId}; +use aptos_logger::debug; use std::collections::HashMap; use storage_service_types::{StorageServerSummary, StorageServiceRequest}; diff --git a/state-sync/diem-data-client/src/diemnet/tests.rs b/state-sync/aptos-data-client/src/diemnet/tests.rs similarity index 96% rename from state-sync/diem-data-client/src/diemnet/tests.rs rename to state-sync/aptos-data-client/src/diemnet/tests.rs index 7d9ebb89bbdc9..6c341b18c426a 100644 --- a/state-sync/diem-data-client/src/diemnet/tests.rs +++ b/state-sync/aptos-data-client/src/diemnet/tests.rs @@ -2,20 +2,20 @@ // SPDX-License-Identifier: Apache-2.0 use super::{DataSummaryPoller, DiemDataClient, DiemNetDataClient, Error}; -use channel::{diem_channel, message_queues::QueueStyle}; -use claim::{assert_err, assert_matches}; -use diem_config::{ +use aptos_config::{ config::{DiemDataClientConfig, StorageServiceConfig}, network_id::{NetworkId, PeerNetworkId}, }; -use diem_crypto::HashValue; -use diem_time_service::{MockTimeService, TimeService}; -use diem_types::{ +use aptos_crypto::HashValue; +use aptos_time_service::{MockTimeService, TimeService}; +use aptos_types::{ block_info::BlockInfo, ledger_info::{LedgerInfo, LedgerInfoWithSignatures}, transaction::{TransactionListWithProof, Version}, PeerId, }; +use channel::{aptos_channel, message_queues::QueueStyle}; +use claim::{assert_err, assert_matches}; use futures::StreamExt; use maplit::hashmap; use network::{ @@ -62,13 +62,13 @@ fn mock_storage_summary(version: Version) -> StorageServerSummary { } struct MockNetwork { - peer_mgr_reqs_rx: diem_channel::Receiver<(PeerId, ProtocolId), PeerManagerRequest>, + peer_mgr_reqs_rx: aptos_channel::Receiver<(PeerId, ProtocolId), PeerManagerRequest>, peer_infos: Arc, } impl MockNetwork { fn new() -> (Self, MockTimeService, DiemNetDataClient, DataSummaryPoller) { - let queue_cfg = diem_channel::Config::new(10).queue_style(QueueStyle::FIFO); + let queue_cfg = aptos_channel::Config::new(10).queue_style(QueueStyle::FIFO); let (peer_mgr_reqs_tx, peer_mgr_reqs_rx) = queue_cfg.build(); let (connection_reqs_tx, _connection_reqs_rx) = queue_cfg.build(); @@ -136,7 +136,7 @@ impl MockNetwork { #[tokio::test] async fn test_request_works_only_when_data_available() { - ::diem_logger::Logger::init_for_testing(); + ::aptos_logger::Logger::init_for_testing(); let (mut mock_network, mock_time, client, poller) = MockNetwork::new(); tokio::spawn(poller.start()); @@ -213,7 +213,7 @@ async fn test_request_works_only_when_data_available() { #[tokio::test] async fn bad_peer_is_eventually_banned_internal() { - ::diem_logger::Logger::init_for_testing(); + ::aptos_logger::Logger::init_for_testing(); let (mut mock_network, _mock_time, client, _poller) = MockNetwork::new(); let good_peer = mock_network.add_connected_peer(); @@ -292,7 +292,7 @@ async fn bad_peer_is_eventually_banned_internal() { #[tokio::test] async fn bad_peer_is_eventually_banned_callback() { - ::diem_logger::Logger::init_for_testing(); + ::aptos_logger::Logger::init_for_testing(); let (mut mock_network, _mock_time, client, _poller) = MockNetwork::new(); let bad_peer = mock_network.add_connected_peer(); @@ -355,7 +355,7 @@ async fn bad_peer_is_eventually_banned_callback() { #[tokio::test] async fn bad_peer_is_eventually_added_back() { - ::diem_logger::Logger::init_for_testing(); + ::aptos_logger::Logger::init_for_testing(); let (mut mock_network, mock_time, client, poller) = MockNetwork::new(); // Add a connected peer. diff --git a/state-sync/diem-data-client/src/lib.rs b/state-sync/aptos-data-client/src/lib.rs similarity index 99% rename from state-sync/diem-data-client/src/lib.rs rename to state-sync/aptos-data-client/src/lib.rs index 5c48a58ee92d0..cdfc084eda1c1 100644 --- a/state-sync/diem-data-client/src/lib.rs +++ b/state-sync/aptos-data-client/src/lib.rs @@ -3,12 +3,12 @@ #![forbid(unsafe_code)] -use async_trait::async_trait; -use diem_types::{ +use aptos_types::{ account_state_blob::AccountStatesChunkWithProof, ledger_info::LedgerInfoWithSignatures, transaction::{TransactionListWithProof, TransactionOutputListWithProof, Version}, }; +use async_trait::async_trait; use itertools::Itertools; use serde::{Deserialize, Serialize}; use std::fmt; diff --git a/state-sync/inter-component/consensus-notifications/Cargo.toml b/state-sync/inter-component/consensus-notifications/Cargo.toml index 2d5ffc02daa3b..b4fd956451cf3 100644 --- a/state-sync/inter-component/consensus-notifications/Cargo.toml +++ b/state-sync/inter-component/consensus-notifications/Cargo.toml @@ -16,9 +16,9 @@ serde = { version = "1.0.124", default-features = false } thiserror = "1.0.24" tokio = { version = "1.8.1" } -diem-crypto = { path = "../../../crates/diem-crypto" } -diem-types = { path = "../../../types" } -diem-workspace-hack = { version = "0.1", path = "../../../crates/diem-workspace-hack" } +aptos-crypto = { path = "../../../crates/aptos-crypto" } +aptos-types = { path = "../../../types" } +aptos-workspace-hack = { version = "0.1", path = "../../../crates/aptos-workspace-hack" } [dev-dependencies] claim = "0.5.0" diff --git a/state-sync/inter-component/consensus-notifications/src/lib.rs b/state-sync/inter-component/consensus-notifications/src/lib.rs index a6131d1afc190..b32bb16dd7edb 100644 --- a/state-sync/inter-component/consensus-notifications/src/lib.rs +++ b/state-sync/inter-component/consensus-notifications/src/lib.rs @@ -3,10 +3,10 @@ #![forbid(unsafe_code)] -use async_trait::async_trait; -use diem_types::{ +use aptos_types::{ contract_event::ContractEvent, ledger_info::LedgerInfoWithSignatures, transaction::Transaction, }; +use async_trait::async_trait; use futures::{ channel::{mpsc, oneshot}, stream::FusedStream, @@ -271,9 +271,8 @@ impl ConsensusSyncNotification { #[cfg(test)] mod tests { use crate::{ConsensusNotification, ConsensusNotificationSender, Error}; - use claim::{assert_err, assert_matches, assert_ok}; - use diem_crypto::{ed25519::Ed25519PrivateKey, HashValue, PrivateKey, SigningKey, Uniform}; - use diem_types::{ + use aptos_crypto::{ed25519::Ed25519PrivateKey, HashValue, PrivateKey, SigningKey, Uniform}; + use aptos_types::{ account_address::AccountAddress, block_info::BlockInfo, chain_id::ChainId, @@ -282,6 +281,7 @@ mod tests { ledger_info::{LedgerInfo, LedgerInfoWithSignatures}, transaction::{RawTransaction, Script, SignedTransaction, Transaction, TransactionPayload}, }; + use claim::{assert_err, assert_matches, assert_ok}; use futures::{executor::block_on, FutureExt, StreamExt}; use move_core_types::language_storage::TypeTag; use std::{collections::BTreeMap, time::Duration}; diff --git a/state-sync/inter-component/event-notifications/Cargo.toml b/state-sync/inter-component/event-notifications/Cargo.toml index b3240f1ac9b4d..5c79648e267bc 100644 --- a/state-sync/inter-component/event-notifications/Cargo.toml +++ b/state-sync/inter-component/event-notifications/Cargo.toml @@ -18,10 +18,10 @@ thiserror = "1.0.24" tokio = { version = "1.8.1" } channel = { path = "../../../crates/channel" } -diem-id-generator = { path = "../../../crates/diem-id-generator" } -diem-infallible = { path = "../../../crates/diem-infallible" } -diem-types = { path = "../../../types" } -diem-workspace-hack = { version = "0.1", path = "../../../crates/diem-workspace-hack" } +aptos-id-generator = { path = "../../../crates/aptos-id-generator" } +aptos-infallible = { path = "../../../crates/aptos-infallible" } +aptos-types = { path = "../../../types" } +aptos-workspace-hack = { version = "0.1", path = "../../../crates/aptos-workspace-hack" } storage-interface = { path = "../../../storage/storage-interface" } @@ -29,10 +29,10 @@ storage-interface = { path = "../../../storage/storage-interface" } bcs = "0.1.2" claim = "0.5.0" -diem-crypto = { path = "../../../crates/diem-crypto" } -diem-temppath = { path = "../../../crates/diem-temppath" } -diem-vm = { path = "../../../diem-move/diem-vm" } -diemdb = { path = "../../../storage/diemdb" } +aptos-crypto = { path = "../../../crates/aptos-crypto" } +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/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } -vm-genesis = { path = "../../../diem-move/vm-genesis", features = ["fuzzing"] } +vm-genesis = { path = "../../../aptos-move/vm-genesis", features = ["fuzzing"] } diff --git a/state-sync/inter-component/event-notifications/src/lib.rs b/state-sync/inter-component/event-notifications/src/lib.rs index 4b48fddce3d4c..49c7bc2378940 100644 --- a/state-sync/inter-component/event-notifications/src/lib.rs +++ b/state-sync/inter-component/event-notifications/src/lib.rs @@ -3,10 +3,9 @@ #![forbid(unsafe_code)] -use channel::{diem_channel, message_queues::QueueStyle}; -use diem_id_generator::{IdGenerator, U64IdGenerator}; -use diem_infallible::RwLock; -use diem_types::{ +use aptos_id_generator::{IdGenerator, U64IdGenerator}; +use aptos_infallible::RwLock; +use aptos_types::{ account_state::AccountState, contract_event::ContractEvent, event::EventKey, @@ -15,6 +14,7 @@ use diem_types::{ on_chain_config::{config_address, ConfigID, OnChainConfigPayload}, transaction::Version, }; +use channel::{aptos_channel, message_queues::QueueStyle}; use futures::{channel::mpsc::SendError, stream::FusedStream, Stream}; use serde::{Deserialize, Serialize}; use std::{ @@ -117,7 +117,7 @@ impl EventSubscriptionService { } let (notification_sender, notification_receiver) = - diem_channel::new(QueueStyle::KLAST, EVENT_NOTIFICATION_CHANNEL_SIZE, None); + aptos_channel::new(QueueStyle::KLAST, EVENT_NOTIFICATION_CHANNEL_SIZE, None); // Create a new event subscription let subscription_id = self.get_new_subscription_id(); @@ -161,7 +161,7 @@ impl EventSubscriptionService { /// subscriber to ensure notifications are processed in a timely manner. pub fn subscribe_to_reconfigurations(&mut self) -> Result { let (notification_sender, notification_receiver) = - diem_channel::new(QueueStyle::KLAST, RECONFIG_NOTIFICATION_CHANNEL_SIZE, None); + aptos_channel::new(QueueStyle::KLAST, RECONFIG_NOTIFICATION_CHANNEL_SIZE, None); // Create a new reconfiguration subscription let subscription_id = self.get_new_subscription_id(); @@ -357,7 +357,7 @@ type SubscriptionId = u64; struct EventSubscription { pub subscription_id: SubscriptionId, pub event_buffer: Vec, - pub notification_sender: channel::diem_channel::Sender<(), EventNotification>, + pub notification_sender: channel::aptos_channel::Sender<(), EventNotification>, } impl EventSubscription { @@ -382,7 +382,7 @@ impl EventSubscription { #[derive(Debug)] struct ReconfigSubscription { pub subscription_id: SubscriptionId, - pub notification_sender: channel::diem_channel::Sender<(), ReconfigNotification>, + pub notification_sender: channel::aptos_channel::Sender<(), ReconfigNotification>, } impl ReconfigSubscription { @@ -425,7 +425,7 @@ pub type ReconfigNotificationListener = NotificationListener { - pub notification_receiver: channel::diem_channel::Receiver<(), T>, + pub notification_receiver: channel::aptos_channel::Receiver<(), T>, } impl Stream for NotificationListener { diff --git a/state-sync/inter-component/event-notifications/src/tests.rs b/state-sync/inter-component/event-notifications/src/tests.rs index d9926699656c9..dc6b7f6422465 100644 --- a/state-sync/inter-component/event-notifications/src/tests.rs +++ b/state-sync/inter-component/event-notifications/src/tests.rs @@ -7,9 +7,8 @@ use crate::{ Error, EventNotificationListener, EventNotificationSender, EventSubscriptionService, ReconfigNotificationListener, }; -use claim::{assert_lt, assert_matches, assert_ok}; -use diem_infallible::RwLock; -use diem_types::{ +use aptos_infallible::RwLock; +use aptos_types::{ account_address::AccountAddress, contract_event::ContractEvent, event::EventKey, @@ -17,8 +16,9 @@ use diem_types::{ on_chain_config::{OnChainConfig, ON_CHAIN_CONFIG_REGISTRY}, transaction::{Transaction, Version, WriteSetPayload}, }; -use diem_vm::DiemVM; -use diemdb::DiemDB; +use aptos_vm::DiemVM; +use aptosdb::DiemDB; +use claim::{assert_lt, assert_matches, assert_ok}; use executor_test_helpers::bootstrap_genesis; use futures::{FutureExt, StreamExt}; use move_core_types::language_storage::TypeTag; @@ -546,7 +546,7 @@ fn create_database() -> Arc> { let (genesis, _) = vm_genesis::test_genesis_change_set_and_validators(Some(1)); // Create test diem database - let db_path = diem_temppath::TempPath::new(); + let db_path = aptos_temppath::TempPath::new(); assert_ok!(db_path.create_as_dir()); let (_, db_rw) = DbReaderWriter::wrap(DiemDB::new_for_test(db_path.path())); diff --git a/state-sync/inter-component/mempool-notifications/Cargo.toml b/state-sync/inter-component/mempool-notifications/Cargo.toml index 8e4e6848283aa..2e6e47865932e 100644 --- a/state-sync/inter-component/mempool-notifications/Cargo.toml +++ b/state-sync/inter-component/mempool-notifications/Cargo.toml @@ -16,10 +16,10 @@ serde = { version = "1.0.124", default-features = false } thiserror = "1.0.24" tokio = { version = "1.8.1" } -diem-types = { path = "../../../types" } -diem-workspace-hack = { version = "0.1", path = "../../../crates/diem-workspace-hack" } +aptos-types = { path = "../../../types" } +aptos-workspace-hack = { version = "0.1", path = "../../../crates/aptos-workspace-hack" } [dev-dependencies] claim = "0.5.0" -diem-crypto = { path = "../../../crates/diem-crypto" } +aptos-crypto = { path = "../../../crates/aptos-crypto" } diff --git a/state-sync/inter-component/mempool-notifications/src/lib.rs b/state-sync/inter-component/mempool-notifications/src/lib.rs index b1cfb481cc551..7227869ca281a 100644 --- a/state-sync/inter-component/mempool-notifications/src/lib.rs +++ b/state-sync/inter-component/mempool-notifications/src/lib.rs @@ -3,8 +3,8 @@ #![forbid(unsafe_code)] +use aptos_types::{account_address::AccountAddress, transaction::Transaction}; use async_trait::async_trait; -use diem_types::{account_address::AccountAddress, transaction::Transaction}; use futures::{ channel::{mpsc, oneshot}, stream::FusedStream, @@ -216,9 +216,8 @@ enum MempoolNotificationResponse { #[cfg(test)] mod tests { use crate::{CommittedTransaction, Error, MempoolNotificationSender}; - use claim::{assert_matches, assert_ok}; - use diem_crypto::{ed25519::Ed25519PrivateKey, HashValue, PrivateKey, SigningKey, Uniform}; - use diem_types::{ + use aptos_crypto::{ed25519::Ed25519PrivateKey, HashValue, PrivateKey, SigningKey, Uniform}; + use aptos_types::{ account_address::AccountAddress, block_metadata::BlockMetadata, chain_id::ChainId, @@ -228,6 +227,7 @@ mod tests { }, write_set::WriteSetMut, }; + use claim::{assert_matches, assert_ok}; use futures::{executor::block_on, FutureExt, StreamExt}; use tokio::runtime::{Builder, Runtime}; diff --git a/state-sync/state-sync-v1/Cargo.toml b/state-sync/state-sync-v1/Cargo.toml index d79e727f36a1c..25dffd862cfe0 100644 --- a/state-sync/state-sync-v1/Cargo.toml +++ b/state-sync/state-sync-v1/Cargo.toml @@ -25,18 +25,18 @@ tokio-stream = "0.1.4" consensus-notifications = { path = "../inter-component/consensus-notifications" } channel = { path = "../../crates/channel" } -diem-config = { path = "../../config" } -diem-crypto = { path = "../../crates/diem-crypto" } -diem-infallible = { path = "../../crates/diem-infallible" } -diem-logger = { path = "../../crates/diem-logger" } -diem-mempool = { path = "../../mempool"} -diem-metrics = { path = "../../crates/diem-metrics" } -diem-proptest-helpers = { path = "../../crates/diem-proptest-helpers", optional = true } -diem-temppath = { path = "../../crates/diem-temppath" } -diem-types = { path = "../../types" } -diem-vm = { path = "../../diem-move/diem-vm" } -diem-workspace-hack = { version = "0.1", path = "../../crates/diem-workspace-hack" } -diemdb = { path = "../../storage/diemdb", optional = true } +aptos-config = { path = "../../config" } +aptos-crypto = { path = "../../crates/aptos-crypto" } +aptos-infallible = { path = "../../crates/aptos-infallible" } +aptos-logger = { path = "../../crates/aptos-logger" } +aptos-mempool = { path = "../../mempool"} +aptos-metrics = { path = "../../crates/aptos-metrics" } +aptos-proptest-helpers = { path = "../../crates/aptos-proptest-helpers", optional = true } +aptos-temppath = { path = "../../crates/aptos-temppath" } +aptos-types = { path = "../../types" } +aptos-vm = { path = "../../aptos-move/aptos-vm" } +aptos-workspace-hack = { version = "0.1", path = "../../crates/aptos-workspace-hack" } +aptosdb = { path = "../../storage/aptosdb", optional = true } event-notifications = { path = "../../state-sync/inter-component/event-notifications" } executor = { path = "../../execution/executor" } executor-test-helpers = { path = "../../execution/executor-test-helpers", optional = true } @@ -47,7 +47,7 @@ netcore = { path = "../../network/netcore" } network = { path = "../../network" } short-hex-str = { path = "../../crates/short-hex-str" } storage-interface = { path = "../../storage/storage-interface" } -vm-genesis = { path = "../../diem-move/vm-genesis", optional = true } +vm-genesis = { path = "../../aptos-move/vm-genesis", optional = true } [dev-dependencies] bytes = "1.0.1" @@ -55,23 +55,23 @@ claim = "0.5.0" proptest = "1.0.0" channel = { path = "../../crates/channel" } -diem-framework-releases= { path = "../../diem-move/diem-framework/DPN/releases" } -diem-crypto = { path = "../../crates/diem-crypto" } -diem-genesis-tool = {path = "../../config/management/genesis", features = ["testing"] } -diem-mempool = { path = "../../mempool", features = ["fuzzing"] } -diem-proptest-helpers = { path = "../../crates/diem-proptest-helpers" } -diemdb = { path = "../../storage/diemdb" } +diem-framework-releases= { path = "../../aptos-move/diem-framework/DPN/releases" } +aptos-crypto = { path = "../../crates/aptos-crypto" } +aptos-genesis-tool = {path = "../../config/management/genesis", features = ["testing"] } +aptos-mempool = { path = "../../mempool", features = ["fuzzing"] } +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/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } network = { path = "../../network", features = ["fuzzing", "testing"] } network-builder = { path = "../../network/builder" } storage-service = { path = "../../storage/storage-service" } -diem-transaction-builder = { path = "../../sdk/transaction-builder" } -diem-time-service = { path = "../../crates/diem-time-service", features = ["testing"] } -vm-genesis = { path = "../../diem-move/vm-genesis", features = ["fuzzing"] } +aptos-transaction-builder = { path = "../../sdk/transaction-builder" } +aptos-time-service = { path = "../../crates/aptos-time-service", features = ["testing"] } +vm-genesis = { path = "../../aptos-move/vm-genesis", features = ["fuzzing"] } [features] default = [] failpoints = ["fail/failpoints"] -fuzzing = ["vm-genesis", "proptest", "executor-test-helpers", "diem-config/fuzzing", "diem-mempool/fuzzing", "diem-types/fuzzing", "diem-proptest-helpers", "memsocket/fuzzing"] +fuzzing = ["vm-genesis", "proptest", "executor-test-helpers", "aptos-config/fuzzing", "aptos-mempool/fuzzing", "aptos-types/fuzzing", "aptos-proptest-helpers", "memsocket/fuzzing"] diff --git a/state-sync/state-sync-v1/src/bootstrapper.rs b/state-sync/state-sync-v1/src/bootstrapper.rs index c1dfb41f6312b..896641c74ab7a 100644 --- a/state-sync/state-sync-v1/src/bootstrapper.rs +++ b/state-sync/state-sync-v1/src/bootstrapper.rs @@ -6,9 +6,9 @@ use crate::{ executor_proxy::{ExecutorProxy, ExecutorProxyTrait}, network::{StateSyncEvents, StateSyncSender}, }; +use aptos_config::{config::NodeConfig, network_id::NetworkId}; +use aptos_types::waypoint::Waypoint; use consensus_notifications::ConsensusNotificationListener; -use diem_config::{config::NodeConfig, network_id::NetworkId}; -use diem_types::waypoint::Waypoint; use event_notifications::EventSubscriptionService; use executor_types::ChunkExecutorTrait; use futures::channel::mpsc; diff --git a/state-sync/state-sync-v1/src/chunk_request.rs b/state-sync/state-sync-v1/src/chunk_request.rs index bebe32ef187b4..17aa189150801 100644 --- a/state-sync/state-sync-v1/src/chunk_request.rs +++ b/state-sync/state-sync-v1/src/chunk_request.rs @@ -1,7 +1,7 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_types::{ledger_info::LedgerInfoWithSignatures, transaction::Version}; +use aptos_types::{ledger_info::LedgerInfoWithSignatures, transaction::Version}; use serde::{Deserialize, Serialize}; use std::fmt; diff --git a/state-sync/state-sync-v1/src/chunk_response.rs b/state-sync/state-sync-v1/src/chunk_response.rs index 0e53605a1c4fc..7c47efe7a39e9 100644 --- a/state-sync/state-sync-v1/src/chunk_response.rs +++ b/state-sync/state-sync-v1/src/chunk_response.rs @@ -1,7 +1,7 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_types::{ +use aptos_types::{ ledger_info::LedgerInfoWithSignatures, transaction::{TransactionListWithProof, Version}, }; diff --git a/state-sync/state-sync-v1/src/coordinator.rs b/state-sync/state-sync-v1/src/coordinator.rs index b3ef36cd3795f..54b8843b726c2 100644 --- a/state-sync/state-sync-v1/src/coordinator.rs +++ b/state-sync/state-sync-v1/src/coordinator.rs @@ -13,22 +13,22 @@ use crate::{ request_manager::RequestManager, shared_components::SyncState, }; -use consensus_notifications::{ - ConsensusCommitNotification, ConsensusNotification, ConsensusNotificationListener, - ConsensusSyncNotification, -}; -use diem_config::{ +use aptos_config::{ config::{NodeConfig, RoleType, StateSyncConfig}, network_id::{NetworkId, PeerNetworkId}, }; -use diem_logger::prelude::*; -use diem_types::{ +use aptos_logger::prelude::*; +use aptos_types::{ contract_event::ContractEvent, ledger_info::LedgerInfoWithSignatures, transaction::{Transaction, TransactionListWithProof, Version}, waypoint::Waypoint, PeerId, }; +use consensus_notifications::{ + ConsensusCommitNotification, ConsensusNotification, ConsensusNotificationListener, + ConsensusSyncNotification, +}; use fail::fail_point; use futures::{ channel::{mpsc, oneshot}, @@ -636,7 +636,7 @@ impl StateSyncCoordinator ExecutorProxyTrait for ExecutorProxy { #[cfg(test)] mod tests { use super::*; - use claim::{assert_err, assert_ok}; - use diem_crypto::{ed25519::*, PrivateKey, Uniform}; - use diem_infallible::RwLock; - use diem_transaction_builder::stdlib::{ + use aptos_crypto::{ed25519::*, PrivateKey, Uniform}; + use aptos_infallible::RwLock; + use aptos_transaction_builder::stdlib::{ encode_peer_to_peer_with_metadata_script, encode_set_validator_config_and_reconfigure_script, encode_update_diem_consensus_config_script_function, encode_update_diem_version_script, }; - use diem_types::{ + use aptos_types::{ account_address::AccountAddress, - account_config::{diem_root_address, xus_tag}, + account_config::{aptos_root_address, xus_tag}, block_metadata::BlockMetadata, contract_event::ContractEvent, event::EventKey, @@ -237,8 +236,9 @@ mod tests { }, transaction::{Transaction, TransactionPayload, WriteSetPayload}, }; - use diem_vm::DiemVM; - use diemdb::DiemDB; + use aptos_vm::DiemVM; + use aptosdb::DiemDB; + use claim::{assert_err, assert_ok}; use event_notifications::{EventSubscriptionService, ReconfigNotificationListener}; use executor::{block_executor::BlockExecutor, chunk_executor::ChunkExecutor}; use executor_test_helpers::{ @@ -364,7 +364,7 @@ mod tests { let (genesis, _validators) = vm_genesis::test_genesis_change_set_and_validators(Some(1)); // Create test diem database - let db_path = diem_temppath::TempPath::new(); + let db_path = aptos_temppath::TempPath::new(); assert_ok!(db_path.create_as_dir()); let (db, db_rw) = DbReaderWriter::wrap(DiemDB::new_for_test(db_path.path())); @@ -557,7 +557,7 @@ mod tests { #[test] fn test_missing_on_chain_config() { // Create a test diem database - let db_path = diem_temppath::TempPath::new(); + let db_path = aptos_temppath::TempPath::new(); db_path.create_as_dir().unwrap(); let (db, db_rw) = DbReaderWriter::wrap(DiemDB::new_for_test(db_path.path())); @@ -635,7 +635,7 @@ mod tests { let (genesis, validators) = vm_genesis::test_genesis_change_set_and_validators(Some(1)); // Create test diem database - let db_path = diem_temppath::TempPath::new(); + let db_path = aptos_temppath::TempPath::new(); assert_ok!(db_path.create_as_dir()); let (db, db_rw) = DbReaderWriter::wrap(DiemDB::new_for_test(db_path.path())); @@ -720,7 +720,7 @@ mod tests { fn create_new_update_diem_version_transaction(sequence_number: u64) -> Transaction { let genesis_key = vm_genesis::GENESIS_KEYPAIR.0.clone(); get_test_signed_transaction( - diem_root_address(), + aptos_root_address(), sequence_number, genesis_key.clone(), genesis_key.public_key(), @@ -735,7 +735,7 @@ mod tests { fn create_new_update_consensus_config_transaction(sequence_number: u64) -> Transaction { let genesis_key = vm_genesis::GENESIS_KEYPAIR.0.clone(); get_test_signed_transaction( - diem_root_address(), + aptos_root_address(), sequence_number, genesis_key.clone(), genesis_key.public_key(), @@ -756,7 +756,7 @@ mod tests { ) -> Transaction { let genesis_key = vm_genesis::GENESIS_KEYPAIR.0.clone(); get_test_signed_transaction( - diem_root_address(), + aptos_root_address(), sequence_number, genesis_key.clone(), genesis_key.public_key(), diff --git a/state-sync/state-sync-v1/src/fuzzing.rs b/state-sync/state-sync-v1/src/fuzzing.rs index e319ebb84846f..cf0672ed8a16d 100644 --- a/state-sync/state-sync-v1/src/fuzzing.rs +++ b/state-sync/state-sync-v1/src/fuzzing.rs @@ -9,12 +9,12 @@ use crate::{ network::StateSyncMessage, shared_components::test_utils, }; -use diem_config::network_id::NetworkId; -use diem_infallible::Mutex; -use diem_types::{ +use aptos_config::network_id::NetworkId; +use aptos_infallible::Mutex; +use aptos_types::{ ledger_info::LedgerInfoWithSignatures, transaction::TransactionListWithProof, PeerId, }; -use diem_vm::DiemVM; +use aptos_vm::DiemVM; use executor::chunk_executor::ChunkExecutor; use futures::executor::block_on; use mempool_notifications::MempoolNotifier; diff --git a/state-sync/state-sync-v1/src/logging.rs b/state-sync/state-sync-v1/src/logging.rs index dfdd2736aae5f..d1dc2a40c254c 100644 --- a/state-sync/state-sync-v1/src/logging.rs +++ b/state-sync/state-sync-v1/src/logging.rs @@ -5,9 +5,9 @@ use crate::{ chunk_request::GetChunkRequest, chunk_response::GetChunkResponse, error::Error, request_manager::ChunkRequestInfo, }; -use diem_config::network_id::{NetworkId, PeerNetworkId}; -use diem_logger::Schema; -use diem_types::{ +use aptos_config::network_id::{NetworkId, PeerNetworkId}; +use aptos_logger::Schema; +use aptos_types::{ contract_event::ContractEvent, ledger_info::LedgerInfoWithSignatures, waypoint::Waypoint, }; use serde::Serialize; diff --git a/state-sync/state-sync-v1/src/network.rs b/state-sync/state-sync-v1/src/network.rs index a6ac5ffad52da..62444b8fb8841 100644 --- a/state-sync/state-sync-v1/src/network.rs +++ b/state-sync/state-sync-v1/src/network.rs @@ -4,9 +4,9 @@ //! Interface between State Sync and Network layers. use crate::{chunk_request::GetChunkRequest, chunk_response::GetChunkResponse, counters}; +use aptos_types::PeerId; use async_trait::async_trait; -use channel::{diem_channel, message_queues::QueueStyle}; -use diem_types::PeerId; +use channel::{aptos_channel, message_queues::QueueStyle}; use network::{ error::NetworkError, peer_manager::{ConnectionRequestSender, PeerManagerRequestSender}, @@ -81,7 +81,7 @@ impl ApplicationNetworkSender for StateSyncSender { pub fn network_endpoint_config() -> AppConfig { AppConfig::p2p( [ProtocolId::StateSyncDirectSend], - diem_channel::Config::new(STATE_SYNC_MAX_BUFFER_SIZE) + aptos_channel::Config::new(STATE_SYNC_MAX_BUFFER_SIZE) .queue_style(QueueStyle::LIFO) .counters(&counters::PENDING_STATE_SYNC_NETWORK_EVENTS), ) diff --git a/state-sync/state-sync-v1/src/request_manager.rs b/state-sync/state-sync-v1/src/request_manager.rs index a614615f460f0..57df6252eac12 100644 --- a/state-sync/state-sync-v1/src/request_manager.rs +++ b/state-sync/state-sync-v1/src/request_manager.rs @@ -8,11 +8,11 @@ use crate::{ logging::{LogEntry, LogEvent, LogSchema}, network::{StateSyncMessage, StateSyncSender}, }; -use diem_config::{ +use aptos_config::{ config::PeerRole, network_id::{NetworkId, PeerNetworkId}, }; -use diem_logger::prelude::*; +use aptos_logger::prelude::*; use itertools::Itertools; use netcore::transport::ConnectionOrigin; use network::{protocols::network::ApplicationNetworkSender, transport::ConnectionMetadata}; diff --git a/state-sync/state-sync-v1/src/shared_components.rs b/state-sync/state-sync-v1/src/shared_components.rs index 94266622fc942..9b7f6e484122c 100644 --- a/state-sync/state-sync-v1/src/shared_components.rs +++ b/state-sync/state-sync-v1/src/shared_components.rs @@ -1,7 +1,7 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_types::{ +use aptos_types::{ epoch_change::Verifier, epoch_state::EpochState, ledger_info::LedgerInfoWithSignatures, }; use executor_types::ExecutedTrees; @@ -82,20 +82,20 @@ pub(crate) mod test_utils { use futures::channel::mpsc; - use channel::{diem_channel, message_queues::QueueStyle}; - use diem_config::{ + use aptos_config::{ config::{NodeConfig, RoleType}, network_id::NetworkId, }; - use diem_infallible::RwLock; - use diem_types::{ + use aptos_infallible::RwLock; + use aptos_types::{ move_resource::MoveStorage, on_chain_config::ON_CHAIN_CONFIG_REGISTRY, transaction::{Transaction, WriteSetPayload}, waypoint::Waypoint, }; - use diem_vm::DiemVM; - use diemdb::DiemDB; + use aptos_vm::DiemVM; + use aptosdb::DiemDB; + use channel::{aptos_channel, message_queues::QueueStyle}; use event_notifications::{EventNotificationSender, EventSubscriptionService}; use executor::chunk_executor::ChunkExecutor; use executor_test_helpers::bootstrap_genesis; @@ -155,7 +155,7 @@ pub(crate) mod test_utils { let (genesis, _) = vm_genesis::test_genesis_change_set_and_validators(Some(1)); // Create test diem database - let db_path = diem_temppath::TempPath::new(); + let db_path = aptos_temppath::TempPath::new(); db_path.create_as_dir().unwrap(); let (db, db_rw) = DbReaderWriter::wrap(DiemDB::new_for_test(db_path.path())); @@ -182,8 +182,8 @@ pub(crate) mod test_utils { let initial_state = executor_proxy.get_local_storage_state().unwrap(); // Setup network senders - let (network_reqs_tx, _network_reqs_rx) = diem_channel::new(QueueStyle::FIFO, 8, None); - let (connection_reqs_tx, _) = diem_channel::new(QueueStyle::FIFO, 8, None); + let (network_reqs_tx, _network_reqs_rx) = aptos_channel::new(QueueStyle::FIFO, 8, None); + let (connection_reqs_tx, _) = aptos_channel::new(QueueStyle::FIFO, 8, None); let network_sender = StateSyncSender::new( PeerManagerRequestSender::new(network_reqs_tx), ConnectionRequestSender::new(connection_reqs_tx), diff --git a/state-sync/state-sync-v1/tests/integration_tests.rs b/state-sync/state-sync-v1/tests/integration_tests.rs index a408a29a35c28..f93cbcaaa4924 100644 --- a/state-sync/state-sync-v1/tests/integration_tests.rs +++ b/state-sync/state-sync-v1/tests/integration_tests.rs @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 use crate::test_harness::default_handler; -use diem_config::{config::RoleType, network_id::NetworkId}; -use diem_types::{transaction::TransactionListWithProof, waypoint::Waypoint, PeerId}; +use aptos_config::{config::RoleType, network_id::NetworkId}; +use aptos_types::{transaction::TransactionListWithProof, waypoint::Waypoint, PeerId}; use netcore::transport::ConnectionOrigin::*; use network::protocols::direct_send::Message; use state_sync_v1::{error::Error, network::StateSyncMessage}; diff --git a/state-sync/state-sync-v1/tests/test_harness.rs b/state-sync/state-sync-v1/tests/test_harness.rs index 7c140c11d8084..100f10543e6fb 100644 --- a/state-sync/state-sync-v1/tests/test_harness.rs +++ b/state-sync/state-sync-v1/tests/test_harness.rs @@ -1,21 +1,18 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use channel::{diem_channel, message_queues::QueueStyle}; -use claim::assert_ok; -use consensus_notifications::{ConsensusNotificationSender, ConsensusNotifier}; -use diem_config::{ +use aptos_config::{ config::{NodeConfig, Peer, PeerRole, RoleType, HANDSHAKE_VERSION}, network_id::{NetworkContext, NetworkId}, }; -use diem_crypto::{ +use aptos_crypto::{ hash::ACCUMULATOR_PLACEHOLDER_HASH, test_utils::TEST_SEED, x25519, HashValue, Uniform, }; -use diem_infallible::RwLock; -use diem_mempool::mocks::MockSharedMempool; -use diem_time_service::TimeService; -use diem_transaction_builder::stdlib::encode_peer_to_peer_with_metadata_script; -use diem_types::{ +use aptos_infallible::RwLock; +use aptos_mempool::mocks::MockSharedMempool; +use aptos_time_service::TimeService; +use aptos_transaction_builder::stdlib::encode_peer_to_peer_with_metadata_script; +use aptos_types::{ account_address::AccountAddress, account_config::xus_tag, block_info::BlockInfo, @@ -38,6 +35,9 @@ use diem_types::{ waypoint::Waypoint, PeerId, }; +use channel::{aptos_channel, message_queues::QueueStyle}; +use claim::assert_ok; +use consensus_notifications::{ConsensusNotificationSender, ConsensusNotifier}; use executor_types::ExecutedTrees; use futures::{executor::block_on, future::FutureExt, StreamExt}; use memsocket::MemoryListener; @@ -190,9 +190,9 @@ impl StateSyncPeer { pub struct StateSyncEnvironment { network_conn_event_notifs_txs: HashMap, network_notifs_txs: - HashMap>, + HashMap>, network_reqs_rxs: - HashMap>, + HashMap>, peers: Vec>, runtime: Runtime, } @@ -203,7 +203,7 @@ impl StateSyncEnvironment { } pub fn new(num_peers: usize) -> Self { - ::diem_logger::Logger::init_for_testing(); + ::aptos_logger::Logger::init_for_testing(); let (signers, public_keys, network_keys, network_addrs) = initial_setup(num_peers); @@ -353,10 +353,10 @@ impl StateSyncEnvironment { // mock the StateSyncEvents and StateSyncSender to allow manually controlling // msg delivery in test let (network_reqs_tx, network_reqs_rx) = - diem_channel::new(QueueStyle::LIFO, 1, None); - let (connection_reqs_tx, _) = diem_channel::new(QueueStyle::LIFO, 1, None); + aptos_channel::new(QueueStyle::LIFO, 1, None); + let (connection_reqs_tx, _) = aptos_channel::new(QueueStyle::LIFO, 1, None); let (network_notifs_tx, network_notifs_rx) = - diem_channel::new(QueueStyle::LIFO, 1, None); + aptos_channel::new(QueueStyle::LIFO, 1, None); let (conn_status_tx, conn_status_rx) = conn_notifs_channel::new(); let network_sender = StateSyncSender::new( PeerManagerRequestSender::new(network_reqs_tx), @@ -553,7 +553,7 @@ fn setup_state_sync_config( timeout_ms: u64, multicast_timeout_ms: u64, ) -> (NodeConfig, NetworkId) { - let mut config = diem_config::config::NodeConfig::default_for_validator(); + let mut config = aptos_config::config::NodeConfig::default_for_validator(); config.base.role = role; config.state_sync.sync_request_timeout_ms = timeout_ms; config.state_sync.multicast_timeout_ms = multicast_timeout_ms; diff --git a/state-sync/state-sync-v2/data-streaming-service/Cargo.toml b/state-sync/state-sync-v2/data-streaming-service/Cargo.toml index c097f234f488b..a2385d63b6756 100644 --- a/state-sync/state-sync-v2/data-streaming-service/Cargo.toml +++ b/state-sync/state-sync-v2/data-streaming-service/Cargo.toml @@ -20,15 +20,15 @@ tokio = { version = "1.8.1", features = ["full"] } tokio-stream = "0.1.4" channel = { path = "../../../crates/channel" } -diem-config = { path = "../../../config" } -diem-crypto = { path = "../../../crates/diem-crypto" } -diem-data-client = { path = "../../diem-data-client" } -diem-id-generator = { path = "../../../crates/diem-id-generator" } -diem-infallible = { path = "../../../crates/diem-infallible" } -diem-logger = { path = "../../../crates/diem-logger" } -diem-metrics = { path = "../../../crates/diem-metrics" } -diem-types = { path = "../../../types" } -diem-workspace-hack = { version = "0.1", path = "../../../crates/diem-workspace-hack" } +aptos-config = { path = "../../../config" } +aptos-crypto = { path = "../../../crates/aptos-crypto" } +aptos-data-client = { path = "../../aptos-data-client" } +aptos-id-generator = { path = "../../../crates/aptos-id-generator" } +aptos-infallible = { path = "../../../crates/aptos-infallible" } +aptos-logger = { path = "../../../crates/aptos-logger" } +aptos-metrics = { path = "../../../crates/aptos-metrics" } +aptos-types = { path = "../../../types" } +aptos-workspace-hack = { version = "0.1", path = "../../../crates/aptos-workspace-hack" } network = { path = "../../../network" } short-hex-str = { path = "../../../crates/short-hex-str" } @@ -37,5 +37,5 @@ claim = "0.5.0" rand = "0.8.3" tokio = { version = "1.8.1", features = ["full"] } -diem-types = { path = "../../../types" } +aptos-types = { path = "../../../types" } storage-service-types = { path = "../../storage-service/types" } diff --git a/state-sync/state-sync-v2/data-streaming-service/src/data_notification.rs b/state-sync/state-sync-v2/data-streaming-service/src/data_notification.rs index ff1f86809b6d5..cda95f8f2a1e6 100644 --- a/state-sync/state-sync-v2/data-streaming-service/src/data_notification.rs +++ b/state-sync/state-sync-v2/data-streaming-service/src/data_notification.rs @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 use crate::streaming_client::Epoch; -use diem_data_client::{Response, ResponsePayload}; -use diem_types::{ +use aptos_data_client::{Response, ResponsePayload}; +use aptos_types::{ account_state_blob::AccountStatesChunkWithProof, ledger_info::LedgerInfoWithSignatures, transaction::{TransactionListWithProof, TransactionOutputListWithProof, Version}, @@ -98,7 +98,7 @@ pub struct TransactionOutputsWithProofRequest { /// network and will be available in `client_response` when received. pub struct PendingClientResponse { pub client_request: DataClientRequest, - pub client_response: Option, diem_data_client::Error>>, + pub client_response: Option, aptos_data_client::Error>>, } impl Debug for PendingClientResponse { diff --git a/state-sync/state-sync-v2/data-streaming-service/src/data_stream.rs b/state-sync/state-sync-v2/data-streaming-service/src/data_stream.rs index 9a8d6c87178a8..7cc55f51942ba 100644 --- a/state-sync/state-sync-v2/data-streaming-service/src/data_stream.rs +++ b/state-sync/state-sync-v2/data-streaming-service/src/data_stream.rs @@ -15,15 +15,15 @@ use crate::{ stream_engine::{DataStreamEngine, StreamEngine}, streaming_client::{NotificationFeedback, StreamRequest}, }; -use channel::{diem_channel, message_queues::QueueStyle}; -use diem_config::config::DataStreamingServiceConfig; -use diem_data_client::{ +use aptos_config::config::DataStreamingServiceConfig; +use aptos_data_client::{ AdvertisedData, DiemDataClient, GlobalDataSummary, Response, ResponseContext, ResponseError, ResponsePayload, }; -use diem_id_generator::{IdGenerator, U64IdGenerator}; -use diem_infallible::Mutex; -use diem_logger::prelude::*; +use aptos_id_generator::{IdGenerator, U64IdGenerator}; +use aptos_infallible::Mutex; +use aptos_logger::prelude::*; +use channel::{aptos_channel, message_queues::QueueStyle}; use futures::{stream::FusedStream, Stream}; use std::{ collections::{BTreeMap, VecDeque}, @@ -56,7 +56,7 @@ pub struct DataStream { data_stream_id: DataStreamId, // The data client through which to fetch data from the Diem network - diem_data_client: T, + aptos_data_client: T, // The engine for this data stream stream_engine: StreamEngine, @@ -74,7 +74,7 @@ pub struct DataStream { notifications_to_responses: BTreeMap, // The channel on which to send data notifications when they are ready. - notification_sender: channel::diem_channel::Sender<(), DataNotification>, + notification_sender: channel::aptos_channel::Sender<(), DataNotification>, // A unique notification ID generator notification_id_generator: Arc, @@ -93,12 +93,12 @@ impl DataStream { config: DataStreamingServiceConfig, data_stream_id: DataStreamId, stream_request: &StreamRequest, - diem_data_client: T, + aptos_data_client: T, notification_id_generator: Arc, advertised_data: &AdvertisedData, ) -> Result<(Self, DataStreamListener), Error> { // Create a new data stream listener - let (notification_sender, notification_receiver) = diem_channel::new( + let (notification_sender, notification_receiver) = aptos_channel::new( QueueStyle::KLAST, config.max_data_stream_channel_sizes as usize, None, @@ -112,7 +112,7 @@ impl DataStream { let data_stream = Self { config, data_stream_id, - diem_data_client, + aptos_data_client, stream_engine, sent_data_requests: None, spawned_tasks: vec![], @@ -245,7 +245,7 @@ impl DataStream { // Send the request to the network let join_handle = spawn_request_task( data_client_request, - self.diem_data_client.clone(), + self.aptos_data_client.clone(), pending_client_response.clone(), ); self.spawned_tasks.push(join_handle); @@ -365,7 +365,7 @@ impl DataStream { fn handle_data_client_error( &mut self, data_client_request: &DataClientRequest, - data_client_error: &diem_data_client::Error, + data_client_error: &aptos_data_client::Error, ) -> Result<(), Error> { error!(LogSchema::new(LogEntry::ReceivedDataResponse) .stream_id(self.data_stream_id) @@ -565,12 +565,12 @@ impl Drop for DataStream { /// Allows listening to data streams (i.e., streams of data notifications). #[derive(Debug)] pub struct DataStreamListener { - notification_receiver: channel::diem_channel::Receiver<(), DataNotification>, + notification_receiver: channel::aptos_channel::Receiver<(), DataNotification>, } impl DataStreamListener { pub fn new( - notification_receiver: channel::diem_channel::Receiver<(), DataNotification>, + notification_receiver: channel::aptos_channel::Receiver<(), DataNotification>, ) -> Self { Self { notification_receiver, @@ -650,7 +650,7 @@ fn extract_response_error(notification_feedback: &NotificationFeedback) -> Respo fn spawn_request_task( data_client_request: DataClientRequest, - diem_data_client: T, + aptos_data_client: T, pending_response: PendingClientResponse, ) -> JoinHandle<()> { // Update the requests sent counter @@ -670,19 +670,19 @@ fn spawn_request_task( // Fetch the client response let client_response = match data_client_request { DataClientRequest::AccountsWithProof(request) => { - get_account_states_with_proof(diem_data_client, request).await + get_account_states_with_proof(aptos_data_client, request).await } DataClientRequest::EpochEndingLedgerInfos(request) => { - get_epoch_ending_ledger_infos(diem_data_client, request).await + get_epoch_ending_ledger_infos(aptos_data_client, request).await } DataClientRequest::NumberOfAccounts(request) => { - get_number_of_account_states(diem_data_client, request).await + get_number_of_account_states(aptos_data_client, request).await } DataClientRequest::TransactionOutputsWithProof(request) => { - get_transaction_outputs_with_proof(diem_data_client, request).await + get_transaction_outputs_with_proof(aptos_data_client, request).await } DataClientRequest::TransactionsWithProof(request) => { - get_transactions_with_proof(diem_data_client, request).await + get_transactions_with_proof(aptos_data_client, request).await } }; @@ -705,10 +705,10 @@ fn spawn_request_task( } async fn get_account_states_with_proof( - diem_data_client: T, + aptos_data_client: T, request: AccountsWithProofRequest, -) -> Result, diem_data_client::Error> { - let client_response = diem_data_client.get_account_states_with_proof( +) -> Result, aptos_data_client::Error> { + let client_response = aptos_data_client.get_account_states_with_proof( request.version, request.start_index, request.end_index, @@ -719,31 +719,31 @@ async fn get_account_states_with_proof( - diem_data_client: T, + aptos_data_client: T, request: EpochEndingLedgerInfosRequest, -) -> Result, diem_data_client::Error> { +) -> Result, aptos_data_client::Error> { let client_response = - diem_data_client.get_epoch_ending_ledger_infos(request.start_epoch, request.end_epoch); + aptos_data_client.get_epoch_ending_ledger_infos(request.start_epoch, request.end_epoch); client_response .await .map(|response| response.map(ResponsePayload::from)) } async fn get_number_of_account_states( - diem_data_client: T, + aptos_data_client: T, request: NumberOfAccountsRequest, -) -> Result, diem_data_client::Error> { - let client_response = diem_data_client.get_number_of_account_states(request.version); +) -> Result, aptos_data_client::Error> { + let client_response = aptos_data_client.get_number_of_account_states(request.version); client_response .await .map(|response| response.map(ResponsePayload::from)) } async fn get_transaction_outputs_with_proof( - diem_data_client: T, + aptos_data_client: T, request: TransactionOutputsWithProofRequest, -) -> Result, diem_data_client::Error> { - let client_response = diem_data_client.get_transaction_outputs_with_proof( +) -> Result, aptos_data_client::Error> { + let client_response = aptos_data_client.get_transaction_outputs_with_proof( request.proof_version, request.start_version, request.end_version, @@ -754,10 +754,10 @@ async fn get_transaction_outputs_with_proof( - diem_data_client: T, + aptos_data_client: T, request: TransactionsWithProofRequest, -) -> Result, diem_data_client::Error> { - let client_response = diem_data_client.get_transactions_with_proof( +) -> Result, aptos_data_client::Error> { + let client_response = aptos_data_client.get_transactions_with_proof( request.proof_version, request.start_version, request.end_version, diff --git a/state-sync/state-sync-v2/data-streaming-service/src/error.rs b/state-sync/state-sync-v2/data-streaming-service/src/error.rs index 5a44d2b2223d9..4ae0edbcb5add 100644 --- a/state-sync/state-sync-v2/data-streaming-service/src/error.rs +++ b/state-sync/state-sync-v2/data-streaming-service/src/error.rs @@ -28,8 +28,8 @@ impl Error { pub fn get_label(&self) -> &'static str { match self { Self::DataIsUnavailable(_) => "data_is_unavailable", - Self::DiemDataClientError(_) => "diem_data_client_error", - Self::DiemDataClientResponseIsInvalid(_) => "diem_data_client_response_is_invalid", + Self::DiemDataClientError(_) => "aptos_data_client_error", + Self::DiemDataClientResponseIsInvalid(_) => "aptos_data_client_response_is_invalid", Self::IntegerOverflow(_) => "integer_overflow", Self::NoDataToFetch(_) => "no_data_to_fetch", Self::UnexpectedErrorEncountered(_) => "unexpected_error_encountered", @@ -38,8 +38,8 @@ impl Error { } } -impl From for Error { - fn from(error: diem_data_client::Error) -> Self { +impl From for Error { + fn from(error: aptos_data_client::Error) -> Self { Error::DiemDataClientError(error.to_string()) } } diff --git a/state-sync/state-sync-v2/data-streaming-service/src/logging.rs b/state-sync/state-sync-v2/data-streaming-service/src/logging.rs index acc96ada68e1e..fe6b5ac721a59 100644 --- a/state-sync/state-sync-v2/data-streaming-service/src/logging.rs +++ b/state-sync/state-sync-v2/data-streaming-service/src/logging.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 use crate::error::Error; -use diem_logger::Schema; +use aptos_logger::Schema; use serde::Serialize; #[derive(Schema)] diff --git a/state-sync/state-sync-v2/data-streaming-service/src/metrics.rs b/state-sync/state-sync-v2/data-streaming-service/src/metrics.rs index 7979344e46df5..413f1dc5cf25c 100644 --- a/state-sync/state-sync-v2/data-streaming-service/src/metrics.rs +++ b/state-sync/state-sync-v2/data-streaming-service/src/metrics.rs @@ -1,7 +1,7 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_metrics::{ +use aptos_metrics::{ register_histogram_vec, register_int_counter_vec, HistogramTimer, HistogramVec, IntCounterVec, }; use once_cell::sync::Lazy; @@ -9,7 +9,7 @@ use once_cell::sync::Lazy; /// Counter for the creation of new data streams pub static CREATE_DATA_STREAM: Lazy = Lazy::new(|| { register_int_counter_vec!( - "diem_data_streaming_service_create_data_stream", + "aptos_data_streaming_service_create_data_stream", "Counters related to the creation of new data streams", &["request_type"] ) @@ -19,7 +19,7 @@ pub static CREATE_DATA_STREAM: Lazy = Lazy::new(|| { /// Counter for the termination of existing data streams pub static TERMINATE_DATA_STREAM: Lazy = Lazy::new(|| { register_int_counter_vec!( - "diem_data_streaming_service_terminate_data_stream", + "aptos_data_streaming_service_terminate_data_stream", "Counters related to the termination of existing data streams", &["feedback_type"] ) @@ -29,7 +29,7 @@ pub static TERMINATE_DATA_STREAM: Lazy = Lazy::new(|| { /// Counter for stream progress check errors pub static CHECK_STREAM_PROGRESS_ERROR: Lazy = Lazy::new(|| { register_int_counter_vec!( - "diem_data_streaming_service_check_progress_error", + "aptos_data_streaming_service_check_progress_error", "Counters related to stream progress check errors", &["error_type"] ) @@ -39,7 +39,7 @@ pub static CHECK_STREAM_PROGRESS_ERROR: Lazy = Lazy::new(|| { /// Counter for global data summary errors pub static GLOBAL_DATA_SUMMARY_ERROR: Lazy = Lazy::new(|| { register_int_counter_vec!( - "diem_data_streaming_service_global_summary_error", + "aptos_data_streaming_service_global_summary_error", "Counters related to global data summary errors", &["error_type"] ) @@ -49,7 +49,7 @@ pub static GLOBAL_DATA_SUMMARY_ERROR: Lazy = Lazy::new(|| { /// Counter for tracking sent data requests pub static SENT_DATA_REQUESTS: Lazy = Lazy::new(|| { register_int_counter_vec!( - "diem_data_streaming_service_sent_data_requests", + "aptos_data_streaming_service_sent_data_requests", "Counters related to sent data requests", &["request_type"] ) @@ -59,7 +59,7 @@ pub static SENT_DATA_REQUESTS: Lazy = Lazy::new(|| { /// Counter for tracking received data responses pub static RECEIVED_DATA_RESPONSE: Lazy = Lazy::new(|| { register_int_counter_vec!( - "diem_data_streaming_service_received_data_response", + "aptos_data_streaming_service_received_data_response", "Counters related to received data responses", &["response_type"] ) @@ -69,7 +69,7 @@ pub static RECEIVED_DATA_RESPONSE: Lazy = Lazy::new(|| { /// Counter for tracking received data responses pub static RECEIVED_RESPONSE_ERROR: Lazy = Lazy::new(|| { register_int_counter_vec!( - "diem_data_streaming_service_received_response_error", + "aptos_data_streaming_service_received_response_error", "Counters related to received response errors", &["error_type"] ) @@ -79,7 +79,7 @@ pub static RECEIVED_RESPONSE_ERROR: Lazy = Lazy::new(|| { /// Time it takes to process a data request pub static DATA_REQUEST_PROCESSING_LATENCY: Lazy = Lazy::new(|| { register_histogram_vec!( - "diem_data_streaming_service_data_request_processing_latency", + "aptos_data_streaming_service_data_request_processing_latency", "Counters related to data request processing latencies", &["request_type"] ) diff --git a/state-sync/state-sync-v2/data-streaming-service/src/stream_engine.rs b/state-sync/state-sync-v2/data-streaming-service/src/stream_engine.rs index ec7936f32f1bd..d5755685c4bc6 100644 --- a/state-sync/state-sync-v2/data-streaming-service/src/stream_engine.rs +++ b/state-sync/state-sync-v2/data-streaming-service/src/stream_engine.rs @@ -17,10 +17,10 @@ use crate::{ Epoch, GetAllAccountsRequest, GetAllEpochEndingLedgerInfosRequest, StreamRequest, }, }; -use diem_data_client::{AdvertisedData, GlobalDataSummary, ResponsePayload}; -use diem_id_generator::{IdGenerator, U64IdGenerator}; -use diem_logger::prelude::*; -use diem_types::{ledger_info::LedgerInfoWithSignatures, transaction::Version}; +use aptos_data_client::{AdvertisedData, GlobalDataSummary, ResponsePayload}; +use aptos_id_generator::{IdGenerator, U64IdGenerator}; +use aptos_logger::prelude::*; +use aptos_types::{ledger_info::LedgerInfoWithSignatures, transaction::Version}; use enum_dispatch::enum_dispatch; use std::{cmp, sync::Arc}; diff --git a/state-sync/state-sync-v2/data-streaming-service/src/streaming_client.rs b/state-sync/state-sync-v2/data-streaming-service/src/streaming_client.rs index abacec9e2cf9a..03cc51fb1c389 100644 --- a/state-sync/state-sync-v2/data-streaming-service/src/streaming_client.rs +++ b/state-sync/state-sync-v2/data-streaming-service/src/streaming_client.rs @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 use crate::{data_notification::NotificationId, data_stream::DataStreamListener, error::Error}; +use aptos_types::{ledger_info::LedgerInfoWithSignatures, transaction::Version}; use async_trait::async_trait; -use diem_types::{ledger_info::LedgerInfoWithSignatures, transaction::Version}; use futures::{ channel::{mpsc, oneshot}, stream::FusedStream, diff --git a/state-sync/state-sync-v2/data-streaming-service/src/streaming_service.rs b/state-sync/state-sync-v2/data-streaming-service/src/streaming_service.rs index beae93a3b6205..fb8db6a351f27 100644 --- a/state-sync/state-sync-v2/data-streaming-service/src/streaming_service.rs +++ b/state-sync/state-sync-v2/data-streaming-service/src/streaming_service.rs @@ -11,10 +11,10 @@ use crate::{ StreamRequest, StreamRequestMessage, StreamingServiceListener, TerminateStreamRequest, }, }; -use diem_config::config::DataStreamingServiceConfig; -use diem_data_client::{DiemDataClient, GlobalDataSummary, OptimalChunkSizes}; -use diem_id_generator::{IdGenerator, U64IdGenerator}; -use diem_logger::prelude::*; +use aptos_config::config::DataStreamingServiceConfig; +use aptos_data_client::{DiemDataClient, GlobalDataSummary, OptimalChunkSizes}; +use aptos_id_generator::{IdGenerator, U64IdGenerator}; +use aptos_logger::prelude::*; use futures::StreamExt; use std::{collections::HashMap, sync::Arc, time::Duration}; use tokio::time::interval; @@ -29,7 +29,7 @@ pub struct DataStreamingService { config: DataStreamingServiceConfig, // The data client through which to fetch data from the Diem network - diem_data_client: T, + aptos_data_client: T, // Cached global data summary global_data_summary: GlobalDataSummary, @@ -48,12 +48,12 @@ pub struct DataStreamingService { impl DataStreamingService { pub fn new( config: DataStreamingServiceConfig, - diem_data_client: T, + aptos_data_client: T, stream_requests: StreamingServiceListener, ) -> Self { Self { config, - diem_data_client, + aptos_data_client, global_data_summary: GlobalDataSummary::empty(), data_streams: HashMap::new(), stream_requests, @@ -177,7 +177,7 @@ impl DataStreamingService { self.config, stream_id, &request_message.stream_request, - self.diem_data_client.clone(), + self.aptos_data_client.clone(), self.notification_id_generator.clone(), &self.global_data_summary.advertised_data, )?; @@ -221,7 +221,7 @@ impl DataStreamingService { } fn fetch_global_data_summary(&mut self) -> Result<(), Error> { - let global_data_summary = self.diem_data_client.get_global_data_summary(); + let global_data_summary = self.aptos_data_client.get_global_data_summary(); verify_optimal_chunk_sizes(&global_data_summary.optimal_chunk_sizes)?; self.global_data_summary = global_data_summary; Ok(()) diff --git a/state-sync/state-sync-v2/data-streaming-service/src/tests/data_stream.rs b/state-sync/state-sync-v2/data-streaming-service/src/tests/data_stream.rs index 0522b58431afc..9414adb26c9fa 100644 --- a/state-sync/state-sync-v2/data-streaming-service/src/tests/data_stream.rs +++ b/state-sync/state-sync-v2/data-streaming-service/src/tests/data_stream.rs @@ -18,15 +18,15 @@ use crate::{ MIN_ADVERTISED_ACCOUNTS, MIN_ADVERTISED_EPOCH_END, MIN_ADVERTISED_TRANSACTION_OUTPUT, }, }; -use claim::{assert_err, assert_ge, assert_none, assert_ok}; -use diem_config::config::DataStreamingServiceConfig; -use diem_data_client::{ +use aptos_config::config::DataStreamingServiceConfig; +use aptos_data_client::{ AdvertisedData, GlobalDataSummary, OptimalChunkSizes, Response, ResponseContext, ResponsePayload, }; -use diem_id_generator::U64IdGenerator; -use diem_infallible::Mutex; -use diem_types::{ledger_info::LedgerInfoWithSignatures, transaction::Version}; +use aptos_id_generator::U64IdGenerator; +use aptos_infallible::Mutex; +use aptos_types::{ledger_info::LedgerInfoWithSignatures, transaction::Version}; +use claim::{assert_err, assert_ge, assert_none, assert_ok}; use futures::{FutureExt, StreamExt}; use std::{sync::Arc, time::Duration}; use storage_service_types::CompleteDataRange; @@ -188,7 +188,7 @@ async fn test_stream_data_error() { }); let pending_response = PendingClientResponse { client_request: client_request.clone(), - client_response: Some(Err(diem_data_client::Error::DataIsUnavailable( + client_response: Some(Err(aptos_data_client::Error::DataIsUnavailable( "Missing data!".into(), ))), }; @@ -376,7 +376,7 @@ fn create_data_stream( }; // Create a diem data client mock and notification generator - let diem_data_client = MockDiemDataClient::new(); + let aptos_data_client = MockDiemDataClient::new(); let notification_generator = Arc::new(U64IdGenerator::new()); // Return the data stream and listener pair @@ -384,7 +384,7 @@ fn create_data_stream( streaming_service_config, create_random_u64(10000), &stream_request, - diem_data_client, + aptos_data_client, notification_generator, &advertised_data, ) diff --git a/state-sync/state-sync-v2/data-streaming-service/src/tests/stream_engine.rs b/state-sync/state-sync-v2/data-streaming-service/src/tests/stream_engine.rs index 73300f9c27089..b9cb6010e77d8 100644 --- a/state-sync/state-sync-v2/data-streaming-service/src/tests/stream_engine.rs +++ b/state-sync/state-sync-v2/data-streaming-service/src/tests/stream_engine.rs @@ -8,9 +8,9 @@ use crate::{ streaming_client::{GetAllEpochEndingLedgerInfosRequest, StreamRequest}, tests::utils::initialize_logger, }; +use aptos_data_client::{GlobalDataSummary, OptimalChunkSizes, ResponsePayload}; +use aptos_id_generator::U64IdGenerator; use claim::{assert_matches, assert_ok}; -use diem_data_client::{GlobalDataSummary, OptimalChunkSizes, ResponsePayload}; -use diem_id_generator::U64IdGenerator; use std::{cmp, sync::Arc}; use storage_service_types::CompleteDataRange; diff --git a/state-sync/state-sync-v2/data-streaming-service/src/tests/streaming_client.rs b/state-sync/state-sync-v2/data-streaming-service/src/tests/streaming_client.rs index e297467b30d15..56701d1dd2824 100644 --- a/state-sync/state-sync-v2/data-streaming-service/src/tests/streaming_client.rs +++ b/state-sync/state-sync-v2/data-streaming-service/src/tests/streaming_client.rs @@ -14,7 +14,7 @@ use crate::{ }, tests::utils::{create_ledger_info, initialize_logger}, }; -use channel::{diem_channel, message_queues::QueueStyle}; +use channel::{aptos_channel, message_queues::QueueStyle}; use claim::assert_ok; use futures::{executor::block_on, FutureExt, StreamExt}; use std::thread::JoinHandle; @@ -281,11 +281,11 @@ fn spawn_service_and_respond_with_error( /// Creates and returns a new data stream sender and listener pair. fn new_data_stream_sender_listener() -> ( - channel::diem_channel::Sender<(), DataNotification>, + channel::aptos_channel::Sender<(), DataNotification>, DataStreamListener, ) { let (notification_sender, notification_receiver) = - diem_channel::new(QueueStyle::KLAST, 1, None); + aptos_channel::new(QueueStyle::KLAST, 1, None); let data_stream_listener = DataStreamListener::new(notification_receiver); (notification_sender, data_stream_listener) diff --git a/state-sync/state-sync-v2/data-streaming-service/src/tests/streaming_service.rs b/state-sync/state-sync-v2/data-streaming-service/src/tests/streaming_service.rs index 9167075828121..948ed1728be81 100644 --- a/state-sync/state-sync-v2/data-streaming-service/src/tests/streaming_service.rs +++ b/state-sync/state-sync-v2/data-streaming-service/src/tests/streaming_service.rs @@ -16,8 +16,8 @@ use crate::{ MIN_ADVERTISED_TRANSACTION, MIN_ADVERTISED_TRANSACTION_OUTPUT, TOTAL_NUM_ACCOUNTS, }, }; +use aptos_config::config::DataStreamingServiceConfig; use claim::{assert_le, assert_matches, assert_ok, assert_some}; -use diem_config::config::DataStreamingServiceConfig; macro_rules! unexpected_payload_type { ($received:expr) => { @@ -949,10 +949,10 @@ fn create_new_streaming_client_and_service() -> StreamingServiceClient { new_streaming_service_client_listener_pair(); // Create the streaming service and connect it to the listener - let diem_data_client = MockDiemDataClient::new(); + let aptos_data_client = MockDiemDataClient::new(); let streaming_service = DataStreamingService::new( DataStreamingServiceConfig::default(), - diem_data_client, + aptos_data_client, streaming_service_listener, ); tokio::spawn(streaming_service.start_service()); diff --git a/state-sync/state-sync-v2/data-streaming-service/src/tests/utils.rs b/state-sync/state-sync-v2/data-streaming-service/src/tests/utils.rs index 3fe19c1dd7341..8c689d721761f 100644 --- a/state-sync/state-sync-v2/data-streaming-service/src/tests/utils.rs +++ b/state-sync/state-sync-v2/data-streaming-service/src/tests/utils.rs @@ -2,14 +2,13 @@ // SPDX-License-Identifier: Apache-2.0 use crate::{data_notification::DataNotification, data_stream::DataStreamListener, error::Error}; -use async_trait::async_trait; -use diem_crypto::{ed25519::Ed25519PrivateKey, HashValue, PrivateKey, SigningKey, Uniform}; -use diem_data_client::{ +use aptos_crypto::{ed25519::Ed25519PrivateKey, HashValue, PrivateKey, SigningKey, Uniform}; +use aptos_data_client::{ AdvertisedData, DiemDataClient, GlobalDataSummary, OptimalChunkSizes, Response, ResponseCallback, ResponseContext, ResponseError, }; -use diem_logger::Level; -use diem_types::{ +use aptos_logger::Level; +use aptos_types::{ account_address::AccountAddress, account_state_blob::AccountStatesChunkWithProof, block_info::BlockInfo, @@ -24,6 +23,7 @@ use diem_types::{ }, write_set::WriteSet, }; +use async_trait::async_trait; use futures::StreamExt; use rand::{rngs::OsRng, Rng}; use std::{ @@ -121,7 +121,7 @@ impl DiemDataClient for MockDiemDataClient { _version: Version, start_index: u64, end_index: u64, - ) -> Result, diem_data_client::Error> { + ) -> Result, aptos_data_client::Error> { self.emulate_network_latencies(); // Create epoch ending ledger infos according to the requested epochs @@ -146,7 +146,7 @@ impl DiemDataClient for MockDiemDataClient { &self, start_epoch: Epoch, end_epoch: Epoch, - ) -> Result>, diem_data_client::Error> { + ) -> Result>, aptos_data_client::Error> { self.emulate_network_latencies(); // Fetch the epoch ending ledger infos according to the requested epochs @@ -161,7 +161,7 @@ impl DiemDataClient for MockDiemDataClient { async fn get_number_of_account_states( &self, _version: Version, - ) -> Result, diem_data_client::Error> { + ) -> Result, aptos_data_client::Error> { Ok(create_data_client_response(TOTAL_NUM_ACCOUNTS)) } @@ -170,7 +170,7 @@ impl DiemDataClient for MockDiemDataClient { _proof_version: Version, start_version: Version, end_version: Version, - ) -> Result, diem_data_client::Error> { + ) -> Result, aptos_data_client::Error> { self.emulate_network_latencies(); // Create the requested transactions and transaction outputs @@ -192,7 +192,7 @@ impl DiemDataClient for MockDiemDataClient { start_version: Version, end_version: Version, include_events: bool, - ) -> Result, diem_data_client::Error> { + ) -> Result, aptos_data_client::Error> { self.emulate_network_latencies(); let transaction_list_with_proof = @@ -367,7 +367,7 @@ fn create_range_random_u64(min_value: u64, max_value: u64) -> u64 { /// Initializes the Diem logger for tests pub fn initialize_logger() { - diem_logger::DiemLogger::builder() + aptos_logger::DiemLogger::builder() .is_async(false) .level(Level::Info) .build(); 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 4351881d59fa0..0c9b53075b887 100644 --- a/state-sync/state-sync-v2/state-sync-driver/Cargo.toml +++ b/state-sync/state-sync-v2/state-sync-driver/Cargo.toml @@ -18,12 +18,12 @@ tokio-stream = "0.1.4" consensus-notifications = { path = "../../inter-component/consensus-notifications" } data-streaming-service = { path = "../data-streaming-service" } -diem-config = { path = "../../../config" } -diem-data-client = { path = "../../diem-data-client" } -diem-infallible = { path = "../../../crates/diem-infallible" } -diem-logger = { path = "../../../crates/diem-logger" } -diem-types = { path = "../../../types" } -diem-workspace-hack = { version = "0.1", path = "../../../crates/diem-workspace-hack" } +aptos-config = { path = "../../../config" } +aptos-data-client = { path = "../../aptos-data-client" } +aptos-infallible = { path = "../../../crates/aptos-infallible" } +aptos-logger = { path = "../../../crates/aptos-logger" } +aptos-types = { path = "../../../types" } +aptos-workspace-hack = { version = "0.1", path = "../../../crates/aptos-workspace-hack" } event-notifications = { path = "../../inter-component/event-notifications" } executor = { path = "../../../execution/executor" } executor-types = { path = "../../../execution/executor-types" } @@ -34,12 +34,12 @@ storage-interface = { path = "../../../storage/storage-interface" } claim = "0.5.0" channel = { path = "../../../crates/channel" } -diemdb = { path = "../../../storage/diemdb" } -diem-crypto = { path = "../../../crates/diem-crypto" } -diem-temppath = { path = "../../../crates/diem-temppath" } -diem-time-service = { path = "../../../crates/diem-time-service", features = ["async", "testing"] } -diem-vm = { path = "../../../diem-move/diem-vm" } +aptosdb = { path = "../../../storage/aptosdb" } +aptos-crypto = { path = "../../../crates/aptos-crypto" } +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" } network = { path = "../../../network", features = ["fuzzing"] } storage-service-client = { path = "../../storage-service/client" } -vm-genesis = { path = "../../../diem-move/vm-genesis", features = ["fuzzing"] } +vm-genesis = { path = "../../../aptos-move/vm-genesis", features = ["fuzzing"] } diff --git a/state-sync/state-sync-v2/state-sync-driver/src/bootstrapper.rs b/state-sync/state-sync-v2/state-sync-driver/src/bootstrapper.rs index 659448eff3b16..fc9f6c118814f 100644 --- a/state-sync/state-sync-v2/state-sync-driver/src/bootstrapper.rs +++ b/state-sync/state-sync-v2/state-sync-driver/src/bootstrapper.rs @@ -5,21 +5,21 @@ use crate::{ driver::DriverConfiguration, error::Error, storage_synchronizer::StorageSynchronizerInterface, utils, utils::SpeculativeStreamState, }; -use data_streaming_service::{ - data_notification::{DataNotification, DataPayload, NotificationId}, - data_stream::DataStreamListener, - streaming_client::{DataStreamingClient, NotificationFeedback, StreamingServiceClient}, -}; -use diem_config::config::BootstrappingMode; -use diem_data_client::GlobalDataSummary; -use diem_logger::*; -use diem_types::{ +use aptos_config::config::BootstrappingMode; +use aptos_data_client::GlobalDataSummary; +use aptos_logger::*; +use aptos_types::{ epoch_change::Verifier, epoch_state::EpochState, ledger_info::LedgerInfoWithSignatures, transaction::{TransactionListWithProof, TransactionOutputListWithProof, Version}, waypoint::Waypoint, }; +use data_streaming_service::{ + data_notification::{DataNotification, DataPayload, NotificationId}, + data_stream::DataStreamListener, + streaming_client::{DataStreamingClient, NotificationFeedback, StreamingServiceClient}, +}; use futures::channel::oneshot; use std::{collections::BTreeMap, sync::Arc}; use storage_interface::DbReader; diff --git a/state-sync/state-sync-v2/state-sync-driver/src/continuous_syncer.rs b/state-sync/state-sync-v2/state-sync-driver/src/continuous_syncer.rs index f03c0f5460a5e..2566f3077be09 100644 --- a/state-sync/state-sync-v2/state-sync-driver/src/continuous_syncer.rs +++ b/state-sync/state-sync-v2/state-sync-driver/src/continuous_syncer.rs @@ -5,17 +5,17 @@ use crate::{ driver::DriverConfiguration, error::Error, notification_handlers::ConsensusSyncRequest, storage_synchronizer::StorageSynchronizerInterface, utils, utils::SpeculativeStreamState, }; +use aptos_config::config::ContinuousSyncingMode; +use aptos_infallible::Mutex; +use aptos_types::{ + ledger_info::LedgerInfoWithSignatures, + transaction::{TransactionListWithProof, TransactionOutputListWithProof, Version}, +}; use data_streaming_service::{ data_notification::{DataNotification, DataPayload, NotificationId}, data_stream::DataStreamListener, streaming_client::{DataStreamingClient, NotificationFeedback, StreamingServiceClient}, }; -use diem_config::config::ContinuousSyncingMode; -use diem_infallible::Mutex; -use diem_types::{ - ledger_info::LedgerInfoWithSignatures, - transaction::{TransactionListWithProof, TransactionOutputListWithProof, Version}, -}; use std::sync::Arc; use storage_interface::DbReader; diff --git a/state-sync/state-sync-v2/state-sync-driver/src/driver.rs b/state-sync/state-sync-v2/state-sync-driver/src/driver.rs index d2412e983f05d..d8510f3d4188d 100644 --- a/state-sync/state-sync-v2/state-sync-driver/src/driver.rs +++ b/state-sync/state-sync-v2/state-sync-driver/src/driver.rs @@ -13,15 +13,15 @@ use crate::{ storage_synchronizer::StorageSynchronizerInterface, utils, }; +use aptos_config::config::{RoleType, StateSyncDriverConfig}; +use aptos_data_client::DiemDataClient; +use aptos_infallible::Mutex; +use aptos_logger::*; +use aptos_types::waypoint::Waypoint; use consensus_notifications::{ ConsensusCommitNotification, ConsensusNotification, ConsensusSyncNotification, }; use data_streaming_service::streaming_client::{NotificationFeedback, StreamingServiceClient}; -use diem_config::config::{RoleType, StateSyncDriverConfig}; -use diem_data_client::DiemDataClient; -use diem_infallible::Mutex; -use diem_logger::*; -use diem_types::waypoint::Waypoint; use event_notifications::EventSubscriptionService; use futures::StreamExt; use mempool_notifications::MempoolNotificationSender; @@ -75,7 +75,7 @@ pub struct StateSyncDriver { continuous_syncer: ContinuousSyncer, // The client for checking the global data summary of our peers - diem_data_client: DataClient, + aptos_data_client: DataClient, // The configuration for the driver driver_configuration: DriverConfiguration, @@ -111,7 +111,7 @@ impl< event_subscription_service: EventSubscriptionService, mempool_notification_handler: MempoolNotificationHandler, storage_synchronizer: StorageSyncer, - diem_data_client: DataClient, + aptos_data_client: DataClient, streaming_service_client: StreamingServiceClient, storage: Arc, ) -> Self { @@ -135,7 +135,7 @@ impl< commit_notification_listener, consensus_notification_handler, continuous_syncer, - diem_data_client, + aptos_data_client, driver_configuration, error_notification_listener, event_subscription_service, @@ -463,7 +463,7 @@ impl< /// Checks that state sync is making progress async fn drive_progress(&mut self) { // Fetch the global data summary and verify we have active peers - let global_data_summary = self.diem_data_client.get_global_data_summary(); + let global_data_summary = self.aptos_data_client.get_global_data_summary(); if global_data_summary.is_empty() { trace!("The global data summary is empty! It's likely that we have no active peers."); return self.check_auto_bootstrapping(); diff --git a/state-sync/state-sync-v2/state-sync-driver/src/driver_factory.rs b/state-sync/state-sync-v2/state-sync-driver/src/driver_factory.rs index 6f43eb23953a6..f6e73b115472c 100644 --- a/state-sync/state-sync-v2/state-sync-driver/src/driver_factory.rs +++ b/state-sync/state-sync-v2/state-sync-driver/src/driver_factory.rs @@ -10,11 +10,11 @@ use crate::{ }, storage_synchronizer::StorageSynchronizer, }; +use aptos_config::config::NodeConfig; +use aptos_data_client::diemnet::DiemNetDataClient; +use aptos_types::waypoint::Waypoint; use consensus_notifications::ConsensusNotificationListener; use data_streaming_service::streaming_client::StreamingServiceClient; -use diem_config::config::NodeConfig; -use diem_data_client::diemnet::DiemNetDataClient; -use diem_types::waypoint::Waypoint; use event_notifications::EventSubscriptionService; use executor_types::ChunkExecutorTrait; use futures::channel::mpsc; @@ -43,7 +43,7 @@ impl DriverFactory { mempool_notification_sender: MempoolNotifier, consensus_listener: ConsensusNotificationListener, event_subscription_service: EventSubscriptionService, - diem_data_client: DiemNetDataClient, + aptos_data_client: DiemNetDataClient, streaming_service_client: StreamingServiceClient, ) -> Self { // Create the notification handlers @@ -96,7 +96,7 @@ impl DriverFactory { event_subscription_service, mempool_notification_handler, storage_synchronizer, - diem_data_client, + aptos_data_client, streaming_service_client, storage, ); diff --git a/state-sync/state-sync-v2/state-sync-driver/src/error.rs b/state-sync/state-sync-v2/state-sync-driver/src/error.rs index aa76538ab9706..de67dc45f2797 100644 --- a/state-sync/state-sync-v2/state-sync-driver/src/error.rs +++ b/state-sync/state-sync-v2/state-sync-driver/src/error.rs @@ -1,7 +1,7 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_types::transaction::Version; +use aptos_types::transaction::Version; use futures::channel::{mpsc::SendError, oneshot::Canceled}; use serde::{Deserialize, Serialize}; use thiserror::Error; diff --git a/state-sync/state-sync-v2/state-sync-driver/src/notification_handlers.rs b/state-sync/state-sync-v2/state-sync-driver/src/notification_handlers.rs index 62d76373510de..cce7ee0a6805b 100644 --- a/state-sync/state-sync-v2/state-sync-driver/src/notification_handlers.rs +++ b/state-sync/state-sync-v2/state-sync-driver/src/notification_handlers.rs @@ -2,18 +2,18 @@ // SPDX-License-Identifier: Apache-2.0 use crate::error::Error; +use aptos_infallible::Mutex; +use aptos_logger::prelude::*; +use aptos_types::{ + contract_event::ContractEvent, + ledger_info::LedgerInfoWithSignatures, + transaction::{Transaction, Version}, +}; use consensus_notifications::{ ConsensusCommitNotification, ConsensusNotification, ConsensusNotificationListener, ConsensusSyncNotification, }; use data_streaming_service::data_notification::NotificationId; -use diem_infallible::Mutex; -use diem_logger::prelude::*; -use diem_types::{ - contract_event::ContractEvent, - ledger_info::LedgerInfoWithSignatures, - transaction::{Transaction, Version}, -}; use event_notifications::{EventNotificationSender, EventSubscriptionService}; use futures::{channel::mpsc, stream::FusedStream, Stream}; use mempool_notifications::MempoolNotificationSender; diff --git a/state-sync/state-sync-v2/state-sync-driver/src/storage_synchronizer.rs b/state-sync/state-sync-v2/state-sync-driver/src/storage_synchronizer.rs index 0a8f38fdb1690..987977e5c3597 100644 --- a/state-sync/state-sync-v2/state-sync-driver/src/storage_synchronizer.rs +++ b/state-sync/state-sync-v2/state-sync-driver/src/storage_synchronizer.rs @@ -5,13 +5,13 @@ use crate::{ error::Error, notification_handlers::{CommitNotification, ErrorNotification}, }; -use data_streaming_service::data_notification::NotificationId; -use diem_logger::prelude::*; -use diem_types::{ +use aptos_logger::prelude::*; +use aptos_types::{ account_state_blob::AccountStatesChunkWithProof, ledger_info::LedgerInfoWithSignatures, transaction::{TransactionListWithProof, TransactionOutputListWithProof}, }; +use data_streaming_service::data_notification::NotificationId; use executor_types::ChunkExecutorTrait; use futures::{channel::mpsc, SinkExt, StreamExt}; use std::{ diff --git a/state-sync/state-sync-v2/state-sync-driver/src/tests/utils.rs b/state-sync/state-sync-v2/state-sync-driver/src/tests/utils.rs index b580d2d4bfa29..e2ef8a42094f9 100644 --- a/state-sync/state-sync-v2/state-sync-driver/src/tests/utils.rs +++ b/state-sync/state-sync-v2/state-sync-driver/src/tests/utils.rs @@ -2,17 +2,15 @@ // SPDX-License-Identifier: Apache-2.0 use crate::driver_factory::DriverFactory; -use consensus_notifications::ConsensusNotifier; -use data_streaming_service::streaming_client::new_streaming_service_client_listener_pair; -use diem_config::config::{NodeConfig, RoleType}; -use diem_crypto::{ +use aptos_config::config::{NodeConfig, RoleType}; +use aptos_crypto::{ ed25519::{Ed25519PrivateKey, Ed25519Signature}, HashValue, PrivateKey, Uniform, }; -use diem_data_client::diemnet::DiemNetDataClient; -use diem_infallible::RwLock; -use diem_time_service::TimeService; -use diem_types::{ +use aptos_data_client::diemnet::DiemNetDataClient; +use aptos_infallible::RwLock; +use aptos_time_service::TimeService; +use aptos_types::{ account_address::AccountAddress, block_info::BlockInfo, chain_id::ChainId, @@ -25,8 +23,10 @@ use diem_types::{ }, waypoint::Waypoint, }; -use diem_vm::DiemVM; -use diemdb::DiemDB; +use aptos_vm::DiemVM; +use aptosdb::DiemDB; +use consensus_notifications::ConsensusNotifier; +use data_streaming_service::streaming_client::new_streaming_service_client_listener_pair; use event_notifications::{ EventNotificationSender, EventSubscriptionService, ReconfigNotificationListener, }; @@ -92,7 +92,7 @@ fn create_driver_for_tests( ReconfigNotificationListener, ) { // Create test diem database - let db_path = diem_temppath::TempPath::new(); + let db_path = aptos_temppath::TempPath::new(); db_path.create_as_dir().unwrap(); let (db, db_rw) = DbReaderWriter::wrap(DiemDB::new_for_test(db_path.path())); @@ -132,8 +132,8 @@ fn create_driver_for_tests( MultiNetworkSender::new(HashMap::new()), PeerMetadataStorage::new(&[]), ); - let (diem_data_client, _) = DiemNetDataClient::new( - node_config.state_sync.diem_data_client, + let (aptos_data_client, _) = DiemNetDataClient::new( + node_config.state_sync.aptos_data_client, node_config.state_sync.storage_service, TimeService::mock(), network_client, @@ -149,7 +149,7 @@ fn create_driver_for_tests( mempool_notifier, consensus_listener, event_subscription_service, - diem_data_client, + aptos_data_client, streaming_service_client, ); diff --git a/state-sync/state-sync-v2/state-sync-driver/src/utils.rs b/state-sync/state-sync-v2/state-sync-driver/src/utils.rs index 887fa3a5f94f1..1e44ace1f9bb0 100644 --- a/state-sync/state-sync-v2/state-sync-driver/src/utils.rs +++ b/state-sync/state-sync-v2/state-sync-driver/src/utils.rs @@ -2,16 +2,16 @@ // SPDX-License-Identifier: Apache-2.0 use crate::error::Error; +use aptos_logger::prelude::*; +use aptos_types::{ + epoch_change::Verifier, epoch_state::EpochState, ledger_info::LedgerInfoWithSignatures, + transaction::Version, +}; use data_streaming_service::{ data_notification::{DataNotification, DataPayload, NotificationId}, data_stream::DataStreamListener, streaming_client::{DataStreamingClient, NotificationFeedback, StreamingServiceClient}, }; -use diem_logger::prelude::*; -use diem_types::{ - epoch_change::Verifier, epoch_state::EpochState, ledger_info::LedgerInfoWithSignatures, - transaction::Version, -}; use futures::StreamExt; use std::{sync::Arc, time::Duration}; use storage_interface::{DbReader, StartupInfo}; diff --git a/state-sync/state-sync-v2/state-sync-multiplexer/Cargo.toml b/state-sync/state-sync-v2/state-sync-multiplexer/Cargo.toml index 7848e4098e1ff..c33f81eae4a69 100644 --- a/state-sync/state-sync-v2/state-sync-multiplexer/Cargo.toml +++ b/state-sync/state-sync-v2/state-sync-multiplexer/Cargo.toml @@ -15,10 +15,10 @@ tokio = { version = "1.8.1", features = ["full"] } consensus-notifications = { path = "../../../state-sync/inter-component/consensus-notifications" } data-streaming-service = { path = "../data-streaming-service" } -diem-config = { path = "../../../config" } -diem-data-client = { path = "../../diem-data-client" } -diem-types = { path = "../../../types" } -diem-workspace-hack = { version = "0.1", path = "../../../crates/diem-workspace-hack" } +aptos-config = { path = "../../../config" } +aptos-data-client = { path = "../../aptos-data-client" } +aptos-types = { path = "../../../types" } +aptos-workspace-hack = { version = "0.1", path = "../../../crates/aptos-workspace-hack" } event-notifications = { path = "../../../state-sync/inter-component/event-notifications" } executor-types = { path = "../../../execution/executor-types" } mempool-notifications = { path = "../../../state-sync/inter-component/mempool-notifications" } @@ -28,13 +28,13 @@ state-sync-v1 = { path = "../../../state-sync/state-sync-v1" } storage-interface = { path = "../../../storage/storage-interface" } [dev-dependencies] -diem-crypto = { path = "../../../crates/diem-crypto" } -diem-genesis-tool = {path = "../../../config/management/genesis", features = ["testing"] } -diem-infallible = { path = "../../../crates/diem-infallible" } -diem-temppath = { path = "../../../crates/diem-temppath" } -diem-time-service = { path = "../../../crates/diem-time-service", features = ["async", "testing"] } -diem-vm = { path = "../../../diem-move/diem-vm" } -diemdb = { path = "../../../storage/diemdb" } +aptos-crypto = { path = "../../../crates/aptos-crypto" } +aptos-genesis-tool = {path = "../../../config/management/genesis", features = ["testing"] } +aptos-infallible = { path = "../../../crates/aptos-infallible" } +aptos-temppath = { path = "../../../crates/aptos-temppath" } +aptos-time-service = { path = "../../../crates/aptos-time-service", features = ["async", "testing"] } +aptos-vm = { path = "../../../aptos-move/aptos-vm" } +aptosdb = { path = "../../../storage/aptosdb" } executor = { path = "../../../execution/executor" } executor-test-helpers = { path = "../../../execution/executor-test-helpers" } mempool-notifications = { path = "../../../state-sync/inter-component/mempool-notifications" } diff --git a/state-sync/state-sync-v2/state-sync-multiplexer/src/lib.rs b/state-sync/state-sync-v2/state-sync-multiplexer/src/lib.rs index 5a51d401d0f7d..b91ef060e2c68 100644 --- a/state-sync/state-sync-v2/state-sync-multiplexer/src/lib.rs +++ b/state-sync/state-sync-v2/state-sync-multiplexer/src/lib.rs @@ -3,11 +3,11 @@ #![forbid(unsafe_code)] +use aptos_config::{config::NodeConfig, network_id::NetworkId}; +use aptos_data_client::diemnet::DiemNetDataClient; +use aptos_types::{move_resource::MoveStorage, waypoint::Waypoint}; use consensus_notifications::ConsensusNotificationListener; use data_streaming_service::streaming_client::StreamingServiceClient; -use diem_config::{config::NodeConfig, network_id::NetworkId}; -use diem_data_client::diemnet::DiemNetDataClient; -use diem_types::{move_resource::MoveStorage, waypoint::Waypoint}; use event_notifications::{EventNotificationSender, EventSubscriptionService}; use executor_types::ChunkExecutorTrait; use futures::executor::block_on; @@ -26,7 +26,7 @@ use tokio::runtime::Runtime; /// Note: it's useful to maintain separate runtimes because the logger /// can prepend all logs with the runtime thread name. pub struct StateSyncRuntimes { - _diem_data_client: Runtime, + _aptos_data_client: Runtime, state_sync: StateSyncMultiplexer, _storage_service: Runtime, _streaming_service: Runtime, @@ -34,13 +34,13 @@ pub struct StateSyncRuntimes { impl StateSyncRuntimes { pub fn new( - diem_data_client: Runtime, + aptos_data_client: Runtime, state_sync: StateSyncMultiplexer, storage_service: Runtime, streaming_service: Runtime, ) -> Self { Self { - _diem_data_client: diem_data_client, + _aptos_data_client: aptos_data_client, state_sync, _storage_service: storage_service, _streaming_service: streaming_service, @@ -73,7 +73,7 @@ impl StateSyncMultiplexer { node_config: &NodeConfig, waypoint: Waypoint, mut event_subscription_service: EventSubscriptionService, - diem_data_client: DiemNetDataClient, + aptos_data_client: DiemNetDataClient, streaming_service_client: StreamingServiceClient, ) -> Self { // Notify subscribers of the initial on-chain config values @@ -110,7 +110,7 @@ impl StateSyncMultiplexer { mempool_notifier, consensus_listener, event_subscription_service, - diem_data_client, + aptos_data_client, streaming_service_client, )); } else { @@ -164,21 +164,21 @@ pub fn state_sync_v1_network_config() -> AppConfig { #[cfg(any(test, feature = "fuzzing"))] mod tests { use crate::StateSyncMultiplexer; - use consensus_notifications::new_consensus_notifier_listener_pair; - use data_streaming_service::streaming_client::new_streaming_service_client_listener_pair; - use diem_config::{config::RocksdbConfig, utils::get_genesis_txn}; - use diem_crypto::HashValue; - use diem_data_client::diemnet::DiemNetDataClient; - use diem_genesis_tool::test_config; - use diem_infallible::RwLock; - use diem_temppath::TempPath; - use diem_time_service::TimeService; - use diem_types::{ + use aptos_config::{config::RocksdbConfig, utils::get_genesis_txn}; + use aptos_crypto::HashValue; + use aptos_data_client::diemnet::DiemNetDataClient; + use aptos_genesis_tool::test_config; + use aptos_infallible::RwLock; + use aptos_temppath::TempPath; + use aptos_time_service::TimeService; + use aptos_types::{ block_info::BlockInfo, ledger_info::LedgerInfo, on_chain_config::ON_CHAIN_CONFIG_REGISTRY, waypoint::Waypoint, }; - use diem_vm::DiemVM; - use diemdb::DiemDB; + use aptos_vm::DiemVM; + use aptosdb::DiemDB; + use consensus_notifications::new_consensus_notifier_listener_pair; + use data_streaming_service::streaming_client::new_streaming_service_client_listener_pair; use event_notifications::EventSubscriptionService; use executor::chunk_executor::ChunkExecutor; use executor_test_helpers::bootstrap_genesis; @@ -221,8 +221,8 @@ mod tests { MultiNetworkSender::new(HashMap::new()), PeerMetadataStorage::new(&[]), ); - let (diem_data_client, _) = DiemNetDataClient::new( - node_config.state_sync.diem_data_client, + let (aptos_data_client, _) = DiemNetDataClient::new( + node_config.state_sync.aptos_data_client, node_config.state_sync.storage_service, TimeService::mock(), network_client, @@ -238,7 +238,7 @@ mod tests { &node_config, Waypoint::new_any(&LedgerInfo::new(BlockInfo::empty(), HashValue::random())), event_subscription_service, - diem_data_client, + aptos_data_client, streaming_service_client, ); diff --git a/state-sync/storage-service/client/Cargo.toml b/state-sync/storage-service/client/Cargo.toml index c54f9fe9ef142..1a28fa866792c 100644 --- a/state-sync/storage-service/client/Cargo.toml +++ b/state-sync/storage-service/client/Cargo.toml @@ -14,8 +14,8 @@ async-trait = "0.1.42" thiserror = "1.0.24" channel = { path = "../../../crates/channel" } -diem-config = { path = "../../../config" } -diem-types = { path = "../../../types" } -diem-workspace-hack = { version = "0.1", path = "../../../crates/diem-workspace-hack" } +aptos-config = { path = "../../../config" } +aptos-types = { path = "../../../types" } +aptos-workspace-hack = { version = "0.1", path = "../../../crates/aptos-workspace-hack" } network = { path = "../../../network" } storage-service-types = { path = "../types" } diff --git a/state-sync/storage-service/client/src/lib.rs b/state-sync/storage-service/client/src/lib.rs index 43a83f0d23b49..0d63f87ded39c 100644 --- a/state-sync/storage-service/client/src/lib.rs +++ b/state-sync/storage-service/client/src/lib.rs @@ -3,9 +3,9 @@ #![forbid(unsafe_code)] +use aptos_config::network_id::PeerNetworkId; +use aptos_types::PeerId; use async_trait::async_trait; -use diem_config::network_id::PeerNetworkId; -use diem_types::PeerId; use network::{ application::{ interface::{MultiNetworkSender, NetworkInterface}, diff --git a/state-sync/storage-service/server/Cargo.toml b/state-sync/storage-service/server/Cargo.toml index 400c5c4ce9140..e6f8ae07055f4 100644 --- a/state-sync/storage-service/server/Cargo.toml +++ b/state-sync/storage-service/server/Cargo.toml @@ -20,11 +20,11 @@ tokio = { version = "1.8.1", features = ["rt", "macros"], default-features = fal bounded-executor = { path = "../../../crates/bounded-executor" } channel = { path = "../../../crates/channel" } -diem-config = { path = "../../../config" } -diem-logger = { path = "../../../crates/diem-logger" } -diem-metrics = { path = "../../../crates/diem-metrics" } -diem-types = { path = "../../../types" } -diem-workspace-hack = { version = "0.1", path = "../../../crates/diem-workspace-hack" } +aptos-config = { path = "../../../config" } +aptos-logger = { path = "../../../crates/aptos-logger" } +aptos-metrics = { path = "../../../crates/aptos-metrics" } +aptos-types = { path = "../../../types" } +aptos-workspace-hack = { version = "0.1", path = "../../../crates/aptos-workspace-hack" } network = { path = "../../../network" } storage-interface = { path = "../../../storage/storage-interface" } storage-service-types = { path = "../types" } @@ -33,7 +33,7 @@ storage-service-types = { path = "../types" } anyhow = "1.0.52" claim = "0.5.0" -diem-crypto = { path = "../../../crates/diem-crypto" } -diem-types = { path = "../../../types" } +aptos-crypto = { path = "../../../crates/aptos-crypto" } +aptos-types = { path = "../../../types" } move-core-types = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } storage-interface = { path = "../../../storage/storage-interface" } diff --git a/state-sync/storage-service/server/src/lib.rs b/state-sync/storage-service/server/src/lib.rs index e9213faf83c15..401ea55926687 100644 --- a/state-sync/storage-service/server/src/lib.rs +++ b/state-sync/storage-service/server/src/lib.rs @@ -9,14 +9,14 @@ use crate::{ network::StorageServiceNetworkEvents, }; use ::network::ProtocolId; -use bounded_executor::BoundedExecutor; -use diem_config::config::StorageServiceConfig; -use diem_logger::prelude::*; -use diem_types::{ +use aptos_config::config::StorageServiceConfig; +use aptos_logger::prelude::*; +use aptos_types::{ account_state_blob::AccountStatesChunkWithProof, epoch_change::EpochChangeProof, transaction::{TransactionListWithProof, TransactionOutputListWithProof, Version}, }; +use bounded_executor::BoundedExecutor; use futures::stream::StreamExt; use serde::{Deserialize, Serialize}; use std::{sync::Arc, time::Duration}; diff --git a/state-sync/storage-service/server/src/logging.rs b/state-sync/storage-service/server/src/logging.rs index 988c78807ac80..86a4a030ae449 100644 --- a/state-sync/storage-service/server/src/logging.rs +++ b/state-sync/storage-service/server/src/logging.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 use crate::Error; -use diem_logger::Schema; +use aptos_logger::Schema; use serde::Serialize; use storage_service_types::StorageServiceRequest; diff --git a/state-sync/storage-service/server/src/metrics.rs b/state-sync/storage-service/server/src/metrics.rs index 9c500255e62c0..aac71da9a3998 100644 --- a/state-sync/storage-service/server/src/metrics.rs +++ b/state-sync/storage-service/server/src/metrics.rs @@ -1,7 +1,7 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_metrics::{ +use aptos_metrics::{ register_histogram_vec, register_int_counter_vec, HistogramTimer, HistogramVec, IntCounterVec, }; use network::ProtocolId; diff --git a/state-sync/storage-service/server/src/network.rs b/state-sync/storage-service/server/src/network.rs index 3cd00e7713dab..908b3e097d5c1 100644 --- a/state-sync/storage-service/server/src/network.rs +++ b/state-sync/storage-service/server/src/network.rs @@ -2,9 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 use crate::metrics; +use aptos_types::PeerId; use bytes::Bytes; -use channel::{diem_channel, message_queues::QueueStyle}; -use diem_types::PeerId; +use channel::{aptos_channel, message_queues::QueueStyle}; use futures::{ channel::oneshot, future, @@ -28,7 +28,7 @@ const INBOUND_CHANNEL_SIZE: usize = 100; pub fn network_endpoint_config() -> AppConfig { AppConfig::service( [ProtocolId::StorageServiceRpc], - diem_channel::Config::new(INBOUND_CHANNEL_SIZE) + aptos_channel::Config::new(INBOUND_CHANNEL_SIZE) .queue_style(QueueStyle::FIFO) .counters(&metrics::PENDING_STORAGE_SERVER_NETWORK_EVENTS), ) @@ -42,8 +42,8 @@ pub struct StorageServiceNetworkEvents(BoxStream<'static, NetworkRequest>); impl NewNetworkEvents for StorageServiceNetworkEvents { fn new( - peer_mgr_notifs_rx: diem_channel::Receiver<(PeerId, ProtocolId), PeerManagerNotification>, - connection_notifs_rx: diem_channel::Receiver, + peer_mgr_notifs_rx: aptos_channel::Receiver<(PeerId, ProtocolId), PeerManagerNotification>, + connection_notifs_rx: aptos_channel::Receiver, ) -> Self { let events = NetworkEvents::new(peer_mgr_notifs_rx, connection_notifs_rx) .filter_map(|event| future::ready(Self::event_to_request(event))) diff --git a/state-sync/storage-service/server/src/tests.rs b/state-sync/storage-service/server/src/tests.rs index 1f2e7e25da07e..00bc304ec3dfa 100644 --- a/state-sync/storage-service/server/src/tests.rs +++ b/state-sync/storage-service/server/src/tests.rs @@ -5,12 +5,10 @@ use crate::{network::StorageServiceNetworkEvents, StorageReader, StorageServiceServer}; use anyhow::Result; -use channel::diem_channel; -use claim::{assert_none, assert_some}; -use diem_config::config::StorageServiceConfig; -use diem_crypto::{ed25519::Ed25519PrivateKey, HashValue, PrivateKey, SigningKey, Uniform}; -use diem_logger::Level; -use diem_types::{ +use aptos_config::config::StorageServiceConfig; +use aptos_crypto::{ed25519::Ed25519PrivateKey, HashValue, PrivateKey, SigningKey, Uniform}; +use aptos_logger::Level; +use aptos_types::{ account_address::AccountAddress, account_state_blob::AccountStatesChunkWithProof, block_info::BlockInfo, @@ -28,6 +26,8 @@ use diem_types::{ write_set::WriteSet, PeerId, }; +use channel::aptos_channel; +use claim::{assert_none, assert_some}; use futures::channel::oneshot; use move_core_types::language_storage::TypeTag; use network::{ @@ -310,7 +310,7 @@ async fn test_get_epoch_ending_ledger_infos() { /// A wrapper around the inbound network interface/channel for easily sending /// mock client requests to a [`StorageServiceServer`]. struct MockClient { - peer_mgr_notifs_tx: diem_channel::Sender<(PeerId, ProtocolId), PeerManagerNotification>, + peer_mgr_notifs_tx: aptos_channel::Sender<(PeerId, ProtocolId), PeerManagerNotification>, } impl MockClient { @@ -552,7 +552,7 @@ impl DbReader for MockDbReader { /// Initializes the Diem logger for tests pub fn initialize_logger() { - diem_logger::DiemLogger::builder() + aptos_logger::DiemLogger::builder() .is_async(false) .level(Level::Debug) .build(); diff --git a/state-sync/storage-service/types/Cargo.toml b/state-sync/storage-service/types/Cargo.toml index 278b8cf222540..8738eba9510bf 100644 --- a/state-sync/storage-service/types/Cargo.toml +++ b/state-sync/storage-service/types/Cargo.toml @@ -14,10 +14,10 @@ num-traits = { version = "0.2.14", default-features = false } serde = { version = "1.0.124", default-features = false } thiserror = "1.0.24" -diem-config = { path = "../../../config" } -diem-crypto = { path = "../../../crates/diem-crypto" } -diem-types = { path = "../../../types" } -diem-workspace-hack = { version = "0.1", path = "../../../crates/diem-workspace-hack" } +aptos-config = { path = "../../../config" } +aptos-crypto = { path = "../../../crates/aptos-crypto" } +aptos-types = { path = "../../../types" } +aptos-workspace-hack = { version = "0.1", path = "../../../crates/aptos-workspace-hack" } [dev-dependencies] claim = "0.5.0" diff --git a/state-sync/storage-service/types/src/lib.rs b/state-sync/storage-service/types/src/lib.rs index 56f2ab5b3290d..8be9e0852a5db 100644 --- a/state-sync/storage-service/types/src/lib.rs +++ b/state-sync/storage-service/types/src/lib.rs @@ -3,8 +3,8 @@ #![forbid(unsafe_code)] -use diem_config::config::StorageServiceConfig; -use diem_types::{ +use aptos_config::config::StorageServiceConfig; +use aptos_types::{ account_state_blob::AccountStatesChunkWithProof, epoch_change::EpochChangeProof, ledger_info::LedgerInfoWithSignatures, @@ -584,9 +584,9 @@ where #[cfg(test)] mod tests { use super::*; + use aptos_crypto::hash::HashValue; + use aptos_types::{block_info::BlockInfo, ledger_info::LedgerInfo}; use claim::{assert_err, assert_ok}; - use diem_crypto::hash::HashValue; - use diem_types::{block_info::BlockInfo, ledger_info::LedgerInfo}; use proptest::prelude::*; use std::collections::BTreeMap; diff --git a/storage/README.md b/storage/README.md index b91af2ca774ee..baafa17c51210 100644 --- a/storage/README.md +++ b/storage/README.md @@ -86,7 +86,7 @@ Patricia tree. ``` storage └── accumulator # Implementation of Merkle accumulator. - └── diemdb # Implementation of DiemDB. + └── aptosdb # Implementation of DiemDB. └── schemadb # Schematized wrapper on top of RocksDB. └── scratchpad # In-memory representation of Diem core data structures used by execution. └── jellyfish-merkle # Implementation of sparse Merkle tree. diff --git a/storage/accumulator/Cargo.toml b/storage/accumulator/Cargo.toml index bc943356f77a2..5d8aa8c2aefb1 100644 --- a/storage/accumulator/Cargo.toml +++ b/storage/accumulator/Cargo.toml @@ -11,18 +11,18 @@ edition = "2018" [dependencies] anyhow = "1.0.52" -diem-crypto = { path = "../../crates/diem-crypto" } +aptos-crypto = { path = "../../crates/aptos-crypto" } mirai-annotations = "1.10.1" -diem-types = { path = "../../types" } -diem-workspace-hack = { version = "0.1", path = "../../crates/diem-workspace-hack" } +aptos-types = { path = "../../types" } +aptos-workspace-hack = { version = "0.1", path = "../../crates/aptos-workspace-hack" } proptest = { version = "1.0.0", optional = true } [dev-dependencies] rand = "0.8.3" proptest = "1.0.0" -diem-crypto = { path = "../../crates/diem-crypto", features = ["fuzzing"] } +aptos-crypto = { path = "../../crates/aptos-crypto", features = ["fuzzing"] } [features] default = [] -fuzzing = ["proptest", "diem-crypto/fuzzing", "diem-types/fuzzing"] +fuzzing = ["proptest", "aptos-crypto/fuzzing", "aptos-types/fuzzing"] diff --git a/storage/accumulator/src/lib.rs b/storage/accumulator/src/lib.rs index 6d3c1268447de..f21b09fa2a4db 100644 --- a/storage/accumulator/src/lib.rs +++ b/storage/accumulator/src/lib.rs @@ -107,8 +107,8 @@ pub mod test_helpers; use anyhow::{ensure, format_err, Result}; -use diem_crypto::hash::{CryptoHash, CryptoHasher, HashValue, ACCUMULATOR_PLACEHOLDER_HASH}; -use diem_types::proof::{ +use aptos_crypto::hash::{CryptoHash, CryptoHasher, HashValue, ACCUMULATOR_PLACEHOLDER_HASH}; +use aptos_types::proof::{ definition::{LeafCount, MAX_ACCUMULATOR_PROOF_DEPTH}, position::{FrozenSubTreeIterator, FrozenSubtreeSiblingIterator, Position}, AccumulatorConsistencyProof, AccumulatorProof, AccumulatorRangeProof, MerkleTreeInternalNode, @@ -151,7 +151,7 @@ where /// `num_leaves` leaves in total. Siblings are read via `reader` (or generated dynamically /// if they are non-frozen). /// - /// See [`diem_types::proof::AccumulatorProof`] for proof format. + /// See [`aptos_types::proof::AccumulatorProof`] for proof format. pub fn get_proof( reader: &R, num_leaves: LeafCount, @@ -162,7 +162,7 @@ where /// Gets a proof that shows the full accumulator is consistent with a smaller accumulator. /// - /// See [`diem_types::proof::AccumulatorConsistencyProof`] for proof format. + /// See [`aptos_types::proof::AccumulatorConsistencyProof`] for proof format. pub fn get_consistency_proof( reader: &R, full_acc_leaves: LeafCount, @@ -174,7 +174,7 @@ where /// Gets a proof that shows a range of leaves are part of the accumulator. /// - /// See [`diem_types::proof::AccumulatorRangeProof`] for proof format. + /// See [`aptos_types::proof::AccumulatorRangeProof`] for proof format. pub fn get_range_proof( reader: &R, full_acc_leaves: LeafCount, diff --git a/storage/accumulator/src/test_helpers.rs b/storage/accumulator/src/test_helpers.rs index ffaf533d094d7..24306e7f3417b 100644 --- a/storage/accumulator/src/test_helpers.rs +++ b/storage/accumulator/src/test_helpers.rs @@ -3,13 +3,13 @@ use crate::{HashReader, MerkleAccumulator, MerkleAccumulatorView}; use anyhow::{ensure, format_err, Result}; -use diem_crypto::hash::{HashValue, TestOnlyHasher, ACCUMULATOR_PLACEHOLDER_HASH}; -use diem_types::proof::{definition::LeafCount, position::Position}; +use aptos_crypto::hash::{HashValue, TestOnlyHasher, ACCUMULATOR_PLACEHOLDER_HASH}; +use aptos_types::proof::{definition::LeafCount, position::Position}; use proptest::{collection::vec, prelude::*}; use std::collections::HashMap; pub(crate) type InMemoryAccumulator = - diem_types::proof::accumulator::InMemoryAccumulator; + aptos_types::proof::accumulator::InMemoryAccumulator; pub(crate) type TestAccumulator = MerkleAccumulator; pub(crate) struct MockHashStore { diff --git a/storage/accumulator/src/tests/write_test.rs b/storage/accumulator/src/tests/write_test.rs index f3973a3f2d0d5..6af47e04dc9ef 100644 --- a/storage/accumulator/src/tests/write_test.rs +++ b/storage/accumulator/src/tests/write_test.rs @@ -6,8 +6,8 @@ use crate::test_helpers::{ arb_hash_batch, arb_list_of_hash_batches, test_append_empty_impl, test_append_many_impl, MockHashStore, TestAccumulator, }; -use diem_crypto::hash::ACCUMULATOR_PLACEHOLDER_HASH; -use diem_types::proof::definition::LeafCount; +use aptos_crypto::hash::ACCUMULATOR_PLACEHOLDER_HASH; +use aptos_types::proof::definition::LeafCount; #[test] fn test_append_empty_on_empty() { diff --git a/storage/diemdb/Cargo.toml b/storage/aptosdb/Cargo.toml similarity index 51% rename from storage/diemdb/Cargo.toml rename to storage/aptosdb/Cargo.toml index 5495b5f8aa090..8a22558cb5243 100644 --- a/storage/diemdb/Cargo.toml +++ b/storage/aptosdb/Cargo.toml @@ -1,8 +1,8 @@ [package] -name = "diemdb" +name = "aptosdb" version = "0.1.0" authors = ["Diem Association "] -description = "Diem diemdb" +description = "Diem aptosdb" repository = "https://github.com/diem/diem" homepage = "https://diem.com" license = "Apache-2.0" @@ -24,16 +24,16 @@ thiserror = "1.0.24" accumulator = { path = "../accumulator" } bcs = "0.1.2" -diem-config = { path = "../../config" } -diem-crypto = { path = "../../crates/diem-crypto" } -diem-jellyfish-merkle = { path = "../jellyfish-merkle" } -diem-logger = { path = "../../crates/diem-logger" } -diem-metrics = { path = "../../crates/diem-metrics" } -diem-infallible = { path = "../../crates/diem-infallible" } -diem-proptest-helpers = { path = "../../crates/diem-proptest-helpers", optional = true } -diem-temppath = { path = "../../crates/diem-temppath", optional = true } -diem-types = { path = "../../types" } -diem-workspace-hack = { version = "0.1", path = "../../crates/diem-workspace-hack" } +aptos-config = { path = "../../config" } +aptos-crypto = { path = "../../crates/aptos-crypto" } +aptos-jellyfish-merkle = { path = "../jellyfish-merkle" } +aptos-logger = { path = "../../crates/aptos-logger" } +aptos-metrics = { path = "../../crates/aptos-metrics" } +aptos-infallible = { path = "../../crates/aptos-infallible" } +aptos-proptest-helpers = { path = "../../crates/aptos-proptest-helpers", optional = true } +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/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860"} @@ -47,15 +47,15 @@ proptest = "1.0.0" proptest-derive = "0.3.0" rand = "0.8.3" -diem-jellyfish-merkle = { path = "../jellyfish-merkle", features = ["fuzzing"] } -diem-proptest-helpers = { path = "../../crates/diem-proptest-helpers" } -diem-temppath = { path = "../../crates/diem-temppath" } -diem-types = { path = "../../types", features = ["fuzzing"] } +aptos-jellyfish-merkle = { path = "../jellyfish-merkle", features = ["fuzzing"] } +aptos-proptest-helpers = { path = "../../crates/aptos-proptest-helpers" } +aptos-temppath = { path = "../../crates/aptos-temppath" } +aptos-types = { path = "../../types", features = ["fuzzing"] } executor-types = { path = "../../execution/executor-types", features = ["fuzzing"] } schemadb = { path = "../schemadb", features = ["fuzzing"] } scratchpad = { path = "../scratchpad", features = ["fuzzing"] } [features] default = [] -diemsum = [] -fuzzing = ["proptest", "proptest-derive", "diem-proptest-helpers", "diem-temppath", "diem-crypto/fuzzing", "diem-jellyfish-merkle/fuzzing", "diem-types/fuzzing", "executor-types/fuzzing", "schemadb/fuzzing", "scratchpad/fuzzing"] +aptossum = [] +fuzzing = ["proptest", "proptest-derive", "aptos-proptest-helpers", "aptos-temppath", "aptos-crypto/fuzzing", "aptos-jellyfish-merkle/fuzzing", "aptos-types/fuzzing", "executor-types/fuzzing", "schemadb/fuzzing", "scratchpad/fuzzing"] diff --git a/storage/diemdb/src/diemdb_test.rs b/storage/aptosdb/src/aptosdb_test.rs similarity index 99% rename from storage/diemdb/src/diemdb_test.rs rename to storage/aptosdb/src/aptosdb_test.rs index 10c13bbcd7cbd..ea84ab69da0b6 100644 --- a/storage/diemdb/src/diemdb_test.rs +++ b/storage/aptosdb/src/aptosdb_test.rs @@ -6,13 +6,13 @@ use super::*; use crate::{ schema::jellyfish_merkle_node::JellyfishMerkleNodeSchema, test_helper::arb_blocks_to_commit, }; -use diem_crypto::hash::CryptoHash; +use aptos_crypto::hash::CryptoHash; #[allow(unused_imports)] -use diem_jellyfish_merkle::node_type::{Node, NodeKey}; -use diem_temppath::TempPath; -use diem_types::transaction::Transaction; +use aptos_jellyfish_merkle::node_type::{Node, NodeKey}; +use aptos_temppath::TempPath; +use aptos_types::transaction::Transaction; #[allow(unused_imports)] -use diem_types::{ +use aptos_types::{ account_address::{AccountAddress, HashAccountAddress}, account_config::AccountResource, contract_event::ContractEvent, diff --git a/storage/diemdb/src/diemsum/mod.rs b/storage/aptosdb/src/aptossum/mod.rs similarity index 98% rename from storage/diemdb/src/diemsum/mod.rs rename to storage/aptosdb/src/aptossum/mod.rs index 2b11be48927cc..f04f680edb65e 100644 --- a/storage/diemdb/src/diemsum/mod.rs +++ b/storage/aptosdb/src/aptossum/mod.rs @@ -3,8 +3,8 @@ use crate::{DiemDB, Order, MAX_LIMIT}; use anyhow::{ensure, format_err, Result}; -use diem_config::config::RocksdbConfig; -use diem_types::{ +use aptos_config::config::RocksdbConfig; +use aptos_types::{ account_address::AccountAddress, account_state_blob::AccountStateBlob, contract_event::ContractEvent, diff --git a/storage/diemdb/src/backup/backup_handler.rs b/storage/aptosdb/src/backup/backup_handler.rs similarity index 98% rename from storage/diemdb/src/backup/backup_handler.rs rename to storage/aptosdb/src/backup/backup_handler.rs index c32a3270241fc..a53450a9e30ba 100644 --- a/storage/diemdb/src/backup/backup_handler.rs +++ b/storage/aptosdb/src/backup/backup_handler.rs @@ -12,9 +12,9 @@ use crate::{ transaction_store::TransactionStore, }; use anyhow::{anyhow, ensure, Result}; -use diem_crypto::hash::HashValue; -use diem_jellyfish_merkle::iterator::JellyfishMerkleIterator; -use diem_types::{ +use aptos_crypto::hash::HashValue; +use aptos_jellyfish_merkle::iterator::JellyfishMerkleIterator; +use aptos_types::{ account_state_blob::AccountStateBlob, contract_event::ContractEvent, ledger_info::LedgerInfoWithSignatures, diff --git a/storage/diemdb/src/backup/mod.rs b/storage/aptosdb/src/backup/mod.rs similarity index 100% rename from storage/diemdb/src/backup/mod.rs rename to storage/aptosdb/src/backup/mod.rs diff --git a/storage/diemdb/src/backup/restore_handler.rs b/storage/aptosdb/src/backup/restore_handler.rs similarity index 95% rename from storage/diemdb/src/backup/restore_handler.rs rename to storage/aptosdb/src/backup/restore_handler.rs index 29bcca97e9305..e5d3b1fe091c0 100644 --- a/storage/diemdb/src/backup/restore_handler.rs +++ b/storage/aptosdb/src/backup/restore_handler.rs @@ -7,9 +7,9 @@ use crate::{ transaction_store::TransactionStore, DiemDB, }; use anyhow::{ensure, Result}; -use diem_crypto::{hash::SPARSE_MERKLE_PLACEHOLDER_HASH, HashValue}; -use diem_jellyfish_merkle::restore::JellyfishMerkleRestore; -use diem_types::{ +use aptos_crypto::{hash::SPARSE_MERKLE_PLACEHOLDER_HASH, HashValue}; +use aptos_jellyfish_merkle::restore::JellyfishMerkleRestore; +use aptos_types::{ account_state_blob::AccountStateBlob, contract_event::ContractEvent, ledger_info::LedgerInfoWithSignatures, @@ -24,7 +24,7 @@ use storage_interface::{DbReader, TreeState}; #[derive(Clone)] pub struct RestoreHandler { db: Arc, - pub diemdb: Arc, + pub aptosdb: Arc, ledger_store: Arc, transaction_store: Arc, state_store: Arc, @@ -34,7 +34,7 @@ pub struct RestoreHandler { impl RestoreHandler { pub(crate) fn new( db: Arc, - diemdb: Arc, + aptosdb: Arc, ledger_store: Arc, transaction_store: Arc, state_store: Arc, @@ -42,7 +42,7 @@ impl RestoreHandler { ) -> Self { Self { db, - diemdb, + aptosdb, ledger_store, transaction_store, state_store, @@ -162,7 +162,7 @@ impl RestoreHandler { pub fn get_next_expected_transaction_version(&self) -> Result { Ok(self - .diemdb + .aptosdb .get_latest_transaction_info_option()? .map_or(0, |(ver, _txn_info)| ver + 1)) } diff --git a/storage/diemdb/src/backup/test.rs b/storage/aptosdb/src/backup/test.rs similarity index 97% rename from storage/diemdb/src/backup/test.rs rename to storage/aptosdb/src/backup/test.rs index da32196c9167e..dacdce6c78bb3 100644 --- a/storage/diemdb/src/backup/test.rs +++ b/storage/aptosdb/src/backup/test.rs @@ -3,7 +3,7 @@ use crate::{test_helper::arb_blocks_to_commit, DiemDB}; use anyhow::Result; -use diem_temppath::TempPath; +use aptos_temppath::TempPath; use proptest::prelude::*; use storage_interface::DbWriter; diff --git a/storage/diemdb/src/change_set.rs b/storage/aptosdb/src/change_set.rs similarity index 97% rename from storage/diemdb/src/change_set.rs rename to storage/aptosdb/src/change_set.rs index 3c1373c1e1340..556d636458e01 100644 --- a/storage/diemdb/src/change_set.rs +++ b/storage/aptosdb/src/change_set.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 use crate::ledger_counters::LedgerCounterBumps; -use diem_types::transaction::Version; +use aptos_types::transaction::Version; use schemadb::SchemaBatch; use std::collections::HashMap; diff --git a/storage/diemdb/src/errors.rs b/storage/aptosdb/src/errors.rs similarity index 100% rename from storage/diemdb/src/errors.rs rename to storage/aptosdb/src/errors.rs diff --git a/storage/diemdb/src/event_store/mod.rs b/storage/aptosdb/src/event_store/mod.rs similarity index 99% rename from storage/diemdb/src/event_store/mod.rs rename to storage/aptosdb/src/event_store/mod.rs index 8af03b641a1bd..9ff0ec6c7e54f 100644 --- a/storage/diemdb/src/event_store/mod.rs +++ b/storage/aptosdb/src/event_store/mod.rs @@ -17,11 +17,11 @@ use crate::{ }; use accumulator::{HashReader, MerkleAccumulator}; use anyhow::{ensure, format_err, Result}; -use diem_crypto::{ +use aptos_crypto::{ hash::{CryptoHash, EventAccumulatorHasher}, HashValue, }; -use diem_types::{ +use aptos_types::{ account_address::AccountAddress, account_config::NewBlockEvent, block_metadata::new_block_event_key, diff --git a/storage/diemdb/src/event_store/test.rs b/storage/aptosdb/src/event_store/test.rs similarity index 98% rename from storage/diemdb/src/event_store/test.rs rename to storage/aptosdb/src/event_store/test.rs index 7b5bcbaf6b4f7..1ca7f5d322a54 100644 --- a/storage/diemdb/src/event_store/test.rs +++ b/storage/aptosdb/src/event_store/test.rs @@ -3,10 +3,10 @@ use super::*; use crate::DiemDB; -use diem_crypto::hash::ACCUMULATOR_PLACEHOLDER_HASH; -use diem_proptest_helpers::Index; -use diem_temppath::TempPath; -use diem_types::{ +use aptos_crypto::hash::ACCUMULATOR_PLACEHOLDER_HASH; +use aptos_proptest_helpers::Index; +use aptos_temppath::TempPath; +use aptos_types::{ account_address::AccountAddress, contract_event::ContractEvent, event::EventKey, diff --git a/storage/diemdb/src/ledger_counters/mod.rs b/storage/aptosdb/src/ledger_counters/mod.rs similarity index 100% rename from storage/diemdb/src/ledger_counters/mod.rs rename to storage/aptosdb/src/ledger_counters/mod.rs diff --git a/storage/diemdb/src/ledger_counters/test.rs b/storage/aptosdb/src/ledger_counters/test.rs similarity index 100% rename from storage/diemdb/src/ledger_counters/test.rs rename to storage/aptosdb/src/ledger_counters/test.rs diff --git a/storage/diemdb/src/ledger_store/ledger_info_test.rs b/storage/aptosdb/src/ledger_store/ledger_info_test.rs similarity index 99% rename from storage/diemdb/src/ledger_store/ledger_info_test.rs rename to storage/aptosdb/src/ledger_store/ledger_info_test.rs index 10b797d49bbd2..cad7283abbb24 100644 --- a/storage/diemdb/src/ledger_store/ledger_info_test.rs +++ b/storage/aptosdb/src/ledger_store/ledger_info_test.rs @@ -3,8 +3,8 @@ use super::*; use crate::{change_set::ChangeSet, DiemDB}; -use diem_temppath::TempPath; -use diem_types::{ +use aptos_temppath::TempPath; +use aptos_types::{ proptest_types::{AccountInfoUniverse, LedgerInfoWithSignaturesGen}, transaction::Version, }; diff --git a/storage/diemdb/src/ledger_store/mod.rs b/storage/aptosdb/src/ledger_store/mod.rs similarity index 99% rename from storage/diemdb/src/ledger_store/mod.rs rename to storage/aptosdb/src/ledger_store/mod.rs index 81cfde6494e3c..793f81da493e3 100644 --- a/storage/diemdb/src/ledger_store/mod.rs +++ b/storage/aptosdb/src/ledger_store/mod.rs @@ -15,12 +15,11 @@ use crate::{ }; use accumulator::{HashReader, MerkleAccumulator}; use anyhow::{ensure, format_err, Result}; -use arc_swap::ArcSwap; -use diem_crypto::{ +use aptos_crypto::{ hash::{CryptoHash, TransactionAccumulatorHasher}, HashValue, }; -use diem_types::{ +use aptos_types::{ epoch_state::EpochState, ledger_info::LedgerInfoWithSignatures, proof::{ @@ -29,6 +28,7 @@ use diem_types::{ }, transaction::{TransactionInfo, Version}, }; +use arc_swap::ArcSwap; use itertools::Itertools; use schemadb::{ReadOptions, SchemaIterator, DB}; use std::{ops::Deref, sync::Arc}; diff --git a/storage/diemdb/src/ledger_store/transaction_info_test.rs b/storage/aptosdb/src/ledger_store/transaction_info_test.rs similarity index 99% rename from storage/diemdb/src/ledger_store/transaction_info_test.rs rename to storage/aptosdb/src/ledger_store/transaction_info_test.rs index cea7fb8f7fdfd..ec77e7128a34b 100644 --- a/storage/diemdb/src/ledger_store/transaction_info_test.rs +++ b/storage/aptosdb/src/ledger_store/transaction_info_test.rs @@ -3,7 +3,7 @@ use super::*; use crate::DiemDB; -use diem_temppath::TempPath; +use aptos_temppath::TempPath; use proptest::{collection::vec, prelude::*}; fn verify( diff --git a/storage/diemdb/src/lib.rs b/storage/aptosdb/src/lib.rs similarity index 99% rename from storage/diemdb/src/lib.rs rename to storage/aptosdb/src/lib.rs index 1dfcd06706ee9..9a6c3a9c29062 100644 --- a/storage/diemdb/src/lib.rs +++ b/storage/aptosdb/src/lib.rs @@ -9,8 +9,8 @@ //! It relays read/write operations on the physical storage via [`schemadb`] to the underlying //! Key-Value storage system, and implements diem data structures on top of it. -#[cfg(any(feature = "diemsum"))] -pub mod diemsum; +#[cfg(any(feature = "aptossum"))] +pub mod aptossum; // Used in this and other crates for testing. #[cfg(any(test, feature = "fuzzing"))] pub mod test_helper; @@ -31,10 +31,10 @@ mod transaction_store; #[cfg(any(test, feature = "fuzzing"))] #[allow(dead_code)] -mod diemdb_test; +mod aptosdb_test; #[cfg(feature = "fuzzing")] -pub use diemdb_test::test_save_blocks_impl; +pub use aptosdb_test::test_save_blocks_impl; use crate::{ backup::{backup_handler::BackupHandler, restore_handler::RestoreHandler}, @@ -56,10 +56,10 @@ use crate::{ transaction_store::TransactionStore, }; use anyhow::{ensure, format_err, Result}; -use diem_config::config::RocksdbConfig; -use diem_crypto::hash::{HashValue, SPARSE_MERKLE_PLACEHOLDER_HASH}; -use diem_logger::prelude::*; -use diem_types::{ +use aptos_config::config::RocksdbConfig; +use aptos_crypto::hash::{HashValue, SPARSE_MERKLE_PLACEHOLDER_HASH}; +use aptos_logger::prelude::*; +use aptos_types::{ account_address::AccountAddress, account_state::AccountState, account_state_blob::{AccountStateBlob, AccountStateWithProof, AccountStatesChunkWithProof}, @@ -271,7 +271,7 @@ impl DiemDB { "Do not set prune_window when opening readonly.", ); - let path = db_root_path.as_ref().join("diemdb"); + let path = db_root_path.as_ref().join("aptosdb"); let instant = Instant::now(); let mut rocksdb_opts = gen_rocksdb_options(&rocksdb_config); @@ -280,7 +280,7 @@ impl DiemDB { ( DB::open_readonly( path.clone(), - "diemdb_ro", + "aptosdb_ro", Self::column_families(), &rocksdb_opts, )?, @@ -292,7 +292,7 @@ impl DiemDB { ( DB::open( path.clone(), - "diemdb", + "aptosdb", Self::column_families(), &rocksdb_opts, )?, @@ -314,7 +314,7 @@ impl DiemDB { secondary_path: P, mut rocksdb_config: RocksdbConfig, ) -> Result { - let primary_path = db_root_path.as_ref().join("diemdb"); + let primary_path = db_root_path.as_ref().join("aptosdb"); let secondary_path = secondary_path.as_ref().to_path_buf(); // Secondary needs `max_open_files = -1` per https://github.com/facebook/rocksdb/wiki/Secondary-instance rocksdb_config.max_open_files = -1; @@ -324,7 +324,7 @@ impl DiemDB { DB::open_as_secondary( primary_path, secondary_path, - "diemdb_sec", + "aptosdb_sec", Self::column_families(), &rocksdb_opts, )?, diff --git a/storage/diemdb/src/metrics.rs b/storage/aptosdb/src/metrics.rs similarity index 94% rename from storage/diemdb/src/metrics.rs rename to storage/aptosdb/src/metrics.rs index 454a7732eac97..b48b96990b21e 100644 --- a/storage/diemdb/src/metrics.rs +++ b/storage/aptosdb/src/metrics.rs @@ -1,7 +1,7 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_metrics::{ +use aptos_metrics::{ register_histogram_vec, register_int_counter, register_int_gauge, register_int_gauge_vec, HistogramVec, IntCounter, IntGauge, IntGaugeVec, }; @@ -112,7 +112,7 @@ pub static DIEM_STORAGE_ROCKSDB_PROPERTIES: Lazy = Lazy::new(|| { pub(crate) static BACKUP_EPOCH_ENDING_EPOCH: Lazy = Lazy::new(|| { register_int_gauge!( - "diem_backup_handler_epoch_ending_epoch", + "aptos_backup_handler_epoch_ending_epoch", "Current epoch returned in an epoch ending backup." ) .unwrap() @@ -120,7 +120,7 @@ pub(crate) static BACKUP_EPOCH_ENDING_EPOCH: Lazy = Lazy::new(|| { pub(crate) static BACKUP_TXN_VERSION: Lazy = Lazy::new(|| { register_int_gauge!( - "diem_backup_handler_transaction_version", + "aptos_backup_handler_transaction_version", "Current version returned in a transaction backup." ) .unwrap() @@ -128,7 +128,7 @@ pub(crate) static BACKUP_TXN_VERSION: Lazy = Lazy::new(|| { pub(crate) static BACKUP_STATE_SNAPSHOT_VERSION: Lazy = Lazy::new(|| { register_int_gauge!( - "diem_backup_handler_state_snapshot_version", + "aptos_backup_handler_state_snapshot_version", "Version of requested state snapshot backup." ) .unwrap() @@ -136,7 +136,7 @@ pub(crate) static BACKUP_STATE_SNAPSHOT_VERSION: Lazy = Lazy::new(|| { pub(crate) static BACKUP_STATE_SNAPSHOT_LEAF_IDX: Lazy = Lazy::new(|| { register_int_gauge!( - "diem_backup_handler_state_snapshot_leaf_index", + "aptos_backup_handler_state_snapshot_leaf_index", "Index of current leaf index returned in a state snapshot backup." ) .unwrap() diff --git a/storage/diemdb/src/pruner/mod.rs b/storage/aptosdb/src/pruner/mod.rs similarity index 98% rename from storage/diemdb/src/pruner/mod.rs rename to storage/aptosdb/src/pruner/mod.rs index 74cc5e58da960..6d0104fc53577 100644 --- a/storage/diemdb/src/pruner/mod.rs +++ b/storage/aptosdb/src/pruner/mod.rs @@ -14,10 +14,10 @@ use crate::{ }, }; use anyhow::Result; -use diem_infallible::Mutex; -use diem_jellyfish_merkle::StaleNodeIndex; -use diem_logger::prelude::*; -use diem_types::transaction::Version; +use aptos_infallible::Mutex; +use aptos_jellyfish_merkle::StaleNodeIndex; +use aptos_logger::prelude::*; +use aptos_types::transaction::Version; use schemadb::{ReadOptions, SchemaBatch, SchemaIterator, DB}; use std::{ iter::Peekable, @@ -61,7 +61,7 @@ impl Pruner { DIEM_STORAGE_PRUNE_WINDOW.set(historical_versions_to_keep as i64); let worker_thread = std::thread::Builder::new() - .name("diemdb_pruner".into()) + .name("aptosdb_pruner".into()) .spawn(move || Worker::new(db, command_receiver, worker_progress_clone).work()) .expect("Creating pruner thread should succeed."); diff --git a/storage/diemdb/src/pruner/test.rs b/storage/aptosdb/src/pruner/test.rs similarity index 97% rename from storage/diemdb/src/pruner/test.rs rename to storage/aptosdb/src/pruner/test.rs index bf3ac5d5856e2..cbfadc80c6b1f 100644 --- a/storage/diemdb/src/pruner/test.rs +++ b/storage/aptosdb/src/pruner/test.rs @@ -3,9 +3,9 @@ use super::*; use crate::{change_set::ChangeSet, state_store::StateStore, DiemDB}; -use diem_crypto::HashValue; -use diem_temppath::TempPath; -use diem_types::{account_address::AccountAddress, account_state_blob::AccountStateBlob}; +use aptos_crypto::HashValue; +use aptos_temppath::TempPath; +use aptos_types::{account_address::AccountAddress, account_state_blob::AccountStateBlob}; use std::collections::HashMap; fn put_account_state_set( diff --git a/storage/diemdb/src/schema/epoch_by_version/mod.rs b/storage/aptosdb/src/schema/epoch_by_version/mod.rs similarity index 97% rename from storage/diemdb/src/schema/epoch_by_version/mod.rs rename to storage/aptosdb/src/schema/epoch_by_version/mod.rs index 4f7cb739b3e79..d639618eb6c53 100644 --- a/storage/diemdb/src/schema/epoch_by_version/mod.rs +++ b/storage/aptosdb/src/schema/epoch_by_version/mod.rs @@ -16,8 +16,8 @@ use crate::schema::{ensure_slice_len_eq, EPOCH_BY_VERSION_CF_NAME}; use anyhow::Result; +use aptos_types::transaction::Version; use byteorder::{BigEndian, ReadBytesExt}; -use diem_types::transaction::Version; use schemadb::{ define_schema, schema::{KeyCodec, ValueCodec}, diff --git a/storage/diemdb/src/schema/epoch_by_version/test.rs b/storage/aptosdb/src/schema/epoch_by_version/test.rs similarity index 100% rename from storage/diemdb/src/schema/epoch_by_version/test.rs rename to storage/aptosdb/src/schema/epoch_by_version/test.rs diff --git a/storage/diemdb/src/schema/event/mod.rs b/storage/aptosdb/src/schema/event/mod.rs similarity index 96% rename from storage/diemdb/src/schema/event/mod.rs rename to storage/aptosdb/src/schema/event/mod.rs index 75160ce2b6664..d480d0de98f34 100644 --- a/storage/diemdb/src/schema/event/mod.rs +++ b/storage/aptosdb/src/schema/event/mod.rs @@ -12,8 +12,8 @@ use crate::schema::{ensure_slice_len_eq, EVENT_CF_NAME}; use anyhow::Result; +use aptos_types::{contract_event::ContractEvent, transaction::Version}; use byteorder::{BigEndian, ReadBytesExt, WriteBytesExt}; -use diem_types::{contract_event::ContractEvent, transaction::Version}; use schemadb::{ define_schema, schema::{KeyCodec, SeekKeyCodec, ValueCodec}, diff --git a/storage/diemdb/src/schema/event/test.rs b/storage/aptosdb/src/schema/event/test.rs similarity index 100% rename from storage/diemdb/src/schema/event/test.rs rename to storage/aptosdb/src/schema/event/test.rs diff --git a/storage/diemdb/src/schema/event_accumulator/mod.rs b/storage/aptosdb/src/schema/event_accumulator/mod.rs similarity index 94% rename from storage/diemdb/src/schema/event_accumulator/mod.rs rename to storage/aptosdb/src/schema/event_accumulator/mod.rs index ffc4ded0dca13..02cd0580184c3 100644 --- a/storage/diemdb/src/schema/event_accumulator/mod.rs +++ b/storage/aptosdb/src/schema/event_accumulator/mod.rs @@ -12,9 +12,9 @@ use crate::schema::{ensure_slice_len_eq, EVENT_ACCUMULATOR_CF_NAME}; use anyhow::Result; +use aptos_crypto::hash::HashValue; +use aptos_types::{proof::position::Position, transaction::Version}; use byteorder::{BigEndian, ReadBytesExt, WriteBytesExt}; -use diem_crypto::hash::HashValue; -use diem_types::{proof::position::Position, transaction::Version}; use schemadb::{ define_schema, schema::{KeyCodec, ValueCodec}, diff --git a/storage/diemdb/src/schema/event_accumulator/test.rs b/storage/aptosdb/src/schema/event_accumulator/test.rs similarity index 100% rename from storage/diemdb/src/schema/event_accumulator/test.rs rename to storage/aptosdb/src/schema/event_accumulator/test.rs diff --git a/storage/diemdb/src/schema/event_by_key/mod.rs b/storage/aptosdb/src/schema/event_by_key/mod.rs similarity index 97% rename from storage/diemdb/src/schema/event_by_key/mod.rs rename to storage/aptosdb/src/schema/event_by_key/mod.rs index 671270dc42f13..90cdac2650ae4 100644 --- a/storage/diemdb/src/schema/event_by_key/mod.rs +++ b/storage/aptosdb/src/schema/event_by_key/mod.rs @@ -12,8 +12,8 @@ use crate::schema::{ensure_slice_len_eq, EVENT_BY_KEY_CF_NAME}; use anyhow::Result; +use aptos_types::{event::EventKey, transaction::Version}; use byteorder::{BigEndian, ReadBytesExt, WriteBytesExt}; -use diem_types::{event::EventKey, transaction::Version}; use schemadb::{ define_schema, schema::{KeyCodec, ValueCodec}, diff --git a/storage/diemdb/src/schema/event_by_key/test.rs b/storage/aptosdb/src/schema/event_by_key/test.rs similarity index 100% rename from storage/diemdb/src/schema/event_by_key/test.rs rename to storage/aptosdb/src/schema/event_by_key/test.rs diff --git a/storage/diemdb/src/schema/event_by_version/mod.rs b/storage/aptosdb/src/schema/event_by_version/mod.rs similarity index 97% rename from storage/diemdb/src/schema/event_by_version/mod.rs rename to storage/aptosdb/src/schema/event_by_version/mod.rs index fc193b14daeee..5e86f09c80646 100644 --- a/storage/diemdb/src/schema/event_by_version/mod.rs +++ b/storage/aptosdb/src/schema/event_by_version/mod.rs @@ -12,8 +12,8 @@ use crate::schema::{ensure_slice_len_eq, EVENT_BY_VERSION_CF_NAME}; use anyhow::Result; +use aptos_types::{event::EventKey, transaction::Version}; use byteorder::{BigEndian, ReadBytesExt, WriteBytesExt}; -use diem_types::{event::EventKey, transaction::Version}; use schemadb::{ define_schema, schema::{KeyCodec, ValueCodec}, diff --git a/storage/diemdb/src/schema/event_by_version/test.rs b/storage/aptosdb/src/schema/event_by_version/test.rs similarity index 100% rename from storage/diemdb/src/schema/event_by_version/test.rs rename to storage/aptosdb/src/schema/event_by_version/test.rs diff --git a/storage/diemdb/src/schema/jellyfish_merkle_node/mod.rs b/storage/aptosdb/src/schema/jellyfish_merkle_node/mod.rs similarity index 87% rename from storage/diemdb/src/schema/jellyfish_merkle_node/mod.rs rename to storage/aptosdb/src/schema/jellyfish_merkle_node/mod.rs index 2708ce3ea692c..d019305de26c6 100644 --- a/storage/diemdb/src/schema/jellyfish_merkle_node/mod.rs +++ b/storage/aptosdb/src/schema/jellyfish_merkle_node/mod.rs @@ -10,16 +10,16 @@ use crate::schema::JELLYFISH_MERKLE_NODE_CF_NAME; use anyhow::Result; +use aptos_jellyfish_merkle::node_type::NodeKey; +use aptos_types::{account_state_blob::AccountStateBlob, transaction::Version}; use byteorder::{BigEndian, WriteBytesExt}; -use diem_jellyfish_merkle::node_type::NodeKey; -use diem_types::{account_state_blob::AccountStateBlob, transaction::Version}; use schemadb::{ define_schema, schema::{KeyCodec, SeekKeyCodec, ValueCodec}, }; use std::mem::size_of; -type Node = diem_jellyfish_merkle::node_type::Node; +type Node = aptos_jellyfish_merkle::node_type::Node; define_schema!( JellyfishMerkleNodeSchema, diff --git a/storage/diemdb/src/schema/jellyfish_merkle_node/test.rs b/storage/aptosdb/src/schema/jellyfish_merkle_node/test.rs similarity index 82% rename from storage/diemdb/src/schema/jellyfish_merkle_node/test.rs rename to storage/aptosdb/src/schema/jellyfish_merkle_node/test.rs index 3eb6f5329d641..e8a83cfbbce47 100644 --- a/storage/diemdb/src/schema/jellyfish_merkle_node/test.rs +++ b/storage/aptosdb/src/schema/jellyfish_merkle_node/test.rs @@ -2,9 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 use super::*; -use diem_crypto::HashValue; -use diem_jellyfish_merkle::node_type::Node; -use diem_types::account_state_blob::AccountStateBlob; +use aptos_crypto::HashValue; +use aptos_jellyfish_merkle::node_type::Node; +use aptos_types::account_state_blob::AccountStateBlob; use proptest::prelude::*; use schemadb::{schema::fuzzing::assert_encode_decode, test_no_panic_decoding}; diff --git a/storage/diemdb/src/schema/ledger_counters/mod.rs b/storage/aptosdb/src/schema/ledger_counters/mod.rs similarity index 97% rename from storage/diemdb/src/schema/ledger_counters/mod.rs rename to storage/aptosdb/src/schema/ledger_counters/mod.rs index 8bcb829c72a25..863f4b5e6dd33 100644 --- a/storage/diemdb/src/schema/ledger_counters/mod.rs +++ b/storage/aptosdb/src/schema/ledger_counters/mod.rs @@ -15,8 +15,8 @@ use super::LEDGER_COUNTERS_CF_NAME; use crate::{ledger_counters::LedgerCounters, schema::ensure_slice_len_eq}; use anyhow::Result; +use aptos_types::transaction::Version; use byteorder::{BigEndian, ReadBytesExt}; -use diem_types::transaction::Version; use schemadb::{ define_schema, schema::{KeyCodec, ValueCodec}, diff --git a/storage/diemdb/src/schema/ledger_counters/test.rs b/storage/aptosdb/src/schema/ledger_counters/test.rs similarity index 100% rename from storage/diemdb/src/schema/ledger_counters/test.rs rename to storage/aptosdb/src/schema/ledger_counters/test.rs diff --git a/storage/diemdb/src/schema/ledger_info/mod.rs b/storage/aptosdb/src/schema/ledger_info/mod.rs similarity index 96% rename from storage/diemdb/src/schema/ledger_info/mod.rs rename to storage/aptosdb/src/schema/ledger_info/mod.rs index efafaed9c54c1..c1cfb39e35045 100644 --- a/storage/diemdb/src/schema/ledger_info/mod.rs +++ b/storage/aptosdb/src/schema/ledger_info/mod.rs @@ -14,8 +14,8 @@ use crate::schema::ensure_slice_len_eq; use anyhow::Result; +use aptos_types::ledger_info::LedgerInfoWithSignatures; use byteorder::{BigEndian, ReadBytesExt}; -use diem_types::ledger_info::LedgerInfoWithSignatures; use schemadb::{ define_schema, schema::{KeyCodec, ValueCodec}, diff --git a/storage/diemdb/src/schema/ledger_info/test.rs b/storage/aptosdb/src/schema/ledger_info/test.rs similarity index 90% rename from storage/diemdb/src/schema/ledger_info/test.rs rename to storage/aptosdb/src/schema/ledger_info/test.rs index 62e561d953d1b..6573c28858b55 100644 --- a/storage/diemdb/src/schema/ledger_info/test.rs +++ b/storage/aptosdb/src/schema/ledger_info/test.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 use super::*; -use diem_types::ledger_info::LedgerInfoWithSignatures; +use aptos_types::ledger_info::LedgerInfoWithSignatures; use proptest::prelude::*; use schemadb::{schema::fuzzing::assert_encode_decode, test_no_panic_decoding}; diff --git a/storage/diemdb/src/schema/mod.rs b/storage/aptosdb/src/schema/mod.rs similarity index 100% rename from storage/diemdb/src/schema/mod.rs rename to storage/aptosdb/src/schema/mod.rs diff --git a/storage/diemdb/src/schema/stale_node_index/mod.rs b/storage/aptosdb/src/schema/stale_node_index/mod.rs similarity index 95% rename from storage/diemdb/src/schema/stale_node_index/mod.rs rename to storage/aptosdb/src/schema/stale_node_index/mod.rs index e7b01c5d45613..0f80b8b2d40fd 100644 --- a/storage/diemdb/src/schema/stale_node_index/mod.rs +++ b/storage/aptosdb/src/schema/stale_node_index/mod.rs @@ -19,9 +19,9 @@ use crate::schema::{ensure_slice_len_eq, ensure_slice_len_gt, STALE_NODE_INDEX_CF_NAME}; use anyhow::Result; +use aptos_jellyfish_merkle::{node_type::NodeKey, StaleNodeIndex}; +use aptos_types::transaction::Version; use byteorder::{BigEndian, ReadBytesExt, WriteBytesExt}; -use diem_jellyfish_merkle::{node_type::NodeKey, StaleNodeIndex}; -use diem_types::transaction::Version; use schemadb::{ define_schema, schema::{KeyCodec, SeekKeyCodec, ValueCodec}, diff --git a/storage/diemdb/src/schema/stale_node_index/test.rs b/storage/aptosdb/src/schema/stale_node_index/test.rs similarity index 100% rename from storage/diemdb/src/schema/stale_node_index/test.rs rename to storage/aptosdb/src/schema/stale_node_index/test.rs diff --git a/storage/diemdb/src/schema/transaction/mod.rs b/storage/aptosdb/src/schema/transaction/mod.rs similarity index 96% rename from storage/diemdb/src/schema/transaction/mod.rs rename to storage/aptosdb/src/schema/transaction/mod.rs index f4e26744f33c6..c57dc40da7042 100644 --- a/storage/diemdb/src/schema/transaction/mod.rs +++ b/storage/aptosdb/src/schema/transaction/mod.rs @@ -14,8 +14,8 @@ use crate::schema::{ensure_slice_len_eq, TRANSACTION_CF_NAME}; use anyhow::Result; +use aptos_types::transaction::{Transaction, Version}; use byteorder::{BigEndian, ReadBytesExt}; -use diem_types::transaction::{Transaction, Version}; use schemadb::{ define_schema, schema::{KeyCodec, ValueCodec}, diff --git a/storage/diemdb/src/schema/transaction/test.rs b/storage/aptosdb/src/schema/transaction/test.rs similarity index 100% rename from storage/diemdb/src/schema/transaction/test.rs rename to storage/aptosdb/src/schema/transaction/test.rs diff --git a/storage/diemdb/src/schema/transaction_accumulator/mod.rs b/storage/aptosdb/src/schema/transaction_accumulator/mod.rs similarity index 94% rename from storage/diemdb/src/schema/transaction_accumulator/mod.rs rename to storage/aptosdb/src/schema/transaction_accumulator/mod.rs index 31671c97977e1..a372dbb4af8be 100644 --- a/storage/diemdb/src/schema/transaction_accumulator/mod.rs +++ b/storage/aptosdb/src/schema/transaction_accumulator/mod.rs @@ -12,9 +12,9 @@ use crate::schema::{ensure_slice_len_eq, TRANSACTION_ACCUMULATOR_CF_NAME}; use anyhow::Result; +use aptos_crypto::HashValue; +use aptos_types::proof::position::Position; use byteorder::{BigEndian, ReadBytesExt}; -use diem_crypto::HashValue; -use diem_types::proof::position::Position; use schemadb::{ define_schema, schema::{KeyCodec, ValueCodec}, diff --git a/storage/diemdb/src/schema/transaction_accumulator/test.rs b/storage/aptosdb/src/schema/transaction_accumulator/test.rs similarity index 100% rename from storage/diemdb/src/schema/transaction_accumulator/test.rs rename to storage/aptosdb/src/schema/transaction_accumulator/test.rs diff --git a/storage/diemdb/src/schema/transaction_by_account/mod.rs b/storage/aptosdb/src/schema/transaction_by_account/mod.rs similarity index 96% rename from storage/diemdb/src/schema/transaction_by_account/mod.rs rename to storage/aptosdb/src/schema/transaction_by_account/mod.rs index 7e0bfa6ecc07d..7fb2be7d271f0 100644 --- a/storage/diemdb/src/schema/transaction_by_account/mod.rs +++ b/storage/aptosdb/src/schema/transaction_by_account/mod.rs @@ -12,8 +12,8 @@ use crate::schema::{ensure_slice_len_eq, TRANSACTION_BY_ACCOUNT_CF_NAME}; use anyhow::Result; +use aptos_types::{account_address::AccountAddress, transaction::Version}; use byteorder::{BigEndian, ReadBytesExt, WriteBytesExt}; -use diem_types::{account_address::AccountAddress, transaction::Version}; use schemadb::{ define_schema, schema::{KeyCodec, ValueCodec}, diff --git a/storage/diemdb/src/schema/transaction_by_account/test.rs b/storage/aptosdb/src/schema/transaction_by_account/test.rs similarity index 100% rename from storage/diemdb/src/schema/transaction_by_account/test.rs rename to storage/aptosdb/src/schema/transaction_by_account/test.rs diff --git a/storage/diemdb/src/schema/transaction_by_hash/mod.rs b/storage/aptosdb/src/schema/transaction_by_hash/mod.rs similarity index 95% rename from storage/diemdb/src/schema/transaction_by_hash/mod.rs rename to storage/aptosdb/src/schema/transaction_by_hash/mod.rs index 1e7dda0eb3425..308b7356b392e 100644 --- a/storage/diemdb/src/schema/transaction_by_hash/mod.rs +++ b/storage/aptosdb/src/schema/transaction_by_hash/mod.rs @@ -11,9 +11,9 @@ use crate::schema::{ensure_slice_len_eq, TRANSACTION_BY_HASH_CF_NAME}; use anyhow::Result; +use aptos_crypto::HashValue; +use aptos_types::transaction::Version; use byteorder::{BigEndian, ReadBytesExt}; -use diem_crypto::HashValue; -use diem_types::transaction::Version; use schemadb::{ define_schema, schema::{KeyCodec, ValueCodec}, diff --git a/storage/diemdb/src/schema/transaction_by_hash/test.rs b/storage/aptosdb/src/schema/transaction_by_hash/test.rs similarity index 100% rename from storage/diemdb/src/schema/transaction_by_hash/test.rs rename to storage/aptosdb/src/schema/transaction_by_hash/test.rs diff --git a/storage/diemdb/src/schema/transaction_info/mod.rs b/storage/aptosdb/src/schema/transaction_info/mod.rs similarity index 95% rename from storage/diemdb/src/schema/transaction_info/mod.rs rename to storage/aptosdb/src/schema/transaction_info/mod.rs index 2fb7a198cc315..1b2ad2f5a422c 100644 --- a/storage/diemdb/src/schema/transaction_info/mod.rs +++ b/storage/aptosdb/src/schema/transaction_info/mod.rs @@ -14,8 +14,8 @@ use crate::schema::{ensure_slice_len_eq, TRANSACTION_INFO_CF_NAME}; use anyhow::Result; +use aptos_types::transaction::{TransactionInfo, Version}; use byteorder::{BigEndian, ReadBytesExt}; -use diem_types::transaction::{TransactionInfo, Version}; use schemadb::{ define_schema, schema::{KeyCodec, ValueCodec}, diff --git a/storage/diemdb/src/schema/transaction_info/test.rs b/storage/aptosdb/src/schema/transaction_info/test.rs similarity index 88% rename from storage/diemdb/src/schema/transaction_info/test.rs rename to storage/aptosdb/src/schema/transaction_info/test.rs index 6ee27d054269a..7aad679fec262 100644 --- a/storage/diemdb/src/schema/transaction_info/test.rs +++ b/storage/aptosdb/src/schema/transaction_info/test.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 use super::*; -use diem_types::transaction::{TransactionInfo, Version}; +use aptos_types::transaction::{TransactionInfo, Version}; use proptest::prelude::*; use schemadb::{schema::fuzzing::assert_encode_decode, test_no_panic_decoding}; diff --git a/storage/diemdb/src/schema/write_set/mod.rs b/storage/aptosdb/src/schema/write_set/mod.rs similarity index 95% rename from storage/diemdb/src/schema/write_set/mod.rs rename to storage/aptosdb/src/schema/write_set/mod.rs index 0352c1dd55a13..3548b96558862 100644 --- a/storage/diemdb/src/schema/write_set/mod.rs +++ b/storage/aptosdb/src/schema/write_set/mod.rs @@ -15,8 +15,8 @@ use crate::schema::{ensure_slice_len_eq, WRITE_SET_CF_NAME}; use anyhow::Result; +use aptos_types::{transaction::Version, write_set::WriteSet}; use byteorder::{BigEndian, ReadBytesExt}; -use diem_types::{transaction::Version, write_set::WriteSet}; use schemadb::{ define_schema, schema::{KeyCodec, ValueCodec}, diff --git a/storage/diemdb/src/schema/write_set/test.rs b/storage/aptosdb/src/schema/write_set/test.rs similarity index 100% rename from storage/diemdb/src/schema/write_set/test.rs rename to storage/aptosdb/src/schema/write_set/test.rs diff --git a/storage/diemdb/src/state_store/mod.rs b/storage/aptosdb/src/state_store/mod.rs similarity index 97% rename from storage/diemdb/src/state_store/mod.rs rename to storage/aptosdb/src/state_store/mod.rs index 62a6c9c6c8c00..c3a0f8a6d4a2d 100644 --- a/storage/diemdb/src/state_store/mod.rs +++ b/storage/aptosdb/src/state_store/mod.rs @@ -15,12 +15,12 @@ use crate::{ DiemDbError, }; use anyhow::{ensure, Result}; -use diem_crypto::HashValue; -use diem_jellyfish_merkle::{ +use aptos_crypto::HashValue; +use aptos_jellyfish_merkle::{ iterator::JellyfishMerkleIterator, node_type::NodeKey, restore::JellyfishMerkleRestore, JellyfishMerkleTree, TreeReader, TreeWriter, }; -use diem_types::{ +use aptos_types::{ account_address::{AccountAddress, HashAccountAddress}, account_state_blob::{AccountStateBlob, AccountStatesChunkWithProof}, nibble::{nibble_path::NibblePath, ROOT_NIBBLE_HEIGHT}, @@ -32,9 +32,9 @@ use schemadb::{SchemaBatch, DB}; use std::{collections::HashMap, sync::Arc}; use storage_interface::StateSnapshotReceiver; -type LeafNode = diem_jellyfish_merkle::node_type::LeafNode; -type Node = diem_jellyfish_merkle::node_type::Node; -type NodeBatch = diem_jellyfish_merkle::NodeBatch; +type LeafNode = aptos_jellyfish_merkle::node_type::LeafNode; +type Node = aptos_jellyfish_merkle::node_type::Node; +type NodeBatch = aptos_jellyfish_merkle::NodeBatch; #[derive(Debug)] pub(crate) struct StateStore { diff --git a/storage/diemdb/src/state_store/state_store_test.rs b/storage/aptosdb/src/state_store/state_store_test.rs similarity index 99% rename from storage/diemdb/src/state_store/state_store_test.rs rename to storage/aptosdb/src/state_store/state_store_test.rs index f09f9779e92e1..5ac36446ad313 100644 --- a/storage/diemdb/src/state_store/state_store_test.rs +++ b/storage/aptosdb/src/state_store/state_store_test.rs @@ -3,10 +3,10 @@ use super::*; use crate::{pruner, DiemDB}; -use diem_config::config::RocksdbConfig; -use diem_jellyfish_merkle::restore::JellyfishMerkleRestore; -use diem_temppath::TempPath; -use diem_types::{ +use aptos_config::config::RocksdbConfig; +use aptos_jellyfish_merkle::restore::JellyfishMerkleRestore; +use aptos_temppath::TempPath; +use aptos_types::{ account_address::{AccountAddress, HashAccountAddress}, account_state_blob::AccountStateBlob, }; diff --git a/storage/diemdb/src/system_store/mod.rs b/storage/aptosdb/src/system_store/mod.rs similarity index 96% rename from storage/diemdb/src/system_store/mod.rs rename to storage/aptosdb/src/system_store/mod.rs index 4e48eabda9214..9af386fd4524e 100644 --- a/storage/diemdb/src/system_store/mod.rs +++ b/storage/aptosdb/src/system_store/mod.rs @@ -9,8 +9,8 @@ use crate::{ schema::ledger_counters::LedgerCountersSchema, }; use anyhow::Result; -use diem_logger::prelude::*; -use diem_types::transaction::Version; +use aptos_logger::prelude::*; +use aptos_types::transaction::Version; use schemadb::DB; use std::sync::Arc; diff --git a/storage/diemdb/src/system_store/test.rs b/storage/aptosdb/src/system_store/test.rs similarity index 99% rename from storage/diemdb/src/system_store/test.rs rename to storage/aptosdb/src/system_store/test.rs index 1142aeac6bc7d..1de7e63b45958 100644 --- a/storage/diemdb/src/system_store/test.rs +++ b/storage/aptosdb/src/system_store/test.rs @@ -7,7 +7,7 @@ use crate::{ ledger_counters::{LedgerCounter, LedgerCounterBumps}, DiemDB, }; -use diem_temppath::TempPath; +use aptos_temppath::TempPath; use std::collections::HashMap; fn bump_ledger_counters( diff --git a/storage/diemdb/src/test_helper.rs b/storage/aptosdb/src/test_helper.rs similarity index 97% rename from storage/diemdb/src/test_helper.rs rename to storage/aptosdb/src/test_helper.rs index 1ab6eb15392c4..be21beb8138b6 100644 --- a/storage/diemdb/src/test_helper.rs +++ b/storage/aptosdb/src/test_helper.rs @@ -3,8 +3,8 @@ ///! This module provides reusable helpers in tests. use super::*; -use diem_crypto::hash::{CryptoHash, EventAccumulatorHasher, TransactionAccumulatorHasher}; -use diem_types::{ +use aptos_crypto::hash::{CryptoHash, EventAccumulatorHasher, TransactionAccumulatorHasher}; +use aptos_types::{ account_address::HashAccountAddress, ledger_info::LedgerInfoWithSignatures, proof::accumulator::InMemoryAccumulator, diff --git a/storage/diemdb/src/transaction_store/mod.rs b/storage/aptosdb/src/transaction_store/mod.rs similarity index 99% rename from storage/diemdb/src/transaction_store/mod.rs rename to storage/aptosdb/src/transaction_store/mod.rs index baab58cd1988b..1fa433008fd29 100644 --- a/storage/diemdb/src/transaction_store/mod.rs +++ b/storage/aptosdb/src/transaction_store/mod.rs @@ -12,8 +12,8 @@ use crate::{ }, }; use anyhow::{ensure, format_err, Result}; -use diem_crypto::{hash::CryptoHash, HashValue}; -use diem_types::{ +use aptos_crypto::{hash::CryptoHash, HashValue}; +use aptos_types::{ account_address::AccountAddress, block_metadata::BlockMetadata, transaction::{Transaction, Version}, diff --git a/storage/diemdb/src/transaction_store/test.rs b/storage/aptosdb/src/transaction_store/test.rs similarity index 99% rename from storage/diemdb/src/transaction_store/test.rs rename to storage/aptosdb/src/transaction_store/test.rs index 8e77f3edbbc97..5245858b23c81 100644 --- a/storage/diemdb/src/transaction_store/test.rs +++ b/storage/aptosdb/src/transaction_store/test.rs @@ -3,9 +3,9 @@ use super::*; use crate::DiemDB; -use diem_proptest_helpers::Index; -use diem_temppath::TempPath; -use diem_types::{ +use aptos_proptest_helpers::Index; +use aptos_temppath::TempPath; +use aptos_types::{ block_metadata::BlockMetadata, proptest_types::{AccountInfoUniverse, SignatureCheckedTransactionGen}, transaction::{SignedTransaction, Transaction}, diff --git a/storage/diemsum/Cargo.toml b/storage/aptossum/Cargo.toml similarity index 51% rename from storage/diemsum/Cargo.toml rename to storage/aptossum/Cargo.toml index c331faf17ef65..d5773f69e0353 100644 --- a/storage/diemsum/Cargo.toml +++ b/storage/aptossum/Cargo.toml @@ -1,8 +1,8 @@ [package] -name = "diemsum" +name = "aptossum" version = "0.1.0" authors = ["Diem Association "] -description = "Diem diemdb data access tool for data analysis or human read" +description = "Diem aptosdb data access tool for data analysis or human read" repository = "https://github.com/diem/diem" homepage = "https://diem.com" license = "Apache-2.0" @@ -15,8 +15,8 @@ structopt = "0.3.21" serde = "1.0.124" serde_json = "1.0.64" -diemdb = { path = "../diemdb", features = ["diemsum"] } -diem-crypto = { path = "../../crates/diem-crypto" } -diem-types = { path = "../../types" } -diem-workspace-hack = { version = "0.1", path = "../../crates/diem-workspace-hack" } +aptosdb = { path = "../aptosdb", features = ["aptossum"] } +aptos-crypto = { path = "../../crates/aptos-crypto" } +aptos-types = { path = "../../types" } +aptos-workspace-hack = { version = "0.1", path = "../../crates/aptos-workspace-hack" } storage-interface = { path = "../storage-interface" } diff --git a/storage/diemsum/src/main.rs b/storage/aptossum/src/main.rs similarity index 85% rename from storage/diemsum/src/main.rs rename to storage/aptossum/src/main.rs index 40b95e7b4d593..d1686317da1f4 100644 --- a/storage/diemsum/src/main.rs +++ b/storage/aptossum/src/main.rs @@ -4,8 +4,8 @@ use anyhow::Result; -use diem_types::{account_address::AccountAddress, event::EventKey}; -use diemdb::diemsum::Diemsum; +use aptos_types::{account_address::AccountAddress, event::EventKey}; +use aptosdb::aptossum::Diemsum; use serde::Serialize; use serde_json::to_string_pretty; use std::path::PathBuf; @@ -17,7 +17,7 @@ use structopt::StructOpt; about = "A command line tool that offers multiple data access commands for DiemDB" )] struct Opt { - /// The parent dir of diemdb + /// The parent dir of aptosdb #[structopt(long = "db", parse(from_os_str))] db_dir: PathBuf, @@ -120,15 +120,15 @@ fn main() { fn run_cmd() -> Result<()> { let opt = Opt::from_args(); - let diemsum = Diemsum::new(opt.db_dir)?; + let aptossum = Diemsum::new(opt.db_dir)?; let is_json = opt.json; match opt.cmd { Command::Status => { - print(diemsum.get_startup_info()?, is_json)?; + print(aptossum.get_startup_info()?, is_json)?; } Command::Txn(txn_op) => match txn_op { TxnOp::Get { version } => { - print(&diemsum.get_txn_by_version(version)?, is_json)?; + print(&aptossum.get_txn_by_version(version)?, is_json)?; } TxnOp::Scan { from_version, @@ -136,10 +136,10 @@ fn run_cmd() -> Result<()> { } => { let to_version = match to_version { Some(to_version) => to_version, - None => diemsum.get_committed_version()?, + None => aptossum.get_committed_version()?, }; print( - diemsum.scan_txn_by_version(from_version, to_version)?, + aptossum.scan_txn_by_version(from_version, to_version)?, is_json, )?; } @@ -149,7 +149,7 @@ fn run_cmd() -> Result<()> { match account_cmd.account_op { AccountOp::Get { version } => { print( - diemsum.get_account_state_by_version(address, version)?, + aptossum.get_account_state_by_version(address, version)?, is_json, )?; } @@ -161,7 +161,7 @@ fn run_cmd() -> Result<()> { event_op, } => match event_op { EventOp::Get { seq } => { - print(diemsum.scan_events_by_seq(&event_key, seq, seq)?, is_json)?; + print(aptossum.scan_events_by_seq(&event_key, seq, seq)?, is_json)?; } EventOp::Scan { from_seq, to_seq } => { let to_seq = match to_seq { @@ -169,13 +169,13 @@ fn run_cmd() -> Result<()> { None => u64::max_value(), }; print( - diemsum.scan_events_by_seq(&event_key, from_seq, to_seq)?, + aptossum.scan_events_by_seq(&event_key, from_seq, to_seq)?, is_json, )?; } }, EventCmd::EventByVersion { version } => { - print(diemsum.get_events_by_version(version)?, is_json)?; + print(aptossum.get_events_by_version(version)?, is_json)?; } }, } diff --git a/storage/backup/backup-cli/Cargo.toml b/storage/backup/backup-cli/Cargo.toml index 72df0eacbf574..a9b66b2f22aa8 100644 --- a/storage/backup/backup-cli/Cargo.toml +++ b/storage/backup/backup-cli/Cargo.toml @@ -33,18 +33,18 @@ tokio-util = { version = "0.6.4", features = ["compat"] } executor = { path = "../../../execution/executor" } executor-test-helpers = { path = "../../../execution/executor-test-helpers", optional = true } executor-types = { path = "../../../execution/executor-types" } -diem-jellyfish-merkle = { path = "../../jellyfish-merkle" } +aptos-jellyfish-merkle = { path = "../../jellyfish-merkle" } bcs = "0.1.2" -diem-config = { path = "../../../config" } -diem-crypto = { path = "../../../crates/diem-crypto" } -diem-infallible = { path = "../../../crates/diem-infallible" } -diem-logger = { path = "../../../crates/diem-logger" } -diem-secure-push-metrics = { path = "../../../secure/push-metrics" } -diem-temppath = { path = "../../../crates/diem-temppath" } -diem-types = { path = "../../../types" } -diem-vm = { path = "../../../diem-move/diem-vm" } -diem-workspace-hack = { version = "0.1", path = "../../../crates/diem-workspace-hack" } -diemdb = { path = "../../diemdb" } +aptos-config = { path = "../../../config" } +aptos-crypto = { path = "../../../crates/aptos-crypto" } +aptos-infallible = { path = "../../../crates/aptos-infallible" } +aptos-logger = { path = "../../../crates/aptos-logger" } +aptos-secure-push-metrics = { path = "../../../secure/push-metrics" } +aptos-temppath = { path = "../../../crates/aptos-temppath" } +aptos-types = { path = "../../../types" } +aptos-vm = { path = "../../../aptos-move/aptos-vm" } +aptos-workspace-hack = { version = "0.1", path = "../../../crates/aptos-workspace-hack" } +aptosdb = { path = "../../aptosdb" } storage-interface = { path = "../../storage-interface" } [dev-dependencies] @@ -53,10 +53,10 @@ warp = "0.3.2" backup-service = { path = "../backup-service" } executor-test-helpers = { path = "../../../execution/executor-test-helpers" } -diemdb = { path = "../../diemdb", features = ["fuzzing"] } -diem-config = { path = "../../../config" } -diem-proptest-helpers = { path = "../../../crates/diem-proptest-helpers" } +aptosdb = { path = "../../aptosdb", features = ["fuzzing"] } +aptos-config = { path = "../../../config" } +aptos-proptest-helpers = { path = "../../../crates/aptos-proptest-helpers" } storage-interface = { path = "../../storage-interface" } [features] -fuzzing = ["diemdb/fuzzing"] +fuzzing = ["aptosdb/fuzzing"] diff --git a/storage/backup/backup-cli/src/backup_types/epoch_ending/backup.rs b/storage/backup/backup-cli/src/backup_types/epoch_ending/backup.rs index 256a05be7abb1..54bafabb2124e 100644 --- a/storage/backup/backup-cli/src/backup_types/epoch_ending/backup.rs +++ b/storage/backup/backup-cli/src/backup_types/epoch_ending/backup.rs @@ -11,8 +11,8 @@ use crate::{ }, }; use anyhow::{anyhow, ensure, Result}; -use diem_logger::prelude::*; -use diem_types::{ledger_info::LedgerInfoWithSignatures, waypoint::Waypoint}; +use aptos_logger::prelude::*; +use aptos_types::{ledger_info::LedgerInfoWithSignatures, waypoint::Waypoint}; use once_cell::sync::Lazy; use std::{convert::TryInto, str::FromStr, sync::Arc}; use structopt::StructOpt; diff --git a/storage/backup/backup-cli/src/backup_types/epoch_ending/manifest.rs b/storage/backup/backup-cli/src/backup_types/epoch_ending/manifest.rs index 8c3b65e0c2865..a609ee6deb3d8 100644 --- a/storage/backup/backup-cli/src/backup_types/epoch_ending/manifest.rs +++ b/storage/backup/backup-cli/src/backup_types/epoch_ending/manifest.rs @@ -3,7 +3,7 @@ use crate::storage::FileHandle; use anyhow::{ensure, Result}; -use diem_types::waypoint::Waypoint; +use aptos_types::waypoint::Waypoint; use serde::{Deserialize, Serialize}; /// A chunk of an epoch ending backup manifest, representing the diff --git a/storage/backup/backup-cli/src/backup_types/epoch_ending/restore.rs b/storage/backup/backup-cli/src/backup_types/epoch_ending/restore.rs index 71e65184495dd..aba62eb4a8383 100644 --- a/storage/backup/backup-cli/src/backup_types/epoch_ending/restore.rs +++ b/storage/backup/backup-cli/src/backup_types/epoch_ending/restore.rs @@ -14,8 +14,8 @@ use crate::{ }, }; use anyhow::{anyhow, ensure, Result}; -use diem_logger::prelude::*; -use diem_types::{ +use aptos_logger::prelude::*; +use aptos_types::{ epoch_change::Verifier, ledger_info::{LedgerInfo, LedgerInfoWithSignatures}, transaction::Version, diff --git a/storage/backup/backup-cli/src/backup_types/epoch_ending/tests.rs b/storage/backup/backup-cli/src/backup_types/epoch_ending/tests.rs index 9943ff795361b..d6a406417f945 100644 --- a/storage/backup/backup-cli/src/backup_types/epoch_ending/tests.rs +++ b/storage/backup/backup-cli/src/backup_types/epoch_ending/tests.rs @@ -14,15 +14,15 @@ use crate::{ ConcurrentDownloadsOpt, GlobalBackupOpt, GlobalRestoreOpt, RocksdbOpt, TrustedWaypointOpt, }, }; -use backup_service::start_backup_service; -use diem_config::utils::get_available_port; -use diem_temppath::TempPath; -use diem_types::{ +use aptos_config::utils::get_available_port; +use aptos_temppath::TempPath; +use aptos_types::{ ledger_info::LedgerInfoWithSignatures, proptest_types::{AccountInfoUniverse, LedgerInfoWithSignaturesGen}, waypoint::Waypoint, }; -use diemdb::DiemDB; +use aptosdb::DiemDB; +use backup_service::start_backup_service; use proptest::{collection::vec, prelude::*, std_facade::BTreeMap}; use std::{ convert::TryInto, diff --git a/storage/backup/backup-cli/src/backup_types/state_snapshot/backup.rs b/storage/backup/backup-cli/src/backup_types/state_snapshot/backup.rs index dd2ba6e3179b8..fc28caf5b85fd 100644 --- a/storage/backup/backup-cli/src/backup_types/state_snapshot/backup.rs +++ b/storage/backup/backup-cli/src/backup_types/state_snapshot/backup.rs @@ -11,13 +11,13 @@ use crate::{ }, }; use anyhow::{anyhow, Result}; -use bytes::Bytes; -use diem_crypto::HashValue; -use diem_logger::prelude::*; -use diem_types::{ +use aptos_crypto::HashValue; +use aptos_logger::prelude::*; +use aptos_types::{ account_state_blob::AccountStateBlob, ledger_info::LedgerInfoWithSignatures, proof::TransactionInfoWithProof, transaction::Version, }; +use bytes::Bytes; use once_cell::sync::Lazy; use std::{convert::TryInto, str::FromStr, sync::Arc}; use structopt::StructOpt; diff --git a/storage/backup/backup-cli/src/backup_types/state_snapshot/manifest.rs b/storage/backup/backup-cli/src/backup_types/state_snapshot/manifest.rs index fcaf168e1059a..294c23fe78aa1 100644 --- a/storage/backup/backup-cli/src/backup_types/state_snapshot/manifest.rs +++ b/storage/backup/backup-cli/src/backup_types/state_snapshot/manifest.rs @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 use crate::storage::FileHandle; -use diem_crypto::HashValue; -use diem_types::transaction::Version; +use aptos_crypto::HashValue; +use aptos_types::transaction::Version; use serde::{Deserialize, Serialize}; /// A chunk of a state snapshot manifest, representing accounts in the key range diff --git a/storage/backup/backup-cli/src/backup_types/state_snapshot/restore.rs b/storage/backup/backup-cli/src/backup_types/state_snapshot/restore.rs index 2de031e03e783..07715e03b4852 100644 --- a/storage/backup/backup-cli/src/backup_types/state_snapshot/restore.rs +++ b/storage/backup/backup-cli/src/backup_types/state_snapshot/restore.rs @@ -21,9 +21,9 @@ use crate::{ }, }; use anyhow::{anyhow, ensure, Result}; -use diem_crypto::HashValue; -use diem_logger::prelude::*; -use diem_types::{ +use aptos_crypto::HashValue; +use aptos_logger::prelude::*; +use aptos_types::{ account_state_blob::AccountStateBlob, ledger_info::LedgerInfoWithSignatures, proof::TransactionInfoWithProof, transaction::Version, }; diff --git a/storage/backup/backup-cli/src/backup_types/state_snapshot/tests.rs b/storage/backup/backup-cli/src/backup_types/state_snapshot/tests.rs index 8968bd5e983df..4dffae4c3dfc8 100644 --- a/storage/backup/backup-cli/src/backup_types/state_snapshot/tests.rs +++ b/storage/backup/backup-cli/src/backup_types/state_snapshot/tests.rs @@ -13,9 +13,9 @@ use crate::{ ConcurrentDownloadsOpt, GlobalBackupOpt, GlobalRestoreOpt, RocksdbOpt, TrustedWaypointOpt, }, }; -use diem_temppath::TempPath; -use diem_types::transaction::PRE_GENESIS_VERSION; -use diemdb::DiemDB; +use aptos_temppath::TempPath; +use aptos_types::transaction::PRE_GENESIS_VERSION; +use aptosdb::DiemDB; use std::{convert::TryInto, sync::Arc}; use storage_interface::DbReader; use tokio::time::Duration; diff --git a/storage/backup/backup-cli/src/backup_types/tests.rs b/storage/backup/backup-cli/src/backup_types/tests.rs index 097e7ad8bdd65..72950c3490d8c 100644 --- a/storage/backup/backup-cli/src/backup_types/tests.rs +++ b/storage/backup/backup-cli/src/backup_types/tests.rs @@ -19,9 +19,9 @@ use crate::{ RocksdbOpt, TrustedWaypointOpt, }, }; -use diem_temppath::TempPath; -use diem_types::transaction::Version; -use diemdb::DiemDB; +use aptos_temppath::TempPath; +use aptos_types::transaction::Version; +use aptosdb::DiemDB; use executor_test_helpers::integration_test_impl::test_execution_with_storage_impl; use proptest::prelude::*; use std::{convert::TryInto, sync::Arc}; diff --git a/storage/backup/backup-cli/src/backup_types/transaction/backup.rs b/storage/backup/backup-cli/src/backup_types/transaction/backup.rs index 6c9820bfbec9c..28ea5ba10a0dd 100644 --- a/storage/backup/backup-cli/src/backup_types/transaction/backup.rs +++ b/storage/backup/backup-cli/src/backup_types/transaction/backup.rs @@ -11,8 +11,8 @@ use crate::{ }, }; use anyhow::{anyhow, Result}; -use diem_logger::prelude::*; -use diem_types::transaction::Version; +use aptos_logger::prelude::*; +use aptos_types::transaction::Version; use once_cell::sync::Lazy; use std::{convert::TryInto, str::FromStr, sync::Arc}; use structopt::StructOpt; diff --git a/storage/backup/backup-cli/src/backup_types/transaction/manifest.rs b/storage/backup/backup-cli/src/backup_types/transaction/manifest.rs index 9fe3965eeea18..6427b70875d8a 100644 --- a/storage/backup/backup-cli/src/backup_types/transaction/manifest.rs +++ b/storage/backup/backup-cli/src/backup_types/transaction/manifest.rs @@ -3,7 +3,7 @@ use crate::storage::FileHandle; use anyhow::{ensure, Result}; -use diem_types::transaction::Version; +use aptos_types::transaction::Version; use serde::{Deserialize, Serialize}; /// A chunk of a transaction backup manifest to represent the diff --git a/storage/backup/backup-cli/src/backup_types/transaction/restore.rs b/storage/backup/backup-cli/src/backup_types/transaction/restore.rs index 5cb4d6ecdd75f..e8461aa1aa64a 100644 --- a/storage/backup/backup-cli/src/backup_types/transaction/restore.rs +++ b/storage/backup/backup-cli/src/backup_types/transaction/restore.rs @@ -20,15 +20,15 @@ use crate::{ }, }; use anyhow::{anyhow, ensure, Result}; -use diem_logger::prelude::*; -use diem_types::{ +use aptos_logger::prelude::*; +use aptos_types::{ contract_event::ContractEvent, ledger_info::LedgerInfoWithSignatures, proof::{TransactionAccumulatorRangeProof, TransactionInfoListWithProof}, transaction::{Transaction, TransactionInfo, TransactionListWithProof, Version}, }; -use diem_vm::DiemVM; -use diemdb::backup::restore_handler::RestoreHandler; +use aptos_vm::DiemVM; +use aptosdb::backup::restore_handler::RestoreHandler; use executor::{chunk_executor::ChunkExecutor, components::apply_chunk_output::IntoLedgerView}; use executor_types::TransactionReplayer; use futures::{ @@ -409,7 +409,7 @@ impl TransactionRestoreBatchController { ) -> Result<()> { let replay_start = Instant::now(); let first_version = self.replay_from_version.unwrap(); - let db = DbReaderWriter::from_arc(Arc::clone(&restore_handler.diemdb)); + let db = DbReaderWriter::from_arc(Arc::clone(&restore_handler.aptosdb)); let persisted_view = restore_handler .get_tree_state(first_version)? .into_ledger_view(&db.reader)?; diff --git a/storage/backup/backup-cli/src/backup_types/transaction/tests.rs b/storage/backup/backup-cli/src/backup_types/transaction/tests.rs index 0b3494e781c69..487aa911652f6 100644 --- a/storage/backup/backup-cli/src/backup_types/transaction/tests.rs +++ b/storage/backup/backup-cli/src/backup_types/transaction/tests.rs @@ -13,9 +13,9 @@ use crate::{ ConcurrentDownloadsOpt, GlobalBackupOpt, GlobalRestoreOpt, RocksdbOpt, TrustedWaypointOpt, }, }; -use diem_temppath::TempPath; -use diem_types::transaction::Version; -use diemdb::DiemDB; +use aptos_temppath::TempPath; +use aptos_types::transaction::Version; +use aptosdb::DiemDB; use std::{convert::TryInto, mem::size_of, sync::Arc}; use storage_interface::DbReader; use tokio::time::Duration; diff --git a/storage/backup/backup-cli/src/bin/db-backup-verify.rs b/storage/backup/backup-cli/src/bin/db-backup-verify.rs index 64603e4d965d4..cd7b04b3f2ddf 100644 --- a/storage/backup/backup-cli/src/bin/db-backup-verify.rs +++ b/storage/backup/backup-cli/src/bin/db-backup-verify.rs @@ -2,14 +2,14 @@ // SPDX-License-Identifier: Apache-2.0 use anyhow::Result; +use aptos_logger::{prelude::*, Level, Logger}; +use aptos_secure_push_metrics::MetricsPusher; use backup_cli::{ coordinators::verify::VerifyCoordinator, metadata::cache::MetadataCacheOpt, storage::StorageOpt, utils::{ConcurrentDownloadsOpt, TrustedWaypointOpt}, }; -use diem_logger::{prelude::*, Level, Logger}; -use diem_secure_push_metrics::MetricsPusher; use structopt::StructOpt; #[derive(StructOpt)] diff --git a/storage/backup/backup-cli/src/bin/db-backup.rs b/storage/backup/backup-cli/src/bin/db-backup.rs index 726e310b4e2f3..17ad3d94de852 100644 --- a/storage/backup/backup-cli/src/bin/db-backup.rs +++ b/storage/backup/backup-cli/src/bin/db-backup.rs @@ -6,6 +6,8 @@ use std::sync::Arc; use anyhow::Result; use structopt::StructOpt; +use aptos_logger::{prelude::*, Level, Logger}; +use aptos_secure_push_metrics::MetricsPusher; use backup_cli::{ backup_types::{ epoch_ending::backup::{EpochEndingBackupController, EpochEndingBackupOpt}, @@ -20,8 +22,6 @@ use backup_cli::{ ConcurrentDownloadsOpt, GlobalBackupOpt, }, }; -use diem_logger::{prelude::*, Level, Logger}; -use diem_secure_push_metrics::MetricsPusher; #[derive(StructOpt)] #[structopt(about = "Diem backup tool.")] diff --git a/storage/backup/backup-cli/src/bin/db-restore.rs b/storage/backup/backup-cli/src/bin/db-restore.rs index 829bc58cf0c9f..dfa1d35297cc8 100644 --- a/storage/backup/backup-cli/src/bin/db-restore.rs +++ b/storage/backup/backup-cli/src/bin/db-restore.rs @@ -2,6 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 use anyhow::Result; +use aptos_logger::{prelude::*, Level, Logger}; +use aptos_secure_push_metrics::MetricsPusher; use backup_cli::{ backup_types::{ epoch_ending::restore::{EpochEndingRestoreController, EpochEndingRestoreOpt}, @@ -12,8 +14,6 @@ use backup_cli::{ storage::StorageOpt, utils::{GlobalRestoreOpt, GlobalRestoreOptions}, }; -use diem_logger::{prelude::*, Level, Logger}; -use diem_secure_push_metrics::MetricsPusher; use std::convert::TryInto; use structopt::StructOpt; diff --git a/storage/backup/backup-cli/src/bin/replay-verify.rs b/storage/backup/backup-cli/src/bin/replay-verify.rs index 0e26fbb4eb238..f78e4be99ff16 100644 --- a/storage/backup/backup-cli/src/bin/replay-verify.rs +++ b/storage/backup/backup-cli/src/bin/replay-verify.rs @@ -2,15 +2,15 @@ // SPDX-License-Identifier: Apache-2.0 use anyhow::Result; +use aptos_logger::{prelude::*, Level, Logger}; +use aptos_types::transaction::Version; +use aptosdb::{DiemDB, GetRestoreHandler}; use backup_cli::{ coordinators::replay_verify::ReplayVerifyCoordinator, metadata::cache::MetadataCacheOpt, storage::StorageOpt, utils::{ConcurrentDownloadsOpt, RocksdbOpt, TrustedWaypointOpt}, }; -use diem_logger::{prelude::*, Level, Logger}; -use diem_types::transaction::Version; -use diemdb::{DiemDB, GetRestoreHandler}; use std::{path::PathBuf, sync::Arc}; use structopt::StructOpt; diff --git a/storage/backup/backup-cli/src/coordinators/backup.rs b/storage/backup/backup-cli/src/coordinators/backup.rs index 7595afa247610..18002551d8358 100644 --- a/storage/backup/backup-cli/src/coordinators/backup.rs +++ b/storage/backup/backup-cli/src/coordinators/backup.rs @@ -19,9 +19,9 @@ use crate::{ }, }; use anyhow::{anyhow, ensure, Result}; -use diem_logger::prelude::*; -use diem_types::transaction::Version; -use diemdb::backup::backup_handler::DbState; +use aptos_logger::prelude::*; +use aptos_types::transaction::Version; +use aptosdb::backup::backup_handler::DbState; use futures::{stream, Future, StreamExt}; use std::{fmt::Debug, sync::Arc}; use structopt::StructOpt; @@ -360,7 +360,7 @@ fn get_next_snapshot(last_in_backup: Option, db_state: DbState, interval: u #[cfg(test)] mod tests { use crate::coordinators::backup::{get_batch_range, get_next_snapshot}; - use diemdb::backup::backup_handler::DbState; + use aptosdb::backup::backup_handler::DbState; #[test] fn test_get_batch_range() { diff --git a/storage/backup/backup-cli/src/coordinators/replay_verify.rs b/storage/backup/backup-cli/src/coordinators/replay_verify.rs index 1c94b4e1f2b6a..304c6834df956 100644 --- a/storage/backup/backup-cli/src/coordinators/replay_verify.rs +++ b/storage/backup/backup-cli/src/coordinators/replay_verify.rs @@ -12,9 +12,9 @@ use crate::{ utils::{GlobalRestoreOptions, RestoreRunMode, TrustedWaypointOpt}, }; use anyhow::{ensure, Result}; -use diem_logger::prelude::*; -use diem_types::transaction::Version; -use diemdb::backup::restore_handler::RestoreHandler; +use aptos_logger::prelude::*; +use aptos_types::transaction::Version; +use aptosdb::backup::restore_handler::RestoreHandler; use std::sync::Arc; pub struct ReplayVerifyCoordinator { diff --git a/storage/backup/backup-cli/src/coordinators/restore.rs b/storage/backup/backup-cli/src/coordinators/restore.rs index 9adf3501c5812..35465b695b7a2 100644 --- a/storage/backup/backup-cli/src/coordinators/restore.rs +++ b/storage/backup/backup-cli/src/coordinators/restore.rs @@ -16,8 +16,8 @@ use crate::{ utils::{unix_timestamp_sec, GlobalRestoreOptions, RestoreRunMode}, }; use anyhow::{bail, Result}; -use diem_logger::prelude::*; -use diem_types::transaction::Version; +use aptos_logger::prelude::*; +use aptos_types::transaction::Version; use std::sync::Arc; use structopt::StructOpt; diff --git a/storage/backup/backup-cli/src/coordinators/verify.rs b/storage/backup/backup-cli/src/coordinators/verify.rs index 91b494886fcbc..fc78e2a112722 100644 --- a/storage/backup/backup-cli/src/coordinators/verify.rs +++ b/storage/backup/backup-cli/src/coordinators/verify.rs @@ -16,8 +16,8 @@ use crate::{ utils::{unix_timestamp_sec, GlobalRestoreOptions, RestoreRunMode, TrustedWaypointOpt}, }; use anyhow::Result; -use diem_logger::prelude::*; -use diem_types::transaction::Version; +use aptos_logger::prelude::*; +use aptos_types::transaction::Version; use std::sync::Arc; pub struct VerifyCoordinator { diff --git a/storage/backup/backup-cli/src/metadata/cache.rs b/storage/backup/backup-cli/src/metadata/cache.rs index c7f7eb5e90923..86de5948912ae 100644 --- a/storage/backup/backup-cli/src/metadata/cache.rs +++ b/storage/backup/backup-cli/src/metadata/cache.rs @@ -8,9 +8,9 @@ use crate::{ utils::{error_notes::ErrorNotes, stream::StreamX}, }; use anyhow::{anyhow, Result}; +use aptos_logger::prelude::*; +use aptos_temppath::TempPath; use async_trait::async_trait; -use diem_logger::prelude::*; -use diem_temppath::TempPath; use futures::stream::poll_fn; use once_cell::sync::Lazy; use std::{ diff --git a/storage/backup/backup-cli/src/metadata/mod.rs b/storage/backup/backup-cli/src/metadata/mod.rs index 8a20c068ea475..2f07af8c6f32e 100644 --- a/storage/backup/backup-cli/src/metadata/mod.rs +++ b/storage/backup/backup-cli/src/metadata/mod.rs @@ -6,7 +6,7 @@ pub mod view; use crate::storage::{FileHandle, ShellSafeName, TextLine}; use anyhow::Result; -use diem_types::transaction::Version; +use aptos_types::transaction::Version; use serde::{Deserialize, Serialize}; use std::convert::TryInto; diff --git a/storage/backup/backup-cli/src/metadata/view.rs b/storage/backup/backup-cli/src/metadata/view.rs index f7e8419ebaab9..6bd77549ab3c2 100644 --- a/storage/backup/backup-cli/src/metadata/view.rs +++ b/storage/backup/backup-cli/src/metadata/view.rs @@ -5,7 +5,7 @@ use crate::metadata::{ EpochEndingBackupMeta, Metadata, StateSnapshotBackupMeta, TransactionBackupMeta, }; use anyhow::{anyhow, ensure, Result}; -use diem_types::transaction::Version; +use aptos_types::transaction::Version; use itertools::Itertools; use std::{fmt, str::FromStr}; diff --git a/storage/backup/backup-cli/src/metrics/backup.rs b/storage/backup/backup-cli/src/metrics/backup.rs index 35237b6facefb..5a9a03c3515b1 100644 --- a/storage/backup/backup-cli/src/metrics/backup.rs +++ b/storage/backup/backup-cli/src/metrics/backup.rs @@ -1,7 +1,7 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_secure_push_metrics::{register_int_gauge, IntGauge}; +use aptos_secure_push_metrics::{register_int_gauge, IntGauge}; use once_cell::sync::Lazy; pub static HEARTBEAT_TS: Lazy = Lazy::new(|| { diff --git a/storage/backup/backup-cli/src/metrics/metadata.rs b/storage/backup/backup-cli/src/metrics/metadata.rs index 47708edc8a23b..0ad94612bbf8e 100644 --- a/storage/backup/backup-cli/src/metrics/metadata.rs +++ b/storage/backup/backup-cli/src/metrics/metadata.rs @@ -1,12 +1,12 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_secure_push_metrics::{register_int_gauge, IntGauge}; +use aptos_secure_push_metrics::{register_int_gauge, IntGauge}; use once_cell::sync::Lazy; pub static NUM_META_FILES: Lazy = Lazy::new(|| { register_int_gauge!( - "diem_backup_metadata_num_files", + "aptos_backup_metadata_num_files", "Number of metadata files in total." ) .unwrap() @@ -14,7 +14,7 @@ pub static NUM_META_FILES: Lazy = Lazy::new(|| { pub static NUM_META_MISS: Lazy = Lazy::new(|| { register_int_gauge!( - "diem_backup_metadata_num_file_cache_misses", + "aptos_backup_metadata_num_file_cache_misses", "Number of metadata files to download due to non-existence in local cache." ) .unwrap() @@ -22,7 +22,7 @@ pub static NUM_META_MISS: Lazy = Lazy::new(|| { pub static NUM_META_DOWNLOAD: Lazy = Lazy::new(|| { register_int_gauge!( - "diem_backup_metadata_num_file_downloads", + "aptos_backup_metadata_num_file_downloads", "Number of metadata files to download due to non-existence in local cache." ) .unwrap() diff --git a/storage/backup/backup-cli/src/metrics/restore.rs b/storage/backup/backup-cli/src/metrics/restore.rs index 3ce8d4f68e777..070c42ffe3ee1 100644 --- a/storage/backup/backup-cli/src/metrics/restore.rs +++ b/storage/backup/backup-cli/src/metrics/restore.rs @@ -1,7 +1,7 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_secure_push_metrics::{register_int_gauge, IntGauge}; +use aptos_secure_push_metrics::{register_int_gauge, IntGauge}; use once_cell::sync::Lazy; pub static COORDINATOR_TARGET_VERSION: Lazy = Lazy::new(|| { diff --git a/storage/backup/backup-cli/src/metrics/verify.rs b/storage/backup/backup-cli/src/metrics/verify.rs index cc456ae599c71..43573259c087c 100644 --- a/storage/backup/backup-cli/src/metrics/verify.rs +++ b/storage/backup/backup-cli/src/metrics/verify.rs @@ -1,7 +1,7 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_secure_push_metrics::{register_int_gauge, IntGauge}; +use aptos_secure_push_metrics::{register_int_gauge, IntGauge}; use once_cell::sync::Lazy; pub static VERIFY_EPOCH_ENDING_EPOCH: Lazy = Lazy::new(|| { diff --git a/storage/backup/backup-cli/src/storage/command_adapter/azure.sample.toml b/storage/backup/backup-cli/src/storage/command_adapter/azure.sample.toml index c89f1a6d6a13f..d2988a9614de9 100644 --- a/storage/backup/backup-cli/src/storage/command_adapter/azure.sample.toml +++ b/storage/backup/backup-cli/src/storage/command_adapter/azure.sample.toml @@ -1,6 +1,6 @@ [[env_vars]] key = "ACCOUNT" -value = "diem-backup" +value = "aptos-backup" [[env_vars]] key = "CONTAINER" diff --git a/storage/backup/backup-cli/src/storage/command_adapter/command.rs b/storage/backup/backup-cli/src/storage/command_adapter/command.rs index 9af74979e0aec..b9cdeb186f043 100644 --- a/storage/backup/backup-cli/src/storage/command_adapter/command.rs +++ b/storage/backup/backup-cli/src/storage/command_adapter/command.rs @@ -3,7 +3,7 @@ use crate::{storage::command_adapter::config::EnvVar, utils::error_notes::ErrorNotes}; use anyhow::{bail, ensure, Result}; -use diem_logger::prelude::*; +use aptos_logger::prelude::*; use futures::{ future::BoxFuture, task::{Context, Poll}, diff --git a/storage/backup/backup-cli/src/storage/command_adapter/gcp.sample.toml b/storage/backup/backup-cli/src/storage/command_adapter/gcp.sample.toml index 0ba5ddb72d93c..06a44bba13bfb 100644 --- a/storage/backup/backup-cli/src/storage/command_adapter/gcp.sample.toml +++ b/storage/backup/backup-cli/src/storage/command_adapter/gcp.sample.toml @@ -1,6 +1,6 @@ [[env_vars]] key = "BUCKET" -value = "diem-backup/backup1" +value = "aptos-backup/backup1" [[env_vars]] key = "SUB_DIR" diff --git a/storage/backup/backup-cli/src/storage/command_adapter/s3.sample.toml b/storage/backup/backup-cli/src/storage/command_adapter/s3.sample.toml index 73bb896c3725c..383a68425587f 100644 --- a/storage/backup/backup-cli/src/storage/command_adapter/s3.sample.toml +++ b/storage/backup/backup-cli/src/storage/command_adapter/s3.sample.toml @@ -1,6 +1,6 @@ [[env_vars]] key = "BUCKET" -value = "diem-backup/backup1" +value = "aptos-backup/backup1" [[env_vars]] key = "SUB_DIR" diff --git a/storage/backup/backup-cli/src/storage/command_adapter/tests.rs b/storage/backup/backup-cli/src/storage/command_adapter/tests.rs index ea94f2a4eabe5..32fe1b303a3a9 100644 --- a/storage/backup/backup-cli/src/storage/command_adapter/tests.rs +++ b/storage/backup/backup-cli/src/storage/command_adapter/tests.rs @@ -9,7 +9,7 @@ use crate::storage::{ test_write_and_read_impl, }, }; -use diem_temppath::TempPath; +use aptos_temppath::TempPath; use futures::Future; use proptest::prelude::*; use std::str::FromStr; diff --git a/storage/backup/backup-cli/src/storage/local_fs/tests.rs b/storage/backup/backup-cli/src/storage/local_fs/tests.rs index a4724659e6c91..ae35916311d7c 100644 --- a/storage/backup/backup-cli/src/storage/local_fs/tests.rs +++ b/storage/backup/backup-cli/src/storage/local_fs/tests.rs @@ -6,7 +6,7 @@ use crate::storage::test_util::{ arb_backups, arb_metadata_files, test_save_and_list_metadata_files_impl, test_write_and_read_impl, }; -use diem_temppath::TempPath; +use aptos_temppath::TempPath; use proptest::prelude::*; use tokio::runtime::Runtime; diff --git a/storage/backup/backup-cli/src/utils/backup_service_client.rs b/storage/backup/backup-cli/src/utils/backup_service_client.rs index bac28911b4144..01f69eee6d974 100644 --- a/storage/backup/backup-cli/src/utils/backup_service_client.rs +++ b/storage/backup/backup-cli/src/utils/backup_service_client.rs @@ -3,9 +3,9 @@ use crate::utils::error_notes::ErrorNotes; use anyhow::Result; -use diem_crypto::HashValue; -use diem_types::transaction::Version; -use diemdb::backup::backup_handler::DbState; +use aptos_crypto::HashValue; +use aptos_types::transaction::Version; +use aptosdb::backup::backup_handler::DbState; use futures::TryStreamExt; use structopt::StructOpt; use tokio::io::{AsyncRead, AsyncReadExt}; diff --git a/storage/backup/backup-cli/src/utils/error_notes.rs b/storage/backup/backup-cli/src/utils/error_notes.rs index 75f427a2b0df2..ad4ed576db884 100644 --- a/storage/backup/backup-cli/src/utils/error_notes.rs +++ b/storage/backup/backup-cli/src/utils/error_notes.rs @@ -1,7 +1,7 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_logger::error; +use aptos_logger::error; use std::fmt::{Debug, Display}; pub(crate) trait ErrorNotes { diff --git a/storage/backup/backup-cli/src/utils/mod.rs b/storage/backup/backup-cli/src/utils/mod.rs index ec9e0c1ebe47f..e201df3ad6e55 100644 --- a/storage/backup/backup-cli/src/utils/mod.rs +++ b/storage/backup/backup-cli/src/utils/mod.rs @@ -11,12 +11,12 @@ pub(crate) mod stream; pub mod test_utils; use anyhow::{anyhow, Result}; -use diem_config::config::RocksdbConfig; -use diem_crypto::HashValue; -use diem_infallible::duration_since_epoch; -use diem_jellyfish_merkle::{restore::JellyfishMerkleRestore, NodeBatch, TreeWriter}; -use diem_types::{account_state_blob::AccountStateBlob, transaction::Version, waypoint::Waypoint}; -use diemdb::{backup::restore_handler::RestoreHandler, DiemDB, GetRestoreHandler}; +use aptos_config::config::RocksdbConfig; +use aptos_crypto::HashValue; +use aptos_infallible::duration_since_epoch; +use aptos_jellyfish_merkle::{restore::JellyfishMerkleRestore, NodeBatch, TreeWriter}; +use aptos_types::{account_state_blob::AccountStateBlob, transaction::Version, waypoint::Waypoint}; +use aptosdb::{backup::restore_handler::RestoreHandler, DiemDB, GetRestoreHandler}; use std::{ collections::HashMap, convert::TryFrom, diff --git a/storage/backup/backup-cli/src/utils/test_utils.rs b/storage/backup/backup-cli/src/utils/test_utils.rs index 122dc4cffbb6e..5ec6ea7617594 100644 --- a/storage/backup/backup-cli/src/utils/test_utils.rs +++ b/storage/backup/backup-cli/src/utils/test_utils.rs @@ -1,12 +1,12 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 +use aptos_config::utils::get_available_port; +use aptos_proptest_helpers::ValueGenerator; +use aptos_temppath::TempPath; +use aptos_types::{ledger_info::LedgerInfoWithSignatures, transaction::TransactionToCommit}; +use aptosdb::{test_helper::arb_blocks_to_commit, DiemDB}; use backup_service::start_backup_service; -use diem_config::utils::get_available_port; -use diem_proptest_helpers::ValueGenerator; -use diem_temppath::TempPath; -use diem_types::{ledger_info::LedgerInfoWithSignatures, transaction::TransactionToCommit}; -use diemdb::{test_helper::arb_blocks_to_commit, DiemDB}; use std::{ net::{IpAddr, Ipv4Addr, SocketAddr}, sync::Arc, diff --git a/storage/backup/backup-service/Cargo.toml b/storage/backup/backup-service/Cargo.toml index 750f782e77698..60047ccbb5ddf 100644 --- a/storage/backup/backup-service/Cargo.toml +++ b/storage/backup/backup-service/Cargo.toml @@ -19,20 +19,20 @@ tokio = { version = "1.8.1", features = ["full"] } warp = "0.3.2" bcs = "0.1.2" -diem-crypto = { path = "../../../crates/diem-crypto" } -diem-logger = { path = "../../../crates/diem-logger" } -diem-metrics = { path = "../../../crates/diem-metrics" } -diem-types = { path = "../../../types" } -diem-workspace-hack = { version = "0.1", path = "../../../crates/diem-workspace-hack" } -diemdb = { path = "../../diemdb" } +aptos-crypto = { path = "../../../crates/aptos-crypto" } +aptos-logger = { path = "../../../crates/aptos-logger" } +aptos-metrics = { path = "../../../crates/aptos-metrics" } +aptos-types = { path = "../../../types" } +aptos-workspace-hack = { version = "0.1", path = "../../../crates/aptos-workspace-hack" } +aptosdb = { path = "../../aptosdb" } storage-interface = { path = "../../storage-interface" } [dev-dependencies] -diemdb = { path = "../../diemdb", features = ["fuzzing"] } -diem-config = { path = "../../../config" } -diem-temppath = { path = "../../../crates/diem-temppath" } +aptosdb = { path = "../../aptosdb", features = ["fuzzing"] } +aptos-config = { path = "../../../config" } +aptos-temppath = { path = "../../../crates/aptos-temppath" } reqwest = { version = "0.11.2", features = ["blocking", "json"], default_features = false } [features] -fuzzing = ["diemdb/fuzzing"] +fuzzing = ["aptosdb/fuzzing"] diff --git a/storage/backup/backup-service/src/handlers/mod.rs b/storage/backup/backup-service/src/handlers/mod.rs index ece3b76cad443..b59527be97364 100644 --- a/storage/backup/backup-service/src/handlers/mod.rs +++ b/storage/backup/backup-service/src/handlers/mod.rs @@ -7,9 +7,9 @@ use crate::handlers::utils::{ handle_rejection, reply_with_async_channel_writer, reply_with_bcs_bytes, send_size_prefixed_bcs_bytes, unwrap_or_500, LATENCY_HISTOGRAM, }; -use diem_crypto::hash::HashValue; -use diem_types::transaction::Version; -use diemdb::backup::backup_handler::BackupHandler; +use aptos_crypto::hash::HashValue; +use aptos_types::transaction::Version; +use aptosdb::backup::backup_handler::BackupHandler; use warp::{filters::BoxedFilter, reply::Reply, Filter}; static DB_STATE: &str = "db_state"; diff --git a/storage/backup/backup-service/src/handlers/utils.rs b/storage/backup/backup-service/src/handlers/utils.rs index c1d4d67c2e6b3..5e7e606403e6d 100644 --- a/storage/backup/backup-service/src/handlers/utils.rs +++ b/storage/backup/backup-service/src/handlers/utils.rs @@ -2,10 +2,12 @@ // SPDX-License-Identifier: Apache-2.0 use anyhow::Result; +use aptos_logger::prelude::*; +use aptos_metrics::{ + register_histogram_vec, register_int_counter_vec, HistogramVec, IntCounterVec, +}; +use aptosdb::backup::backup_handler::BackupHandler; use bytes::Bytes; -use diem_logger::prelude::*; -use diem_metrics::{register_histogram_vec, register_int_counter_vec, HistogramVec, IntCounterVec}; -use diemdb::backup::backup_handler::BackupHandler; use hyper::Body; use once_cell::sync::Lazy; use serde::Serialize; @@ -14,7 +16,7 @@ use warp::{reply::Response, Rejection, Reply}; pub(super) static LATENCY_HISTOGRAM: Lazy = Lazy::new(|| { register_histogram_vec!( - "diem_backup_service_latency_s", + "aptos_backup_service_latency_s", "Backup service endpoint latency.", &["endpoint", "status"] ) @@ -23,7 +25,7 @@ pub(super) static LATENCY_HISTOGRAM: Lazy = Lazy::new(|| { pub(super) static THROUGHPUT_COUNTER: Lazy = Lazy::new(|| { register_int_counter_vec!( - "diem_backup_service_sent_bytes", + "aptos_backup_service_sent_bytes", "Backup service throughput in bytes.", &["endpoint"] ) diff --git a/storage/backup/backup-service/src/lib.rs b/storage/backup/backup-service/src/lib.rs index 76bc739f9e510..e49fea696f1a3 100644 --- a/storage/backup/backup-service/src/lib.rs +++ b/storage/backup/backup-service/src/lib.rs @@ -4,8 +4,8 @@ mod handlers; use crate::handlers::get_routes; -use diem_logger::prelude::*; -use diemdb::DiemDB; +use aptos_logger::prelude::*; +use aptosdb::DiemDB; use std::{net::SocketAddr, sync::Arc}; use tokio::runtime::{Builder, Runtime}; @@ -36,9 +36,9 @@ pub fn start_backup_service(address: SocketAddr, db: Arc) -> Runtime { #[cfg(test)] mod tests { use super::*; - use diem_config::utils::get_available_port; - use diem_crypto::hash::HashValue; - use diem_temppath::TempPath; + use aptos_config::utils::get_available_port; + use aptos_crypto::hash::HashValue; + use aptos_temppath::TempPath; use reqwest::blocking::get; use std::net::{IpAddr, Ipv4Addr}; diff --git a/storage/inspector/Cargo.toml b/storage/inspector/Cargo.toml index 85cfcbc335ee6..68cbf9c61345c 100644 --- a/storage/inspector/Cargo.toml +++ b/storage/inspector/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "diem-storage-inspector" +name = "aptos-storage-inspector" version = "0.1.0" authors = ["Diem Association "] repository = "https://github.com/diem/diem" @@ -13,11 +13,11 @@ anyhow = "1.0.52" structopt = "0.3.21" tempfile = "3.2.0" -diem-framework-releases = { path = "../../diem-move/diem-framework/DPN/releases" } -diemdb = { path = "../diemdb" } -diem-config = { path = "../../config" } -diem-crypto = { path = "../../crates/diem-crypto" } -diem-types = { path = "../../types" } -diem-logger = { path = "../../crates/diem-logger" } -diem-workspace-hack = { version = "0.1", path = "../../crates/diem-workspace-hack" } +diem-framework-releases = { path = "../../aptos-move/diem-framework/DPN/releases" } +aptosdb = { path = "../aptosdb" } +aptos-config = { path = "../../config" } +aptos-crypto = { path = "../../crates/aptos-crypto" } +aptos-types = { path = "../../types" } +aptos-logger = { path = "../../crates/aptos-logger" } +aptos-workspace-hack = { version = "0.1", path = "../../crates/aptos-workspace-hack" } storage-interface = { path = "../storage-interface" } diff --git a/storage/inspector/src/main.rs b/storage/inspector/src/main.rs index 4006530ef862f..d4498ae1b1446 100644 --- a/storage/inspector/src/main.rs +++ b/storage/inspector/src/main.rs @@ -4,14 +4,14 @@ #![forbid(unsafe_code)] use anyhow::Result; -use diem_config::config::RocksdbConfig; +use aptos_config::config::RocksdbConfig; +use aptos_logger::info; +use aptosdb::DiemDB; use diem_framework_releases::name_for_script; -use diem_logger::info; -use diemdb::DiemDB; use std::path::PathBuf; use storage_interface::DbReader; -use diem_types::{ +use aptos_types::{ account_address::AccountAddress, account_config::AccountResource, account_state::AccountState, }; use std::convert::TryFrom; @@ -153,7 +153,7 @@ fn list_accounts(db: &DiemDB) { } fn main() { - ::diem_logger::DiemLogger::builder().build(); + ::aptos_logger::DiemLogger::builder().build(); let opt = Opt::from_args(); diff --git a/storage/jellyfish-merkle/Cargo.toml b/storage/jellyfish-merkle/Cargo.toml index 611a9e6a9f573..5574dc6ff1d78 100644 --- a/storage/jellyfish-merkle/Cargo.toml +++ b/storage/jellyfish-merkle/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "diem-jellyfish-merkle" +name = "aptos-jellyfish-merkle" version = "0.1.0" authors = ["Diem Association "] description = "Diem jellyfish merkle" @@ -24,12 +24,12 @@ serde = { version = "1.0.124", features = ["derive"] } thiserror = "1.0.24" bcs = "0.1.2" -diem-crypto = { path = "../../crates/diem-crypto" } -diem-crypto-derive = { path = "../../crates/diem-crypto-derive" } -diem-infallible = { path = "../../crates/diem-infallible" } -diem-metrics = { path = "../../crates/diem-metrics" } -diem-types = { path = "../../types" } -diem-workspace-hack = { version = "0.1", path = "../../crates/diem-workspace-hack" } +aptos-crypto = { path = "../../crates/aptos-crypto" } +aptos-crypto-derive = { path = "../../crates/aptos-crypto-derive" } +aptos-infallible = { path = "../../crates/aptos-infallible" } +aptos-metrics = { path = "../../crates/aptos-metrics" } +aptos-types = { path = "../../types" } +aptos-workspace-hack = { version = "0.1", path = "../../crates/aptos-workspace-hack" } storage-interface = { path = "../storage-interface" } [dev-dependencies] @@ -37,9 +37,9 @@ rand = "0.8.3" proptest = "1.0.0" proptest-derive = "0.3.0" -diem-crypto = { path = "../../crates/diem-crypto", features = ["fuzzing"] } -diem-types = { path = "../../types", features = ["fuzzing"] } +aptos-crypto = { path = "../../crates/aptos-crypto", features = ["fuzzing"] } +aptos-types = { path = "../../types", features = ["fuzzing"] } [features] default = [] -fuzzing = ["proptest", "rand", "proptest-derive", "diem-crypto/fuzzing", "diem-types/fuzzing"] +fuzzing = ["proptest", "rand", "proptest-derive", "aptos-crypto/fuzzing", "aptos-types/fuzzing"] diff --git a/storage/jellyfish-merkle/src/iterator/iterator_test.rs b/storage/jellyfish-merkle/src/iterator/iterator_test.rs index fc8f9280ce76d..e1bb1ea993587 100644 --- a/storage/jellyfish-merkle/src/iterator/iterator_test.rs +++ b/storage/jellyfish-merkle/src/iterator/iterator_test.rs @@ -8,8 +8,8 @@ use crate::{ JellyfishMerkleTree, }; use anyhow::Result; -use diem_crypto::HashValue; -use diem_types::transaction::Version; +use aptos_crypto::HashValue; +use aptos_types::transaction::Version; use rand::{rngs::StdRng, SeedableRng}; use std::{collections::BTreeMap, sync::Arc}; diff --git a/storage/jellyfish-merkle/src/iterator/mod.rs b/storage/jellyfish-merkle/src/iterator/mod.rs index 333f73ae6a6c4..5bb4fb09e5291 100644 --- a/storage/jellyfish-merkle/src/iterator/mod.rs +++ b/storage/jellyfish-merkle/src/iterator/mod.rs @@ -14,8 +14,8 @@ use crate::{ TreeReader, }; use anyhow::{bail, ensure, format_err, Result}; -use diem_crypto::HashValue; -use diem_types::{ +use aptos_crypto::HashValue; +use aptos_types::{ nibble::{nibble_path::NibblePath, Nibble, ROOT_NIBBLE_HEIGHT}, transaction::Version, }; diff --git a/storage/jellyfish-merkle/src/jellyfish_merkle_test.rs b/storage/jellyfish-merkle/src/jellyfish_merkle_test.rs index 75cb04c6f14c3..2005ccee28d3f 100644 --- a/storage/jellyfish-merkle/src/jellyfish_merkle_test.rs +++ b/storage/jellyfish-merkle/src/jellyfish_merkle_test.rs @@ -7,8 +7,8 @@ use crate::test_helper::{ arb_tree_with_index, test_get_leaf_count, test_get_range_proof, test_get_with_proof, test_get_with_proof_with_distinct_last_nibble, ValueBlob, }; -use diem_crypto::HashValue; -use diem_types::{nibble::Nibble, transaction::PRE_GENESIS_VERSION}; +use aptos_crypto::HashValue; +use aptos_types::{nibble::Nibble, transaction::PRE_GENESIS_VERSION}; use mock_tree_store::MockTreeStore; use proptest::{collection::hash_set, prelude::*}; use rand::{rngs::StdRng, Rng, SeedableRng}; diff --git a/storage/jellyfish-merkle/src/lib.rs b/storage/jellyfish-merkle/src/lib.rs index 7380671a59e75..4e9ab1d556245 100644 --- a/storage/jellyfish-merkle/src/lib.rs +++ b/storage/jellyfish-merkle/src/lib.rs @@ -81,8 +81,8 @@ pub mod test_helper; mod tree_cache; use anyhow::{bail, ensure, format_err, Result}; -use diem_crypto::{hash::CryptoHash, HashValue}; -use diem_types::{ +use aptos_crypto::{hash::CryptoHash, HashValue}; +use aptos_types::{ nibble::{ nibble_path::{skip_common_prefix, NibbleIterator, NibblePath}, Nibble, ROOT_NIBBLE_HEIGHT, @@ -143,9 +143,9 @@ pub trait TestValue: Value + Arbitrary + std::fmt::Debug + Eq + PartialEq + 'sta // This crate still depends on types for a few things, therefore we implement `Value` and // `TestValue` for `AccountStateBlob` here. Ideally the module that defines the specific value like // `AccountStateBlob` should import the `Value` trait and implement it there. -impl Value for diem_types::account_state_blob::AccountStateBlob {} +impl Value for aptos_types::account_state_blob::AccountStateBlob {} #[cfg(any(test, feature = "fuzzing"))] -impl TestValue for diem_types::account_state_blob::AccountStateBlob {} +impl TestValue for aptos_types::account_state_blob::AccountStateBlob {} /// Node batch that will be written into db atomically with other batches. pub type NodeBatch = BTreeMap>; @@ -1034,8 +1034,8 @@ impl NibbleExt for HashValue { #[cfg(test)] mod test { use super::NibbleExt; - use diem_crypto::hash::{HashValue, TestOnlyHash}; - use diem_types::nibble::Nibble; + use aptos_crypto::hash::{HashValue, TestOnlyHash}; + use aptos_types::nibble::Nibble; #[test] fn test_common_prefix_nibbles_len() { diff --git a/storage/jellyfish-merkle/src/metrics.rs b/storage/jellyfish-merkle/src/metrics.rs index d203d60140545..41ebf3ff8f7de 100644 --- a/storage/jellyfish-merkle/src/metrics.rs +++ b/storage/jellyfish-merkle/src/metrics.rs @@ -1,7 +1,7 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_metrics::{register_int_counter, IntCounter}; +use aptos_metrics::{register_int_counter, IntCounter}; use once_cell::sync::Lazy; pub static DIEM_JELLYFISH_LEAF_ENCODED_BYTES: Lazy = Lazy::new(|| { diff --git a/storage/jellyfish-merkle/src/mock_tree_store.rs b/storage/jellyfish-merkle/src/mock_tree_store.rs index 604f841b19963..bb1d29a0d5d49 100644 --- a/storage/jellyfish-merkle/src/mock_tree_store.rs +++ b/storage/jellyfish-merkle/src/mock_tree_store.rs @@ -6,8 +6,8 @@ use crate::{ NodeBatch, StaleNodeIndex, TreeReader, TreeUpdateBatch, TreeWriter, }; use anyhow::{bail, ensure, Result}; -use diem_infallible::RwLock; -use diem_types::transaction::Version; +use aptos_infallible::RwLock; +use aptos_types::transaction::Version; use std::collections::{hash_map::Entry, BTreeSet, HashMap}; pub struct MockTreeStore { diff --git a/storage/jellyfish-merkle/src/node_type/mod.rs b/storage/jellyfish-merkle/src/node_type/mod.rs index 389460a4fba86..5ab19662c63bd 100644 --- a/storage/jellyfish-merkle/src/node_type/mod.rs +++ b/storage/jellyfish-merkle/src/node_type/mod.rs @@ -14,16 +14,16 @@ mod node_type_test; use crate::metrics::{DIEM_JELLYFISH_INTERNAL_ENCODED_BYTES, DIEM_JELLYFISH_LEAF_ENCODED_BYTES}; use anyhow::{ensure, Context, Result}; -use byteorder::{BigEndian, LittleEndian, ReadBytesExt, WriteBytesExt}; -use diem_crypto::{ +use aptos_crypto::{ hash::{CryptoHash, SPARSE_MERKLE_PLACEHOLDER_HASH}, HashValue, }; -use diem_types::{ +use aptos_types::{ nibble::{nibble_path::NibblePath, Nibble, ROOT_NIBBLE_HEIGHT}, proof::{SparseMerkleInternalNode, SparseMerkleLeafNode}, transaction::Version, }; +use byteorder::{BigEndian, LittleEndian, ReadBytesExt, WriteBytesExt}; use itertools::Itertools; use num_derive::{FromPrimitive, ToPrimitive}; use num_traits::cast::FromPrimitive; diff --git a/storage/jellyfish-merkle/src/node_type/node_type_test.rs b/storage/jellyfish-merkle/src/node_type/node_type_test.rs index d39a47479398b..45ee761c4bfc9 100644 --- a/storage/jellyfish-merkle/src/node_type/node_type_test.rs +++ b/storage/jellyfish-merkle/src/node_type/node_type_test.rs @@ -6,11 +6,11 @@ use super::{ NodeKey, }; use crate::{node_type::NodeType, test_helper::ValueBlob}; -use diem_crypto::{ +use aptos_crypto::{ hash::{CryptoHash, SPARSE_MERKLE_PLACEHOLDER_HASH}, HashValue, }; -use diem_types::{ +use aptos_types::{ nibble::{nibble_path::NibblePath, Nibble}, proof::{SparseMerkleInternalNode, SparseMerkleLeafNode}, transaction::Version, diff --git a/storage/jellyfish-merkle/src/restore/mod.rs b/storage/jellyfish-merkle/src/restore/mod.rs index 4a6c242bf4a3e..d46818933584d 100644 --- a/storage/jellyfish-merkle/src/restore/mod.rs +++ b/storage/jellyfish-merkle/src/restore/mod.rs @@ -15,11 +15,11 @@ use crate::{ NibbleExt, NodeBatch, TreeReader, TreeWriter, ROOT_NIBBLE_HEIGHT, }; use anyhow::{bail, ensure, Result}; -use diem_crypto::{ +use aptos_crypto::{ hash::{CryptoHash, SPARSE_MERKLE_PLACEHOLDER_HASH}, HashValue, }; -use diem_types::{ +use aptos_types::{ nibble::{ nibble_path::{NibbleIterator, NibblePath}, Nibble, diff --git a/storage/jellyfish-merkle/src/restore/restore_test.rs b/storage/jellyfish-merkle/src/restore/restore_test.rs index 0d95b1c03e070..a715a0d6c89d9 100644 --- a/storage/jellyfish-merkle/src/restore/restore_test.rs +++ b/storage/jellyfish-merkle/src/restore/restore_test.rs @@ -7,8 +7,8 @@ use crate::{ test_helper::{init_mock_db, ValueBlob}, JellyfishMerkleTree, TreeReader, }; -use diem_crypto::HashValue; -use diem_types::transaction::Version; +use aptos_crypto::HashValue; +use aptos_types::transaction::Version; use proptest::{collection::btree_map, prelude::*}; use std::{collections::BTreeMap, sync::Arc}; use storage_interface::StateSnapshotReceiver; diff --git a/storage/jellyfish-merkle/src/test_helper.rs b/storage/jellyfish-merkle/src/test_helper.rs index 8bbb2e67b40fc..49cf055e3cd46 100644 --- a/storage/jellyfish-merkle/src/test_helper.rs +++ b/storage/jellyfish-merkle/src/test_helper.rs @@ -2,12 +2,12 @@ // SPDX-License-Identifier: Apache-2.0 use crate::{mock_tree_store::MockTreeStore, node_type::LeafNode, JellyfishMerkleTree}; -use diem_crypto::{ +use aptos_crypto::{ hash::{CryptoHash, SPARSE_MERKLE_PLACEHOLDER_HASH}, HashValue, }; -use diem_crypto_derive::{BCSCryptoHash, CryptoHasher}; -use diem_types::{ +use aptos_crypto_derive::{BCSCryptoHash, CryptoHasher}; +use aptos_types::{ proof::{SparseMerkleInternalNode, SparseMerkleRangeProof}, transaction::Version, }; diff --git a/storage/jellyfish-merkle/src/tree_cache/mod.rs b/storage/jellyfish-merkle/src/tree_cache/mod.rs index 76be6f5808fc4..d3ccd9a32339e 100644 --- a/storage/jellyfish-merkle/src/tree_cache/mod.rs +++ b/storage/jellyfish-merkle/src/tree_cache/mod.rs @@ -75,8 +75,8 @@ use crate::{ NodeBatch, NodeStats, StaleNodeIndex, StaleNodeIndexBatch, TreeReader, TreeUpdateBatch, }; use anyhow::{bail, Result}; -use diem_crypto::HashValue; -use diem_types::transaction::{Version, PRE_GENESIS_VERSION}; +use aptos_crypto::HashValue; +use aptos_types::transaction::{Version, PRE_GENESIS_VERSION}; use std::collections::{hash_map::Entry, BTreeMap, BTreeSet, HashMap, HashSet}; /// `FrozenTreeCache` is used as a field of `TreeCache` storing all the nodes and values that diff --git a/storage/jellyfish-merkle/src/tree_cache/tree_cache_test.rs b/storage/jellyfish-merkle/src/tree_cache/tree_cache_test.rs index 33fa986cb7fba..271cd0f931233 100644 --- a/storage/jellyfish-merkle/src/tree_cache/tree_cache_test.rs +++ b/storage/jellyfish-merkle/src/tree_cache/tree_cache_test.rs @@ -3,8 +3,8 @@ use super::*; use crate::{mock_tree_store::MockTreeStore, node_type::Node, test_helper::ValueBlob, NodeKey}; -use diem_crypto::HashValue; -use diem_types::nibble::nibble_path::NibblePath; +use aptos_crypto::HashValue; +use aptos_types::nibble::nibble_path::NibblePath; fn random_leaf_with_key(next_version: Version) -> (Node, NodeKey) { let address = HashValue::random(); diff --git a/storage/schemadb/Cargo.toml b/storage/schemadb/Cargo.toml index 4fd44de4e1eee..eae4006afe05d 100644 --- a/storage/schemadb/Cargo.toml +++ b/storage/schemadb/Cargo.toml @@ -14,10 +14,10 @@ anyhow = "1.0.52" once_cell = "1.7.2" proptest = {version = "1.0.0", optional = true} -diem-config = { path = "../../config" } -diem-logger = { path = "../../crates/diem-logger" } -diem-metrics = { path = "../../crates/diem-metrics" } -diem-workspace-hack = { version = "0.1", path = "../../crates/diem-workspace-hack" } +aptos-config = { path = "../../config" } +aptos-logger = { path = "../../crates/aptos-logger" } +aptos-metrics = { path = "../../crates/aptos-metrics" } +aptos-workspace-hack = { version = "0.1", path = "../../crates/aptos-workspace-hack" } [dependencies.rocksdb] version = "0.17.0" @@ -27,7 +27,7 @@ features = ["lz4"] [dev-dependencies] byteorder = "1.4.3" proptest = "1.0.0" -diem-temppath = { path = "../../crates/diem-temppath" } +aptos-temppath = { path = "../../crates/aptos-temppath" } [features] fuzzing = ["proptest"] diff --git a/storage/schemadb/src/lib.rs b/storage/schemadb/src/lib.rs index 013227fdf26e4..89124d6219f34 100644 --- a/storage/schemadb/src/lib.rs +++ b/storage/schemadb/src/lib.rs @@ -27,7 +27,7 @@ use crate::{ schema::{KeyCodec, Schema, SeekKeyCodec, ValueCodec}, }; use anyhow::{ensure, format_err, Result}; -use diem_logger::prelude::*; +use aptos_logger::prelude::*; use std::{ collections::{BTreeMap, HashMap, HashSet}, iter::Iterator, diff --git a/storage/schemadb/src/metrics.rs b/storage/schemadb/src/metrics.rs index e280b4a5d141f..ecdad70dca1c0 100644 --- a/storage/schemadb/src/metrics.rs +++ b/storage/schemadb/src/metrics.rs @@ -1,7 +1,9 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_metrics::{register_histogram_vec, register_int_counter_vec, HistogramVec, IntCounterVec}; +use aptos_metrics::{ + register_histogram_vec, register_int_counter_vec, HistogramVec, IntCounterVec, +}; use once_cell::sync::Lazy; pub static DIEM_SCHEMADB_ITER_LATENCY_SECONDS: Lazy = Lazy::new(|| { diff --git a/storage/schemadb/tests/db.rs b/storage/schemadb/tests/db.rs index f8c6e94dd325b..46399d2849957 100644 --- a/storage/schemadb/tests/db.rs +++ b/storage/schemadb/tests/db.rs @@ -79,14 +79,14 @@ fn get_column_families() -> Vec { ] } -fn open_db(dir: &diem_temppath::TempPath) -> DB { +fn open_db(dir: &aptos_temppath::TempPath) -> DB { let mut db_opts = rocksdb::Options::default(); db_opts.create_if_missing(true); db_opts.create_missing_column_families(true); DB::open(&dir.path(), "test", get_column_families(), &db_opts).expect("Failed to open DB.") } -fn open_db_read_only(dir: &diem_temppath::TempPath) -> DB { +fn open_db_read_only(dir: &aptos_temppath::TempPath) -> DB { DB::open_readonly( &dir.path(), "test", @@ -96,7 +96,7 @@ fn open_db_read_only(dir: &diem_temppath::TempPath) -> DB { .expect("Failed to open DB.") } -fn open_db_as_secondary(dir: &diem_temppath::TempPath, dir_sec: &diem_temppath::TempPath) -> DB { +fn open_db_as_secondary(dir: &aptos_temppath::TempPath, dir_sec: &aptos_temppath::TempPath) -> DB { DB::open_as_secondary( &dir.path(), &dir_sec.path(), @@ -108,13 +108,13 @@ fn open_db_as_secondary(dir: &diem_temppath::TempPath, dir_sec: &diem_temppath:: } struct TestDB { - _tmpdir: diem_temppath::TempPath, + _tmpdir: aptos_temppath::TempPath, db: DB, } impl TestDB { fn new() -> Self { - let tmpdir = diem_temppath::TempPath::new(); + let tmpdir = aptos_temppath::TempPath::new(); let db = open_db(&tmpdir); TestDB { @@ -301,7 +301,7 @@ fn test_two_schema_batches() { #[test] fn test_reopen() { - let tmpdir = diem_temppath::TempPath::new(); + let tmpdir = aptos_temppath::TempPath::new(); { let db = open_db(&tmpdir); db.put::(&TestField(0), &TestField(0)).unwrap(); @@ -321,7 +321,7 @@ fn test_reopen() { #[test] fn test_open_read_only() { - let tmpdir = diem_temppath::TempPath::new(); + let tmpdir = aptos_temppath::TempPath::new(); { let db = open_db(&tmpdir); db.put::(&TestField(0), &TestField(0)).unwrap(); @@ -338,8 +338,8 @@ fn test_open_read_only() { #[test] fn test_open_as_secondary() { - let tmpdir = diem_temppath::TempPath::new(); - let tmpdir_sec = diem_temppath::TempPath::new(); + let tmpdir = aptos_temppath::TempPath::new(); + let tmpdir_sec = aptos_temppath::TempPath::new(); let db = open_db(&tmpdir); db.put::(&TestField(0), &TestField(0)).unwrap(); @@ -387,8 +387,8 @@ fn test_report_size() { #[test] fn test_checkpoint() { - let tmpdir = diem_temppath::TempPath::new(); - let checkpoint = diem_temppath::TempPath::new(); + let tmpdir = aptos_temppath::TempPath::new(); + let checkpoint = aptos_temppath::TempPath::new(); { let db = open_db(&tmpdir); db.put::(&TestField(0), &TestField(0)).unwrap(); diff --git a/storage/schemadb/tests/iterator.rs b/storage/schemadb/tests/iterator.rs index 59bb02c92857b..301deb1a73ed3 100644 --- a/storage/schemadb/tests/iterator.rs +++ b/storage/schemadb/tests/iterator.rs @@ -71,13 +71,13 @@ fn collect_values(iter: SchemaIterator) -> Vec { } struct TestDB { - _tmpdir: diem_temppath::TempPath, + _tmpdir: aptos_temppath::TempPath, db: DB, } impl TestDB { fn new() -> Self { - let tmpdir = diem_temppath::TempPath::new(); + let tmpdir = aptos_temppath::TempPath::new(); let column_families = vec![DEFAULT_CF_NAME, TestSchema::COLUMN_FAMILY_NAME]; let mut db_opts = rocksdb::Options::default(); db_opts.create_if_missing(true); diff --git a/storage/scratchpad/Cargo.toml b/storage/scratchpad/Cargo.toml index 1f10cd58bb457..a9d6535fc7430 100644 --- a/storage/scratchpad/Cargo.toml +++ b/storage/scratchpad/Cargo.toml @@ -17,11 +17,11 @@ once_cell = "1.7.2" proptest = { version = "1.0.0", optional = true } rayon = "1.5.0" -diem-crypto = { path = "../../crates/diem-crypto" } -diem-infallible = { path = "../../crates/diem-infallible" } -diem-metrics = { path = "../../crates/diem-metrics" } -diem-types = { path = "../../types" } -diem-workspace-hack = { version = "0.1", path = "../../crates/diem-workspace-hack" } +aptos-crypto = { path = "../../crates/aptos-crypto" } +aptos-infallible = { path = "../../crates/aptos-infallible" } +aptos-metrics = { path = "../../crates/aptos-metrics" } +aptos-types = { path = "../../types" } +aptos-workspace-hack = { version = "0.1", path = "../../crates/aptos-workspace-hack" } [dev-dependencies] @@ -30,11 +30,11 @@ criterion = "0.3.4" rand = "0.8.3" proptest = "1.0.0" -diem-types = { path = "../../types", features = ["fuzzing"] } +aptos-types = { path = "../../types", features = ["fuzzing"] } storage-interface = { path = "../storage-interface" } [features] -fuzzing = ["bitvec", "diem-types/fuzzing", "proptest"] +fuzzing = ["bitvec", "aptos-types/fuzzing", "proptest"] bench = ["bitvec", "proptest"] [[bench]] diff --git a/storage/scratchpad/benches/sparse_merkle.rs b/storage/scratchpad/benches/sparse_merkle.rs index a9a4b2bbc2e2d..f9c7c7058fa05 100644 --- a/storage/scratchpad/benches/sparse_merkle.rs +++ b/storage/scratchpad/benches/sparse_merkle.rs @@ -1,9 +1,9 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 +use aptos_crypto::{hash::SPARSE_MERKLE_PLACEHOLDER_HASH, HashValue}; +use aptos_types::account_state_blob::AccountStateBlob; use criterion::{criterion_group, criterion_main, BatchSize, BenchmarkId, Criterion, Throughput}; -use diem_crypto::{hash::SPARSE_MERKLE_PLACEHOLDER_HASH, HashValue}; -use diem_types::account_state_blob::AccountStateBlob; use itertools::zip_eq; use rand::{distributions::Standard, prelude::StdRng, seq::IteratorRandom, Rng, SeedableRng}; use scratchpad::{test_utils::naive_smt::NaiveSmt, SparseMerkleTree}; diff --git a/storage/scratchpad/src/sparse_merkle/batches_update.rs b/storage/scratchpad/src/sparse_merkle/batches_update.rs index 2388872583a89..12bcb222544b8 100644 --- a/storage/scratchpad/src/sparse_merkle/batches_update.rs +++ b/storage/scratchpad/src/sparse_merkle/batches_update.rs @@ -9,11 +9,11 @@ use crate::{ }, FrozenSparseMerkleTree, ProofRead, SparseMerkleTree, }; -use diem_crypto::{ +use aptos_crypto::{ hash::{CryptoHash, SPARSE_MERKLE_PLACEHOLDER_HASH}, HashValue, }; -use diem_types::proof::{SparseMerkleInternalNode, SparseMerkleLeafNode}; +use aptos_types::proof::{SparseMerkleInternalNode, SparseMerkleLeafNode}; use std::{borrow::Borrow, cmp, collections::BTreeMap}; impl SparseMerkleTree diff --git a/storage/scratchpad/src/sparse_merkle/metrics.rs b/storage/scratchpad/src/sparse_merkle/metrics.rs index 8bb4aee00114c..c77d358c17e3e 100644 --- a/storage/scratchpad/src/sparse_merkle/metrics.rs +++ b/storage/scratchpad/src/sparse_merkle/metrics.rs @@ -3,7 +3,7 @@ #![forbid(unsafe_code)] -use diem_metrics::{register_histogram_vec, register_int_gauge, HistogramVec, IntGauge}; +use aptos_metrics::{register_histogram_vec, register_int_gauge, HistogramVec, IntGauge}; use once_cell::sync::Lazy; pub static OLDEST_GENERATION: Lazy = Lazy::new(|| { diff --git a/storage/scratchpad/src/sparse_merkle/mod.rs b/storage/scratchpad/src/sparse_merkle/mod.rs index ebe025909ce73..c5eca21b701da 100644 --- a/storage/scratchpad/src/sparse_merkle/mod.rs +++ b/storage/scratchpad/src/sparse_merkle/mod.rs @@ -86,12 +86,12 @@ use crate::sparse_merkle::{ updater::SubTreeUpdater, utils::partition, }; -use diem_crypto::{ +use aptos_crypto::{ hash::{CryptoHash, SPARSE_MERKLE_PLACEHOLDER_HASH}, HashValue, }; -use diem_infallible::Mutex; -use diem_types::{ +use aptos_infallible::Mutex; +use aptos_types::{ nibble::{nibble_path::NibblePath, ROOT_NIBBLE_HEIGHT}, proof::SparseMerkleProof, }; diff --git a/storage/scratchpad/src/sparse_merkle/node.rs b/storage/scratchpad/src/sparse_merkle/node.rs index 6a3af9c0d1caf..87cbb5e1b81f2 100644 --- a/storage/scratchpad/src/sparse_merkle/node.rs +++ b/storage/scratchpad/src/sparse_merkle/node.rs @@ -21,11 +21,11 @@ //! corresponding account content. The difference is that a `LeafNode` does not always have the //! value, in the case when the leaf was loaded into memory as part of a non-inclusion proof. -use diem_crypto::{ +use aptos_crypto::{ hash::{CryptoHash, SPARSE_MERKLE_PLACEHOLDER_HASH}, HashValue, }; -use diem_types::proof::{SparseMerkleInternalNode, SparseMerkleLeafNode}; +use aptos_types::proof::{SparseMerkleInternalNode, SparseMerkleLeafNode}; use std::sync::{Arc, Weak}; #[derive(Clone, Debug)] diff --git a/storage/scratchpad/src/sparse_merkle/sparse_merkle_test.rs b/storage/scratchpad/src/sparse_merkle/sparse_merkle_test.rs index 23d4da111fea1..b85826ea57515 100644 --- a/storage/scratchpad/src/sparse_merkle/sparse_merkle_test.rs +++ b/storage/scratchpad/src/sparse_merkle/sparse_merkle_test.rs @@ -6,11 +6,11 @@ use crate::test_utils::{ proof_reader::ProofReader, proptest_helpers::{arb_smt_correctness_case, test_smt_correctness_impl}, }; -use diem_crypto::{ +use aptos_crypto::{ hash::{CryptoHash, TestOnlyHash, SPARSE_MERKLE_PLACEHOLDER_HASH}, HashValue, }; -use diem_types::{ +use aptos_types::{ account_state_blob::AccountStateBlob, proof::{SparseMerkleLeafNode, SparseMerkleProof}, }; @@ -23,7 +23,7 @@ fn update_byte(original_key: &HashValue, n: usize, byte: u8) -> HashValue { } fn hash_internal(left_child: HashValue, right_child: HashValue) -> HashValue { - diem_types::proof::SparseMerkleInternalNode::new(left_child, right_child).hash() + aptos_types::proof::SparseMerkleInternalNode::new(left_child, right_child).hash() } fn hash_leaf(key: HashValue, value_hash: HashValue) -> HashValue { diff --git a/storage/scratchpad/src/sparse_merkle/test_utils/naive_smt.rs b/storage/scratchpad/src/sparse_merkle/test_utils/naive_smt.rs index 921497dc9db26..257924915ede2 100644 --- a/storage/scratchpad/src/sparse_merkle/test_utils/naive_smt.rs +++ b/storage/scratchpad/src/sparse_merkle/test_utils/naive_smt.rs @@ -2,12 +2,12 @@ // SPDX-License-Identifier: Apache-2.0 use crate::sparse_merkle::utils::partition; -use bitvec::prelude::*; -use diem_crypto::{ +use aptos_crypto::{ hash::{CryptoHash, SPARSE_MERKLE_PLACEHOLDER_HASH}, HashValue, }; -use diem_types::proof::{SparseMerkleInternalNode, SparseMerkleLeafNode, SparseMerkleProof}; +use aptos_types::proof::{SparseMerkleInternalNode, SparseMerkleLeafNode, SparseMerkleProof}; +use bitvec::prelude::*; use std::collections::{BTreeMap, HashMap}; type Cache = HashMap, HashValue>; diff --git a/storage/scratchpad/src/sparse_merkle/test_utils/proof_reader.rs b/storage/scratchpad/src/sparse_merkle/test_utils/proof_reader.rs index fc63178d8d6b1..d51361179780f 100644 --- a/storage/scratchpad/src/sparse_merkle/test_utils/proof_reader.rs +++ b/storage/scratchpad/src/sparse_merkle/test_utils/proof_reader.rs @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 use crate::ProofRead; -use diem_crypto::HashValue; -use diem_types::proof::SparseMerkleProof; +use aptos_crypto::HashValue; +use aptos_types::proof::SparseMerkleProof; use std::collections::HashMap; pub struct ProofReader(HashMap>); diff --git a/storage/scratchpad/src/sparse_merkle/test_utils/proptest_helpers.rs b/storage/scratchpad/src/sparse_merkle/test_utils/proptest_helpers.rs index 1e38308fa491d..3e72a893cdd14 100644 --- a/storage/scratchpad/src/sparse_merkle/test_utils/proptest_helpers.rs +++ b/storage/scratchpad/src/sparse_merkle/test_utils/proptest_helpers.rs @@ -6,8 +6,8 @@ use crate::{ test_utils::{naive_smt::NaiveSmt, proof_reader::ProofReader}, SparseMerkleTree, }; -use diem_crypto::{hash::SPARSE_MERKLE_PLACEHOLDER_HASH, HashValue}; -use diem_types::account_state_blob::AccountStateBlob; +use aptos_crypto::{hash::SPARSE_MERKLE_PLACEHOLDER_HASH, HashValue}; +use aptos_types::account_state_blob::AccountStateBlob; use proptest::{ collection::{hash_set, vec}, prelude::*, diff --git a/storage/scratchpad/src/sparse_merkle/updater.rs b/storage/scratchpad/src/sparse_merkle/updater.rs index 16fd674e1d193..44f279b7f0df1 100644 --- a/storage/scratchpad/src/sparse_merkle/updater.rs +++ b/storage/scratchpad/src/sparse_merkle/updater.rs @@ -9,11 +9,11 @@ use crate::{ }, ProofRead, }; -use diem_crypto::{ +use aptos_crypto::{ hash::{CryptoHash, SPARSE_MERKLE_PLACEHOLDER_HASH}, HashValue, }; -use diem_types::proof::{SparseMerkleLeafNode, SparseMerkleProof}; +use aptos_types::proof::{SparseMerkleLeafNode, SparseMerkleProof}; use std::cmp::Ordering; type Result = std::result::Result; diff --git a/storage/scratchpad/src/sparse_merkle/utils.rs b/storage/scratchpad/src/sparse_merkle/utils.rs index 5b0a18c648db9..29332baece1a7 100644 --- a/storage/scratchpad/src/sparse_merkle/utils.rs +++ b/storage/scratchpad/src/sparse_merkle/utils.rs @@ -1,7 +1,7 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_crypto::HashValue; +use aptos_crypto::HashValue; /// Swap template-type values if 'cond'=true - useful to determine left/right parameters. pub(crate) fn swap_if(first: T, second: T, cond: bool) -> (T, T) { diff --git a/storage/state-view/Cargo.toml b/storage/state-view/Cargo.toml index e800ea5f2cc0e..1fe5d2e2dd2a5 100644 --- a/storage/state-view/Cargo.toml +++ b/storage/state-view/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "diem-state-view" +name = "aptos-state-view" version = "0.1.0" authors = ["Diem Association "] description = "Diem state view" @@ -11,10 +11,10 @@ edition = "2018" [dependencies] anyhow = "1.0.52" -diem-crypto = { path = "../../crates/diem-crypto" } -diem-types = { path = "../../types" } -diem-workspace-hack = { version = "0.1", path = "../../crates/diem-workspace-hack" } +aptos-crypto = { path = "../../crates/aptos-crypto" } +aptos-types = { path = "../../types" } +aptos-workspace-hack = { version = "0.1", path = "../../crates/aptos-workspace-hack" } [features] default = [] -fuzzing = ["diem-types/fuzzing"] +fuzzing = ["aptos-types/fuzzing"] diff --git a/storage/state-view/src/lib.rs b/storage/state-view/src/lib.rs index e683ce041f925..aa74c668034b2 100644 --- a/storage/state-view/src/lib.rs +++ b/storage/state-view/src/lib.rs @@ -6,8 +6,8 @@ //! This crate defines [`trait StateView`](StateView). use anyhow::Result; -use diem_crypto::HashValue; -use diem_types::{access_path::AccessPath, transaction::Version}; +use aptos_crypto::HashValue; +use aptos_types::{access_path::AccessPath, transaction::Version}; /// `StateView` is a trait that defines a read-only snapshot of the global state. It is passed to /// the VM for transaction execution, during which the VM is guaranteed to read anything at the diff --git a/storage/storage-client/Cargo.toml b/storage/storage-client/Cargo.toml index c2c6247038a66..08331c0e31cc9 100644 --- a/storage/storage-client/Cargo.toml +++ b/storage/storage-client/Cargo.toml @@ -14,12 +14,12 @@ anyhow = "1.0.52" serde = "1.0.124" bcs = "0.1.2" -diem-crypto = { path = "../../crates/diem-crypto" } -diem-logger = { path = "../../crates/diem-logger" } -diem-infallible = { path = "../../crates/diem-infallible" } -diem-secure-net = { path = "../../secure/net" } -diem-types = { path = "../../types" } -diem-workspace-hack = { version = "0.1", path = "../../crates/diem-workspace-hack" } +aptos-crypto = { path = "../../crates/aptos-crypto" } +aptos-logger = { path = "../../crates/aptos-logger" } +aptos-infallible = { path = "../../crates/aptos-infallible" } +aptos-secure-net = { path = "../../secure/net" } +aptos-types = { path = "../../types" } +aptos-workspace-hack = { version = "0.1", path = "../../crates/aptos-workspace-hack" } storage-interface = { path = "../storage-interface" } [features] diff --git a/storage/storage-client/src/lib.rs b/storage/storage-client/src/lib.rs index c882390cc90f8..b18c64487e3ab 100644 --- a/storage/storage-client/src/lib.rs +++ b/storage/storage-client/src/lib.rs @@ -4,10 +4,10 @@ #![forbid(unsafe_code)] use anyhow::Result; -use diem_infallible::Mutex; -use diem_logger::warn; -use diem_secure_net::NetworkClient; -use diem_types::{ +use aptos_infallible::Mutex; +use aptos_logger::warn; +use aptos_secure_net::NetworkClient; +use aptos_types::{ account_address::AccountAddress, account_state_blob::AccountStateBlob, ledger_info::LedgerInfoWithSignatures, diff --git a/storage/storage-interface/Cargo.toml b/storage/storage-interface/Cargo.toml index 2d558882d7cb2..e1f96e713ecf0 100644 --- a/storage/storage-interface/Cargo.toml +++ b/storage/storage-interface/Cargo.toml @@ -17,14 +17,14 @@ thiserror = "1.0.24" parking_lot = "0.11.1" bcs = "0.1.2" -diem-crypto = { path = "../../crates/diem-crypto" } -diem-secure-net = { path = "../../secure/net" } -diem-state-view = { path = "../state-view" } -diem-types = { path = "../../types" } -diem-workspace-hack = { version = "0.1", path = "../../crates/diem-workspace-hack" } +aptos-crypto = { path = "../../crates/aptos-crypto" } +aptos-secure-net = { path = "../../secure/net" } +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/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } [features] default = [] -fuzzing = ["diem-types/fuzzing"] +fuzzing = ["aptos-types/fuzzing"] diff --git a/storage/storage-interface/src/lib.rs b/storage/storage-interface/src/lib.rs index a3e4f8557aefe..4425930681e35 100644 --- a/storage/storage-interface/src/lib.rs +++ b/storage/storage-interface/src/lib.rs @@ -2,11 +2,11 @@ // SPDX-License-Identifier: Apache-2.0 use anyhow::{format_err, Result}; -use diem_crypto::{hash::SPARSE_MERKLE_PLACEHOLDER_HASH, HashValue}; -use diem_types::{ +use aptos_crypto::{hash::SPARSE_MERKLE_PLACEHOLDER_HASH, HashValue}; +use aptos_types::{ access_path::AccessPath, account_address::AccountAddress, - account_config::diem_root_address, + account_config::aptos_root_address, account_state::AccountState, account_state_blob::{AccountStateBlob, AccountStateWithProof, AccountStatesChunkWithProof}, contract_event::{ContractEvent, EventByVersionWithProof, EventWithProof}, @@ -65,7 +65,7 @@ impl StartupInfo { #[cfg(any(feature = "fuzzing"))] pub fn new_for_testing() -> Self { - use diem_types::on_chain_config::ValidatorSet; + use aptos_types::on_chain_config::ValidatorSet; let latest_ledger_info = LedgerInfoWithSignatures::genesis(HashValue::zero(), ValidatorSet::empty()); @@ -167,8 +167,8 @@ impl From for Error { } } -impl From for Error { - fn from(error: diem_secure_net::Error) -> Self { +impl From for Error { + fn from(error: aptos_secure_net::Error) -> Self { Self::ServiceError { error: format!("{}", error), } @@ -188,7 +188,7 @@ pub trait DbReader: Send + Sync { /// See [`DiemDB::get_epoch_ending_ledger_infos`]. /// /// [`DiemDB::get_epoch_ending_ledger_infos`]: - /// ../diemdb/struct.DiemDB.html#method.get_epoch_ending_ledger_infos + /// ../aptosdb/struct.DiemDB.html#method.get_epoch_ending_ledger_infos fn get_epoch_ending_ledger_infos( &self, start_epoch: u64, @@ -199,7 +199,7 @@ pub trait DbReader: Send + Sync { /// See [`DiemDB::get_transactions`]. /// - /// [`DiemDB::get_transactions`]: ../diemdb/struct.DiemDB.html#method.get_transactions + /// [`DiemDB::get_transactions`]: ../aptosdb/struct.DiemDB.html#method.get_transactions fn get_transactions( &self, start_version: Version, @@ -212,7 +212,7 @@ pub trait DbReader: Send + Sync { /// See [`DiemDB::get_transaction_by_hash`]. /// - /// [`DiemDB::get_transaction_by_hash`]: ../diemdb/struct.DiemDB.html#method.get_transaction_by_hash + /// [`DiemDB::get_transaction_by_hash`]: ../aptosdb/struct.DiemDB.html#method.get_transaction_by_hash fn get_transaction_by_hash( &self, hash: HashValue, @@ -224,7 +224,7 @@ pub trait DbReader: Send + Sync { /// See [`DiemDB::get_transaction_by_version`]. /// - /// [`DiemDB::get_transaction_by_version`]: ../diemdb/struct.DiemDB.html#method.get_transaction_by_version + /// [`DiemDB::get_transaction_by_version`]: ../aptosdb/struct.DiemDB.html#method.get_transaction_by_version fn get_transaction_by_version( &self, version: Version, @@ -236,21 +236,21 @@ pub trait DbReader: Send + Sync { /// See [`DiemDB::get_txn_set_version`]. /// - /// [`DiemDB::get_first_txn_version`]: ../diemdb/struct.DiemDB.html#method.get_first_txn_version + /// [`DiemDB::get_first_txn_version`]: ../aptosdb/struct.DiemDB.html#method.get_first_txn_version fn get_first_txn_version(&self) -> Result> { unimplemented!() } /// See [`DiemDB::get_first_write_set_version`]. /// - /// [`DiemDB::get_first_write_set_version`]: ../diemdb/struct.DiemDB.html#method.get_first_write_set_version + /// [`DiemDB::get_first_write_set_version`]: ../aptosdb/struct.DiemDB.html#method.get_first_write_set_version fn get_first_write_set_version(&self) -> Result> { unimplemented!() } /// See [`DiemDB::get_transaction_outputs`]. /// - /// [`DiemDB::get_transaction_outputs`]: ../diemdb/struct.DiemDB.html#method.get_transaction_outputs + /// [`DiemDB::get_transaction_outputs`]: ../aptosdb/struct.DiemDB.html#method.get_transaction_outputs fn get_transaction_outputs( &self, start_version: Version, @@ -286,7 +286,7 @@ pub trait DbReader: Send + Sync { /// See [`DiemDB::get_block_timestamp`]. /// /// [`DiemDB::get_block_timestamp`]: - /// ../diemdb/struct.DiemDB.html#method.get_block_timestamp + /// ../aptosdb/struct.DiemDB.html#method.get_block_timestamp fn get_block_timestamp(&self, version: u64) -> Result { unimplemented!() } @@ -316,7 +316,7 @@ pub trait DbReader: Send + Sync { /// See [`DiemDB::get_latest_account_state`]. /// /// [`DiemDB::get_latest_account_state`]: - /// ../diemdb/struct.DiemDB.html#method.get_latest_account_state + /// ../aptosdb/struct.DiemDB.html#method.get_latest_account_state fn get_latest_account_state( &self, address: AccountAddress, @@ -345,7 +345,7 @@ pub trait DbReader: Send + Sync { /// See [`DiemDB::get_startup_info`]. /// /// [`DiemDB::get_startup_info`]: - /// ../diemdb/struct.DiemDB.html#method.get_startup_info + /// ../aptosdb/struct.DiemDB.html#method.get_startup_info fn get_startup_info(&self) -> Result> { unimplemented!() } @@ -408,7 +408,7 @@ pub trait DbReader: Send + Sync { // See [`DiemDB::get_account_state_with_proof_by_version`]. // // [`DiemDB::get_account_state_with_proof_by_version`]: - // ../diemdb/struct.DiemDB.html#method.get_account_state_with_proof_by_version + // ../aptosdb/struct.DiemDB.html#method.get_account_state_with_proof_by_version // // This is used by diem core (executor) internally. fn get_account_state_with_proof_by_version( @@ -529,18 +529,18 @@ impl MoveStorage for &dyn DbReader { } fn fetch_config_by_version(&self, config_id: ConfigID, version: Version) -> Result> { - let diem_root_state = AccountState::try_from( + let aptos_root_state = AccountState::try_from( &self - .get_account_state_with_proof_by_version(diem_root_address(), version)? + .get_account_state_with_proof_by_version(aptos_root_address(), version)? .0 .ok_or_else(|| { format_err!("missing blob in account state/account does not exist") })?, )?; - match diem_root_state.get(&experimental_access_path_for_config(config_id).path) { + match aptos_root_state.get(&experimental_access_path_for_config(config_id).path) { Some(config) => Ok(config.to_vec()), - _ => diem_root_state + _ => aptos_root_state .get(&default_access_path_for_config(config_id).path) .map_or_else( || { @@ -576,7 +576,7 @@ pub trait DbWriter: Send + Sync { /// blocks during normal operation. /// See [`DiemDB::save_transactions`]. /// - /// [`DiemDB::save_transactions`]: ../diemdb/struct.DiemDB.html#method.save_transactions + /// [`DiemDB::save_transactions`]: ../aptosdb/struct.DiemDB.html#method.save_transactions fn save_transactions( &self, txns_to_commit: &[TransactionToCommit], diff --git a/storage/storage-interface/src/mock.rs b/storage/storage-interface/src/mock.rs index af1b7eeef8ca3..ebd0015e01457 100644 --- a/storage/storage-interface/src/mock.rs +++ b/storage/storage-interface/src/mock.rs @@ -5,7 +5,7 @@ use crate::{DbReader, DbWriter}; use anyhow::Result; -use diem_types::{ +use aptos_types::{ account_address::AccountAddress, account_config::AccountResource, account_state::AccountState, account_state_blob::AccountStateBlob, }; diff --git a/storage/storage-interface/src/state_view.rs b/storage/storage-interface/src/state_view.rs index 2f6a57a16a77b..ca47128bd5e4a 100644 --- a/storage/storage-interface/src/state_view.rs +++ b/storage/storage-interface/src/state_view.rs @@ -3,9 +3,9 @@ use crate::DbReader; use anyhow::{format_err, Result}; -use diem_crypto::{hash::SPARSE_MERKLE_PLACEHOLDER_HASH, HashValue}; -use diem_state_view::{StateView, StateViewId}; -use diem_types::{ +use aptos_crypto::{hash::SPARSE_MERKLE_PLACEHOLDER_HASH, HashValue}; +use aptos_state_view::{StateView, StateViewId}; +use aptos_types::{ access_path::AccessPath, account_address::{AccountAddress, HashAccountAddress}, account_state::AccountState, diff --git a/storage/storage-service/Cargo.toml b/storage/storage-service/Cargo.toml index 6310731875e9a..b6c4ca52a3195 100644 --- a/storage/storage-service/Cargo.toml +++ b/storage/storage-service/Cargo.toml @@ -15,26 +15,26 @@ tokio = { version = "1.8.1", features = ["full"] } futures = "0.3.12" bcs = "0.1.2" -diem-config = { path = "../../config" } -diem-crypto = { path = "../../crates/diem-crypto" } -diemdb = { path = "../diemdb" } -diem-logger = { path = "../../crates/diem-logger" } -diem-metrics = { path = "../../crates/diem-metrics" } -diem-secure-net = { path = "../../secure/net" } +aptos-config = { path = "../../config" } +aptos-crypto = { path = "../../crates/aptos-crypto" } +aptosdb = { path = "../aptosdb" } +aptos-logger = { path = "../../crates/aptos-logger" } +aptos-metrics = { path = "../../crates/aptos-metrics" } +aptos-secure-net = { path = "../../secure/net" } storage-interface = { path = "../storage-interface" } -diem-types = { path = "../../types" } -diem-workspace-hack = { version = "0.1", path = "../../crates/diem-workspace-hack" } +aptos-types = { path = "../../types" } +aptos-workspace-hack = { version = "0.1", path = "../../crates/aptos-workspace-hack" } rand = { version = "0.8.3", optional = true } storage-client = { path = "../storage-client", optional = true } proptest = { version = "1.0.0", optional = true } [dev-dependencies] itertools = "0.10.0" -diemdb = { path = "../diemdb", features = ["fuzzing"] } -diem-temppath = { path = "../../crates/diem-temppath" } +aptosdb = { path = "../aptosdb", features = ["fuzzing"] } +aptos-temppath = { path = "../../crates/aptos-temppath" } proptest = "1.0.0" storage-client = { path = "../storage-client" } [features] default = [] -fuzzing = ["proptest", "diemdb/fuzzing", "rand"] +fuzzing = ["proptest", "aptosdb/fuzzing", "rand"] diff --git a/storage/storage-service/src/lib.rs b/storage/storage-service/src/lib.rs index 5009f22033ca6..f8724ebfb2203 100644 --- a/storage/storage-service/src/lib.rs +++ b/storage/storage-service/src/lib.rs @@ -9,11 +9,11 @@ //! [`storage-client`](../storage-client/index.html) instead of via use anyhow::Result; -use diem_config::config::NodeConfig; -use diem_logger::prelude::*; -use diem_secure_net::NetworkServer; -use diem_types::{account_state_blob::AccountStateBlob, proof::SparseMerkleProof}; -use diemdb::DiemDB; +use aptos_config::config::NodeConfig; +use aptos_logger::prelude::*; +use aptos_secure_net::NetworkServer; +use aptos_types::{account_state_blob::AccountStateBlob, proof::SparseMerkleProof}; +use aptosdb::DiemDB; use std::{ sync::Arc, thread::{self, JoinHandle}, diff --git a/storage/storage-service/src/storage_service_test.rs b/storage/storage-service/src/storage_service_test.rs index 505a9ee9eb13e..db24d0c7d2195 100644 --- a/storage/storage-service/src/storage_service_test.rs +++ b/storage/storage-service/src/storage_service_test.rs @@ -2,10 +2,10 @@ // SPDX-License-Identifier: Apache-2.0 use super::*; -use diem_config::{config::NodeConfig, utils}; -use diem_types::account_address::HashAccountAddress; +use aptos_config::{config::NodeConfig, utils}; +use aptos_types::account_address::HashAccountAddress; #[cfg(test)] -use diemdb::test_helper::arb_blocks_to_commit; +use aptosdb::test_helper::arb_blocks_to_commit; use itertools::zip_eq; use proptest::prelude::*; use std::{ @@ -14,9 +14,9 @@ use std::{ }; use storage_client::StorageClient; -fn start_test_storage_with_client() -> (JoinHandle<()>, diem_temppath::TempPath, StorageClient) { +fn start_test_storage_with_client() -> (JoinHandle<()>, aptos_temppath::TempPath, StorageClient) { let mut config = NodeConfig::random(); - let tmp_dir = diem_temppath::TempPath::new(); + let tmp_dir = aptos_temppath::TempPath::new(); let server_port = utils::get_available_port(); config.storage.address = SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), server_port); diff --git a/terraform/helm/fullnode/Chart.yaml b/terraform/helm/fullnode/Chart.yaml index 973bfeb2422d9..1b97d871ffb41 100644 --- a/terraform/helm/fullnode/Chart.yaml +++ b/terraform/helm/fullnode/Chart.yaml @@ -1,4 +1,4 @@ apiVersion: v2 appVersion: 1.5.0-rc.1 -name: diem-fullnode +name: aptos-fullnode version: 1.5.0-rc.1 diff --git a/terraform/helm/fullnode/files/genesis/testnet.blob b/terraform/helm/fullnode/files/genesis/testnet.blob index 688295d8589fa..013072a5e7c64 100644 Binary files a/terraform/helm/fullnode/files/genesis/testnet.blob and b/terraform/helm/fullnode/files/genesis/testnet.blob differ diff --git a/terraform/helm/fullnode/templates/NOTES.txt b/terraform/helm/fullnode/templates/NOTES.txt index 3a855318f7373..7085774fc5a60 100644 --- a/terraform/helm/fullnode/templates/NOTES.txt +++ b/terraform/helm/fullnode/templates/NOTES.txt @@ -1,6 +1,6 @@ Your {{ .Chart.Name }} deployment named {{ .Release.Name }} is now deployed. -To access the JSON-RPC endpoint connect to the {{ include "diem-fullnode.fullname" . }}-lb service: +To access the JSON-RPC endpoint connect to the {{ include "aptos-fullnode.fullname" . }}-lb service: - $ kubectl port-forward service/{{ include "diem-fullnode.fullname" . }}-lb 8080:80 & + $ kubectl port-forward service/{{ include "aptos-fullnode.fullname" . }}-lb 8080:80 & $ curl -H "Content-Type: application/json" -d '{"jsonrpc":"2.0", "method":"get_metadata","params":[],"id":1}' http://localhost:8080 diff --git a/terraform/helm/fullnode/templates/_helpers.tpl b/terraform/helm/fullnode/templates/_helpers.tpl index 179e8713accf2..6ccce631f2336 100644 --- a/terraform/helm/fullnode/templates/_helpers.tpl +++ b/terraform/helm/fullnode/templates/_helpers.tpl @@ -2,7 +2,7 @@ {{/* Expand the name of the chart. */}} -{{- define "diem-fullnode.name" -}} +{{- define "aptos-fullnode.name" -}} {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} {{- end -}} @@ -11,7 +11,7 @@ Create a default fully qualified app name. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). If release name contains chart name it will be used as a full name. */}} -{{- define "diem-fullnode.fullname" -}} +{{- define "aptos-fullnode.fullname" -}} {{- if .Values.fullnameOverride -}} {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} {{- else -}} @@ -27,16 +27,16 @@ If release name contains chart name it will be used as a full name. {{/* Create chart name and version as used by the chart label. */}} -{{- define "diem-fullnode.chart" -}} +{{- define "aptos-fullnode.chart" -}} {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} {{- end -}} {{/* Common labels */}} -{{- define "diem-fullnode.labels" -}} -helm.sh/chart: {{ include "diem-fullnode.chart" . }} -{{ include "diem-fullnode.selectorLabels" . }} +{{- define "aptos-fullnode.labels" -}} +helm.sh/chart: {{ include "aptos-fullnode.chart" . }} +{{ include "aptos-fullnode.selectorLabels" . }} {{- if .Chart.AppVersion }} app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} {{- end }} @@ -46,23 +46,23 @@ app.kubernetes.io/managed-by: {{ .Release.Service }} {{/* Selector labels */}} -{{- define "diem-fullnode.selectorLabels" -}} -app.kubernetes.io/part-of: {{ include "diem-fullnode.name" . }} +{{- define "aptos-fullnode.selectorLabels" -}} +app.kubernetes.io/part-of: {{ include "aptos-fullnode.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} {{- end -}} {{/* Create the name of the service account to use */}} -{{- define "diem-fullnode.serviceAccountName" -}} +{{- define "aptos-fullnode.serviceAccountName" -}} {{- if .Values.serviceAccount.create -}} - {{ default (include "diem-fullnode.fullname" .) .Values.serviceAccount.name }} + {{ default (include "aptos-fullnode.fullname" .) .Values.serviceAccount.name }} {{- else -}} {{ default "default" .Values.serviceAccount.name }} {{- end -}} {{- end -}} -{{- define "diem-fullnode.backupEnvironment" -}} +{{- define "aptos-fullnode.backupEnvironment" -}} # awscli writes to ~/.aws/cli/cache/ # gsutil writes to ~/.gsutil/ # azcopy writes to ~/.azcopy/ @@ -101,27 +101,27 @@ Create the name of the service account to use {{- end -}} {{- define "backup.fullname" -}} -{{ include "diem-fullnode.fullname" . }} +{{ include "aptos-fullnode.fullname" . }} {{- end -}} {{- define "backup.labels" -}} -{{ include "diem-fullnode.labels" . }} +{{ include "aptos-fullnode.labels" . }} {{- end -}} {{- define "backup.selectorLabels" -}} -{{ include "diem-fullnode.selectorLabels" . }} +{{ include "aptos-fullnode.selectorLabels" . }} {{- end -}} {{- define "backup.serviceAccount" -}} -{{ include "diem-fullnode.serviceAccountName" . }} +{{ include "aptos-fullnode.serviceAccountName" . }} {{- end -}} {{- define "backup.backupService" -}} -{{ include "diem-fullnode.fullname" . }}:6186 +{{ include "aptos-fullnode.fullname" . }}:6186 {{- end -}} {{- define "backup.persistentVolumeClaim" -}} -{{ include "diem-fullnode.fullname" . }}-e{{ .Values.chain.era }} +{{ include "aptos-fullnode.fullname" . }}-e{{ .Values.chain.era }} {{- end -}} {{- define "backup.pushGateway" -}} diff --git a/terraform/helm/fullnode/templates/backup-verify.yaml b/terraform/helm/fullnode/templates/backup-verify.yaml index f5e39824fe954..56e9de4102d59 100644 --- a/terraform/helm/fullnode/templates/backup-verify.yaml +++ b/terraform/helm/fullnode/templates/backup-verify.yaml @@ -33,7 +33,7 @@ spec: - {{ . }} {{- end }} - --metadata-cache-dir - - /tmp/diem-backup-verify-metadata + - /tmp/aptos-backup-verify-metadata - command-adapter - --config # use the same config with the backup sts diff --git a/terraform/helm/fullnode/templates/backup.yaml b/terraform/helm/fullnode/templates/backup.yaml index 1920196d49d6c..cb9cd26822c5f 100644 --- a/terraform/helm/fullnode/templates/backup.yaml +++ b/terraform/helm/fullnode/templates/backup.yaml @@ -44,7 +44,7 @@ spec: - "coordinator" - "run" - "--metadata-cache-dir" - - "/tmp/diem-backup-metadata" + - "/tmp/aptos-backup-metadata" - "--backup-service-address" - "http://{{ include "backup.backupService" . }}" {{- with .Values.backup }} diff --git a/terraform/helm/fullnode/templates/configmaps.yaml b/terraform/helm/fullnode/templates/configmaps.yaml index 937f324058461..0d274d1f5ce1f 100644 --- a/terraform/helm/fullnode/templates/configmaps.yaml +++ b/terraform/helm/fullnode/templates/configmaps.yaml @@ -1,9 +1,9 @@ apiVersion: v1 kind: ConfigMap metadata: - name: {{ include "diem-fullnode.fullname" . }} + name: {{ include "aptos-fullnode.fullname" . }} labels: - {{- include "diem-fullnode.labels" . | nindent 4 }} + {{- include "aptos-fullnode.labels" . | nindent 4 }} data: {{ (tpl (.Files.Glob "files/*.yaml").AsConfig .) | indent 2 }} @@ -13,9 +13,9 @@ data: apiVersion: v1 kind: ConfigMap metadata: - name: {{ include "diem-fullnode.fullname" . }}-genesis + name: {{ include "aptos-fullnode.fullname" . }}-genesis labels: - {{- include "diem-fullnode.labels" . | nindent 4 }} + {{- include "aptos-fullnode.labels" . | nindent 4 }} data: waypoint.txt: {{ (get .Values.diem_chains .Values.chain.name).waypoint }} binaryData: diff --git a/terraform/helm/fullnode/templates/fullnode.yaml b/terraform/helm/fullnode/templates/fullnode.yaml index f4d2e8c317a5e..97b46bab82a99 100644 --- a/terraform/helm/fullnode/templates/fullnode.yaml +++ b/terraform/helm/fullnode/templates/fullnode.yaml @@ -1,22 +1,22 @@ apiVersion: apps/v1 kind: StatefulSet metadata: - name: {{ include "diem-fullnode.fullname" . }} + name: {{ include "aptos-fullnode.fullname" . }} labels: - {{- include "diem-fullnode.labels" . | nindent 4 }} + {{- include "aptos-fullnode.labels" . | nindent 4 }} app.kubernetes.io/name: fullnode spec: - serviceName: {{ include "diem-fullnode.fullname" . }} + serviceName: {{ include "aptos-fullnode.fullname" . }} replicas: 1 podManagementPolicy: Parallel selector: matchLabels: - {{- include "diem-fullnode.selectorLabels" . | nindent 6 }} + {{- include "aptos-fullnode.selectorLabels" . | nindent 6 }} app.kubernetes.io/name: fullnode template: metadata: labels: - {{- include "diem-fullnode.selectorLabels" . | nindent 8 }} + {{- include "aptos-fullnode.selectorLabels" . | nindent 8 }} app.kubernetes.io/name: fullnode annotations: seccomp.security.alpha.kubernetes.io/pod: runtime/default @@ -26,7 +26,7 @@ spec: - name: fullnode image: {{ .Values.image.repo }}:{{ .Values.image.tag }} imagePullPolicy: {{ .Values.image.pullPolicy }} - command: ["/opt/diem/bin/diem-node", "-f", "/opt/diem/etc/fullnode.yaml"] + command: ["/opt/diem/bin/aptos-node", "-f", "/opt/diem/etc/fullnode.yaml"] resources: {{- toYaml .Values.resources | nindent 10 }} env: @@ -41,11 +41,11 @@ spec: - name: RUST_BACKTRACE value: "1" volumeMounts: - - name: diem-config + - name: aptos-config mountPath: /opt/diem/etc - - name: diem-genesis + - name: aptos-genesis mountPath: /opt/diem/genesis - - name: diem-data + - name: aptos-data mountPath: /opt/diem/data - name: tmp mountPath: /tmp @@ -85,22 +85,22 @@ spec: fsGroup: 6180 {{- end }} volumes: - - name: diem-config + - name: aptos-config configMap: - name: {{ include "diem-fullnode.fullname" . }} - - name: diem-genesis + name: {{ include "aptos-fullnode.fullname" . }} + - name: aptos-genesis configMap: {{- if .Values.chain.genesisConfigmap }} name: {{ .Values.chain.genesisConfigmap }} {{- else }} - name: {{ include "diem-fullnode.fullname" . }}-genesis + name: {{ include "aptos-fullnode.fullname" . }}-genesis {{- end }} - - name: diem-data + - name: aptos-data persistentVolumeClaim: - claimName: {{ include "diem-fullnode.fullname" . }}-e{{ .Values.chain.era }} + claimName: {{ include "aptos-fullnode.fullname" . }}-e{{ .Values.chain.era }} - name: tmp emptyDir: {} - serviceAccountName: {{ include "diem-fullnode.serviceAccountName" . }} + serviceAccountName: {{ include "aptos-fullnode.serviceAccountName" . }} {{- if .Values.imagePullSecret }} imagePullSecrets: - name: {{.Values.imagePullSecret}} diff --git a/terraform/helm/fullnode/templates/restore.yaml b/terraform/helm/fullnode/templates/restore.yaml index 889684978aaf1..7268142619432 100644 --- a/terraform/helm/fullnode/templates/restore.yaml +++ b/terraform/helm/fullnode/templates/restore.yaml @@ -29,13 +29,13 @@ spec: - -c - |- set -ex - # cleanup diemdb + # cleanup aptosdb if [ ! -f /opt/diem/data/restore-uid ] || [ "$(cat /opt/diem/data/restore-uid)" != "$CONTROLLER_UID" ]; then rm -rf /opt/diem/data/db echo "$CONTROLLER_UID" > /opt/diem/data/restore-uid fi # start restore process - /usr/local/bin/db-restore --concurrent-downloads {{ .config.concurrent_downloads }}{{ range .config.trusted_waypoints }} --trust-waypoint {{ . }}{{ end }} --target-db-dir /opt/diem/data/db auto --metadata-cache-dir /tmp/diem-restore-metadata command-adapter --config /opt/diem/etc/{{ .config.location }}.toml + /usr/local/bin/db-restore --concurrent-downloads {{ .config.concurrent_downloads }}{{ range .config.trusted_waypoints }} --trust-waypoint {{ . }}{{ end }} --target-db-dir /opt/diem/data/db auto --metadata-cache-dir /tmp/aptos-restore-metadata command-adapter --config /opt/diem/etc/{{ .config.location }}.toml env: - name: RUST_LOG value: "debug" @@ -55,7 +55,7 @@ spec: volumeMounts: - name: backup-config mountPath: /opt/diem/etc - - name: diem-data + - name: aptos-data mountPath: /opt/diem/data - name: tmp mountPath: /tmp @@ -89,7 +89,7 @@ spec: name: {{ include "backup.fullname" . }}-backup - name: tmp emptyDir: {} - - name: diem-data + - name: aptos-data persistentVolumeClaim: claimName: {{ include "backup.persistentVolumeClaim" . }} serviceAccountName: {{ include "backup.serviceAccount" . }} diff --git a/terraform/helm/fullnode/templates/service.yaml b/terraform/helm/fullnode/templates/service.yaml index e33b067c33441..4880bc9bcf943 100644 --- a/terraform/helm/fullnode/templates/service.yaml +++ b/terraform/helm/fullnode/templates/service.yaml @@ -1,16 +1,16 @@ apiVersion: v1 kind: Service metadata: - name: {{ include "diem-fullnode.fullname" . }}-lb + name: {{ include "aptos-fullnode.fullname" . }}-lb labels: - {{- include "diem-fullnode.labels" . | nindent 4 }} + {{- include "aptos-fullnode.labels" . | nindent 4 }} {{- with .Values.service.annotations }} annotations: {{- toYaml . | nindent 4 }} {{- end }} spec: selector: - {{- include "diem-fullnode.selectorLabels" . | nindent 4 }} + {{- include "aptos-fullnode.selectorLabels" . | nindent 4 }} app.kubernetes.io/name: fullnode ports: - name: api @@ -28,12 +28,12 @@ spec: apiVersion: v1 kind: Service metadata: - name: {{ include "diem-fullnode.fullname" . }} + name: {{ include "aptos-fullnode.fullname" . }} labels: - {{- include "diem-fullnode.labels" . | nindent 4 }} + {{- include "aptos-fullnode.labels" . | nindent 4 }} spec: selector: - {{- include "diem-fullnode.selectorLabels" . | nindent 4 }} + {{- include "aptos-fullnode.selectorLabels" . | nindent 4 }} app.kubernetes.io/name: fullnode ports: - name: backup diff --git a/terraform/helm/fullnode/templates/serviceaccount.yaml b/terraform/helm/fullnode/templates/serviceaccount.yaml index ec62f47582593..e52143a259c0c 100644 --- a/terraform/helm/fullnode/templates/serviceaccount.yaml +++ b/terraform/helm/fullnode/templates/serviceaccount.yaml @@ -2,9 +2,9 @@ apiVersion: v1 kind: ServiceAccount metadata: - name: {{ include "diem-fullnode.serviceAccountName" . }} + name: {{ include "aptos-fullnode.serviceAccountName" . }} labels: - {{ include "diem-fullnode.labels" . | nindent 4 }} + {{ include "aptos-fullnode.labels" . | nindent 4 }} annotations: {{- toYaml .Values.serviceAccount.annotations | nindent 4 }} {{- end -}} diff --git a/terraform/helm/fullnode/templates/storage.yaml b/terraform/helm/fullnode/templates/storage.yaml index 0b83a6faa143b..1b247bcb847f4 100644 --- a/terraform/helm/fullnode/templates/storage.yaml +++ b/terraform/helm/fullnode/templates/storage.yaml @@ -1,9 +1,9 @@ apiVersion: v1 kind: PersistentVolumeClaim metadata: - name: {{ include "diem-fullnode.fullname" . }}-e{{ .Values.chain.era }} + name: {{ include "aptos-fullnode.fullname" . }}-e{{ .Values.chain.era }} labels: - {{- include "diem-fullnode.labels" . | nindent 4 }} + {{- include "aptos-fullnode.labels" . | nindent 4 }} spec: accessModes: - ReadWriteOnce diff --git a/terraform/helm/fullnode/templates/tests/test-fullnode-connection.yaml b/terraform/helm/fullnode/templates/tests/test-fullnode-connection.yaml index 40f83ca36d51c..3c5bd37f34bde 100644 --- a/terraform/helm/fullnode/templates/tests/test-fullnode-connection.yaml +++ b/terraform/helm/fullnode/templates/tests/test-fullnode-connection.yaml @@ -1,12 +1,12 @@ apiVersion: v1 kind: Pod metadata: - name: {{ include "diem-fullnode.fullname" . }}-sync-test + name: {{ include "aptos-fullnode.fullname" . }}-sync-test annotations: "helm.sh/hook": test spec: containers: - - name: {{ include "diem-fullnode.fullname" . }}-sync-test + - name: {{ include "aptos-fullnode.fullname" . }}-sync-test image: byrnedo/alpine-curl:0.1.8@sha256:548379d0a4a0c08b9e55d9d87a592b7d35d9ab3037f4936f5ccd09d0b625a342 imagePullPolicy: {{ .Values.image.pullPolicy }} command: @@ -14,5 +14,5 @@ spec: - -c - |- set -ex - curl --fail -X POST -H "Content-Type: application/json" --data '{"jsonrpc":"2.0", "method":"get_metadata","params":[],"id":1}' http://{{ include "diem-fullnode.fullname" . }}-lb:80 + curl --fail -X POST -H "Content-Type: application/json" --data '{"jsonrpc":"2.0", "method":"get_metadata","params":[],"id":1}' http://{{ include "aptos-fullnode.fullname" . }}-lb:80 restartPolicy: Never diff --git a/terraform/helm/logger/Chart.yaml b/terraform/helm/logger/Chart.yaml index 0ee0315d3dfde..e2bdba437686c 100644 --- a/terraform/helm/logger/Chart.yaml +++ b/terraform/helm/logger/Chart.yaml @@ -1,3 +1,3 @@ apiVersion: v2 -name: diem-logger +name: aptos-logger version: 0.2.0 diff --git a/terraform/helm/logger/README.md b/terraform/helm/logger/README.md index adcf8386ba23c..bf7f625c82b18 100644 --- a/terraform/helm/logger/README.md +++ b/terraform/helm/logger/README.md @@ -27,7 +27,7 @@ Deployment 1. Install Helm v3: https://helm.sh/docs/intro/install/ 2. Configure `kubectl` with the Kubernetes cluster you wish to use. 3. Set the value `logger.name` to `-`, e.g. `novi-pfn` -4. Set the value `serviceAccount.name` to an existing fullnode or validator service account, or do a role binding, e.g. with `diem-validator-psp`. +4. Set the value `serviceAccount.name` to an existing fullnode or validator service account, or do a role binding, e.g. with `aptos-validator-psp`. 5. Configure any of the other helm values if applicable. An example to connect to `mainnet` is included in the `values` directory. If unset, the fullnode will connect to premainnet by default. 6. Install the release, setting any options: diff --git a/terraform/helm/logger/templates/_helpers.tpl b/terraform/helm/logger/templates/_helpers.tpl index 171241fe7a893..759d584dc4899 100644 --- a/terraform/helm/logger/templates/_helpers.tpl +++ b/terraform/helm/logger/templates/_helpers.tpl @@ -2,7 +2,7 @@ {{/* Expand the name of the chart. */}} -{{- define "diem-logger.name" -}} +{{- define "aptos-logger.name" -}} {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} {{- end }} @@ -11,7 +11,7 @@ Create a default fully qualified app name. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). If release name contains chart name it will be used as a full name. */}} -{{- define "diem-logger.fullname" -}} +{{- define "aptos-logger.fullname" -}} {{- if .Values.fullnameOverride }} {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} {{- else }} @@ -27,16 +27,16 @@ If release name contains chart name it will be used as a full name. {{/* Create chart name and version as used by the chart label. */}} -{{- define "diem-logger.chart" -}} +{{- define "aptos-logger.chart" -}} {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} {{- end }} {{/* Common labels */}} -{{- define "diem-logger.labels" -}} -helm.sh/chart: {{ include "diem-logger.chart" . }} -{{ include "diem-logger.selectorLabels" . }} +{{- define "aptos-logger.labels" -}} +helm.sh/chart: {{ include "aptos-logger.chart" . }} +{{ include "aptos-logger.selectorLabels" . }} {{- if .Chart.AppVersion }} app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} {{- end }} @@ -46,17 +46,17 @@ app.kubernetes.io/managed-by: {{ .Release.Service }} {{/* Selector labels */}} -{{- define "diem-logger.selectorLabels" -}} -app.kubernetes.io/name: {{ include "diem-logger.name" . }} +{{- define "aptos-logger.selectorLabels" -}} +app.kubernetes.io/name: {{ include "aptos-logger.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} {{- end }} {{/* Create the name of the service account to use */}} -{{- define "diem-logger.serviceAccountName" -}} +{{- define "aptos-logger.serviceAccountName" -}} {{- if .Values.serviceAccount.create }} -{{- default (include "diem-logger.fullname" .) .Values.serviceAccount.name }} +{{- default (include "aptos-logger.fullname" .) .Values.serviceAccount.name }} {{- else }} {{- default "default" .Values.serviceAccount.name }} {{- end }} diff --git a/terraform/helm/logger/templates/logging.yaml b/terraform/helm/logger/templates/logging.yaml index 89911e9537334..e8ec5ecb46051 100644 --- a/terraform/helm/logger/templates/logging.yaml +++ b/terraform/helm/logger/templates/logging.yaml @@ -1,9 +1,9 @@ apiVersion: v1 kind: ConfigMap metadata: - name: {{ include "diem-logger.fullname" . }}-vector + name: {{ include "aptos-logger.fullname" . }}-vector labels: - {{- include "diem-logger.labels" . | nindent 4 }} + {{- include "aptos-logger.labels" . | nindent 4 }} data: vector.toml: |- {{ (tpl (.Files.Get "files/vector.toml") .) | indent 4 }} @@ -13,9 +13,9 @@ data: apiVersion: v1 kind: Secret metadata: - name: {{ include "diem-logger.fullname" . }}-vector + name: {{ include "aptos-logger.fullname" . }}-vector labels: - {{- include "diem-logger.labels" . | nindent 4 }} + {{- include "aptos-logger.labels" . | nindent 4 }} type: kubernetes.io/tls data: tls.crt: {{.Values.loggingClientCert}} @@ -27,12 +27,12 @@ data: apiVersion: v1 kind: Service metadata: - name: {{ include "diem-logger.fullname" . }} + name: {{ include "aptos-logger.fullname" . }} labels: - {{- include "diem-logger.labels" . | nindent 4 }} + {{- include "aptos-logger.labels" . | nindent 4 }} spec: selector: - {{- include "diem-logger.selectorLabels" . | nindent 4 }} + {{- include "aptos-logger.selectorLabels" . | nindent 4 }} app.kubernetes.io/name: logging ports: - name: json @@ -46,22 +46,22 @@ spec: apiVersion: apps/v1 kind: StatefulSet metadata: - name: {{ include "diem-logger.fullname" . }} + name: {{ include "aptos-logger.fullname" . }} labels: - {{- include "diem-logger.labels" . | nindent 4 }} + {{- include "aptos-logger.labels" . | nindent 4 }} app.kubernetes.io/name: logging spec: - serviceName: {{ include "diem-logger.fullname" . }} + serviceName: {{ include "aptos-logger.fullname" . }} replicas: 1 podManagementPolicy: Parallel selector: matchLabels: - {{- include "diem-logger.selectorLabels" . | nindent 6 }} + {{- include "aptos-logger.selectorLabels" . | nindent 6 }} app.kubernetes.io/name: logging template: metadata: labels: - {{- include "diem-logger.selectorLabels" . | nindent 8 }} + {{- include "aptos-logger.selectorLabels" . | nindent 8 }} app.kubernetes.io/name: logging annotations: seccomp.security.alpha.kubernetes.io/pod: runtime/default @@ -74,10 +74,10 @@ spec: {{- end }} - name: vector-config configMap: - name: {{ include "diem-logger.fullname" . }}-vector + name: {{ include "aptos-logger.fullname" . }}-vector - name: vector-secret secret: - secretName: {{ include "diem-logger.fullname" . }}-vector + secretName: {{ include "aptos-logger.fullname" . }}-vector {{- with .Values.logging }} containers: - name: vector @@ -130,4 +130,4 @@ spec: runAsNonRoot: true fsGroup: 65534 {{- end }} - serviceAccountName: {{ include "diem-logger.serviceAccountName" . }} + serviceAccountName: {{ include "aptos-logger.serviceAccountName" . }} diff --git a/terraform/helm/logger/templates/serviceaccount.yaml b/terraform/helm/logger/templates/serviceaccount.yaml index 4045aa573e1b7..0f9ad0635574d 100644 --- a/terraform/helm/logger/templates/serviceaccount.yaml +++ b/terraform/helm/logger/templates/serviceaccount.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: ServiceAccount metadata: - name: {{ include "diem-logger.serviceAccountName" . }} + name: {{ include "aptos-logger.serviceAccountName" . }} labels: - {{ include "diem-logger.labels" . | nindent 4 }} + {{ include "aptos-logger.labels" . | nindent 4 }} {{- end -}} diff --git a/terraform/helm/validator/Chart.yaml b/terraform/helm/validator/Chart.yaml index 9fb7fd691a0cd..c5c6cac1019b2 100644 --- a/terraform/helm/validator/Chart.yaml +++ b/terraform/helm/validator/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -name: diem-validator +name: aptos-validator version: 1.5.0-rc.1 appVersion: 1.5.0-rc.1 description: Diem blockchain validator diff --git a/terraform/helm/validator/files/configs/fullnode.yaml b/terraform/helm/validator/files/configs/fullnode.yaml index b1f01caa71844..c268bc04ddd1d 100644 --- a/terraform/helm/validator/files/configs/fullnode.yaml +++ b/terraform/helm/validator/files/configs/fullnode.yaml @@ -29,7 +29,7 @@ full_node_networks: seeds: d58bc7bb154b38039bc9096ce04e1237: addresses: - - "/dns4/{{ include "diem-validator.fullname" . }}-validator/tcp/6181/ln-noise-ik/f0274c2774519281a8332d0bb9d8101bd58bc7bb154b38039bc9096ce04e1237/ln-handshake/0" + - "/dns4/{{ include "aptos-validator.fullname" . }}-validator/tcp/6181/ln-noise-ik/f0274c2774519281a8332d0bb9d8101bd58bc7bb154b38039bc9096ce04e1237/ln-handshake/0" role: "Validator" - network_id: "public" diff --git a/terraform/helm/validator/files/configs/validator.yaml b/terraform/helm/validator/files/configs/validator.yaml index a68ae8bbc46ca..04dc9f88bf7f4 100644 --- a/terraform/helm/validator/files/configs/validator.yaml +++ b/terraform/helm/validator/files/configs/validator.yaml @@ -14,7 +14,7 @@ consensus: safety_rules: service: type: "process" - server_address: "/dns4/{{ include "diem-validator.fullname" . }}-safety-rules/tcp/6185" + server_address: "/dns4/{{ include "aptos-validator.fullname" . }}-safety-rules/tcp/6185" sync_only: {{ .Values.validator.config.sync_only | default false}} {{- if .Values.validator.config.mempool_poll_count }} mempool_poll_count: {{ .Values.validator.config.mempool_poll_count }} diff --git a/terraform/helm/validator/files/dashboards/api.json b/terraform/helm/validator/files/dashboards/api.json index 1ddb0de93c959..d6af56be76e14 100644 --- a/terraform/helm/validator/files/dashboards/api.json +++ b/terraform/helm/validator/files/dashboards/api.json @@ -98,7 +98,7 @@ "targets": [ { "exemplar": true, - "expr": "sum by (status) (rate(diem_api_response_status_count{role=~\"$role\", owner=~\"$owner\", status=~\"$status\"}[$interval]))", + "expr": "sum by (status) (rate(aptos_api_response_status_count{role=~\"$role\", owner=~\"$owner\", status=~\"$status\"}[$interval]))", "interval": "", "legendFormat": "{{status}}", "refId": "A" @@ -180,7 +180,7 @@ "targets": [ { "exemplar": true, - "expr": "sum by (operation_id) (rate(diem_api_requests_count{role=~\"$role\", owner=~\"$owner\", operation_id=~\"$endpoint\", status=~\"$status\"}[$interval]))", + "expr": "sum by (operation_id) (rate(aptos_api_requests_count{role=~\"$role\", owner=~\"$owner\", operation_id=~\"$endpoint\", status=~\"$status\"}[$interval]))", "instant": false, "interval": "", "legendFormat": "{{operation_id}}", @@ -263,7 +263,7 @@ "targets": [ { "exemplar": true, - "expr": "histogram_quantile(0.90, sum by (le) (rate(diem_api_requests_bucket{operation_id=~\"$endpoint\"}[$interval])))", + "expr": "histogram_quantile(0.90, sum by (le) (rate(aptos_api_requests_bucket{operation_id=~\"$endpoint\"}[$interval])))", "format": "time_series", "interval": "", "legendFormat": "p90", @@ -271,7 +271,7 @@ }, { "exemplar": true, - "expr": "histogram_quantile(0.99, sum by (le) (rate(diem_api_requests_bucket{operation_id=~\"$endpoint\"}[$interval])))", + "expr": "histogram_quantile(0.99, sum by (le) (rate(aptos_api_requests_bucket{operation_id=~\"$endpoint\"}[$interval])))", "hide": false, "interval": "", "legendFormat": "p99", @@ -279,7 +279,7 @@ }, { "exemplar": true, - "expr": "histogram_quantile(1, sum by (le) (rate(diem_api_requests_bucket{operation_id=~\"$endpoint\"}[$interval])))", + "expr": "histogram_quantile(1, sum by (le) (rate(aptos_api_requests_bucket{operation_id=~\"$endpoint\"}[$interval])))", "hide": false, "interval": "", "legendFormat": "p100", @@ -362,7 +362,7 @@ "targets": [ { "exemplar": true, - "expr": "sum by (operation_id) (rate(diem_api_requests_count{role=~\"$role\", owner=~\"$owner\", operation_id=~\"$endpoint\", status=\"500\"}[$interval]))", + "expr": "sum by (operation_id) (rate(aptos_api_requests_count{role=~\"$role\", owner=~\"$owner\", operation_id=~\"$endpoint\", status=\"500\"}[$interval]))", "interval": "", "legendFormat": "", "refId": "A" diff --git a/terraform/helm/validator/files/dashboards/components.json b/terraform/helm/validator/files/dashboards/components.json index 64fd94052489c..9cf241a4b8b8a 100644 --- a/terraform/helm/validator/files/dashboards/components.json +++ b/terraform/helm/validator/files/dashboards/components.json @@ -1597,13 +1597,13 @@ "steppedLine": false, "targets": [ { - "expr": "increase(diem_key_manager_state{state=\"liveness_error_encountered\", owner=~\"$owner\"}[1h])", + "expr": "increase(aptos_key_manager_state{state=\"liveness_error_encountered\", owner=~\"$owner\"}[1h])", "interval": "", "legendFormat": "{{owner}}_liveness_error", "refId": "A" }, { - "expr": "increase(diem_key_manager_state{state=\"unexpected_error_encountered\", owner=~\"$owner\"}[1h])", + "expr": "increase(aptos_key_manager_state{state=\"unexpected_error_encountered\", owner=~\"$owner\"}[1h])", "interval": "", "legendFormat": "{{owner}}_unexpected_error", "refId": "B" @@ -1700,7 +1700,7 @@ "steppedLine": false, "targets": [ { - "expr": "increase(diem_key_manager_state{state=\"keys_still_fresh\", owner=~\"$owner\"}[1h])", + "expr": "increase(aptos_key_manager_state{state=\"keys_still_fresh\", owner=~\"$owner\"}[1h])", "interval": "", "legendFormat": "{{owner}}_keys_still_fresh", "refId": "A" @@ -2123,7 +2123,7 @@ "steppedLine": false, "targets": [ { - "expr": "sum by (owner, role) (rate(diem_shared_mempool_transaction_broadcast_sum{role=~\"$role\", owner=~\"$owner\"}[$AggInterval]))", + "expr": "sum by (owner, role) (rate(aptos_shared_mempool_transaction_broadcast_sum{role=~\"$role\", owner=~\"$owner\"}[$AggInterval]))", "format": "time_series", "interval": "", "intervalFactor": 1, @@ -2238,7 +2238,7 @@ "steppedLine": false, "targets": [ { - "expr": "increase(diem_safety_rules_queries{owner=~\"$owner\", result=\"error\"}[$AggInterval])", + "expr": "increase(aptos_safety_rules_queries{owner=~\"$owner\", result=\"error\"}[$AggInterval])", "format": "time_series", "hide": false, "instant": false, @@ -2341,7 +2341,7 @@ "steppedLine": false, "targets": [ { - "expr": "diem_safety_rules_state{field=\"epoch\", owner=~\"$owner\"}", + "expr": "aptos_safety_rules_state{field=\"epoch\", owner=~\"$owner\"}", "format": "time_series", "hide": false, "instant": false, @@ -2444,7 +2444,7 @@ "steppedLine": false, "targets": [ { - "expr": "diem_safety_rules_state{field=\"last_voted_round\", owner=~\"$owner\"}", + "expr": "aptos_safety_rules_state{field=\"last_voted_round\", owner=~\"$owner\"}", "format": "time_series", "hide": false, "instant": false, @@ -2547,7 +2547,7 @@ "steppedLine": false, "targets": [ { - "expr": "diem_safety_rules_state{field=\"preferred_round\", owner=~\"$owner\"}", + "expr": "aptos_safety_rules_state{field=\"preferred_round\", owner=~\"$owner\"}", "format": "time_series", "hide": false, "instant": false, @@ -2776,7 +2776,7 @@ "steppedLine": false, "targets": [ { - "expr": "rate(diem_vm_user_transactions_executed{owner=~\"$owner\",role=~\"$role\",status=\"success\"}[1m])", + "expr": "rate(aptos_vm_user_transactions_executed{owner=~\"$owner\",role=~\"$role\",status=\"success\"}[1m])", "format": "time_series", "interval": "", "intervalFactor": 1, @@ -2875,7 +2875,7 @@ "steppedLine": false, "targets": [ { - "expr": "rate(diem_vm_system_transactions_executed{owner=~\"$owner\",role=~\"$role\"}[1m])", + "expr": "rate(aptos_vm_system_transactions_executed{owner=~\"$owner\",role=~\"$role\"}[1m])", "format": "time_series", "interval": "", "intervalFactor": 1, @@ -2974,7 +2974,7 @@ "steppedLine": false, "targets": [ { - "expr": "rate(diem_vm_txn_total_seconds_sum{owner=~\"$owner\",role=~\"$role\"}[1m])/rate(diem_vm_txn_total_seconds_count{owner=~\"$owner\",role=~\"$role\"}[1m])", + "expr": "rate(aptos_vm_txn_total_seconds_sum{owner=~\"$owner\",role=~\"$role\"}[1m])/rate(aptos_vm_txn_total_seconds_count{owner=~\"$owner\",role=~\"$role\"}[1m])", "format": "time_series", "interval": "", "intervalFactor": 1, @@ -3087,7 +3087,7 @@ "steppedLine": false, "targets": [ { - "expr": "sum by (owner, role, type) (rate(diem_client_service_rpc_requests_count{role=~\"$role\", type=~\"$requesttype\", owner=~\"$owner\"}[$AggInterval]))", + "expr": "sum by (owner, role, type) (rate(aptos_client_service_rpc_requests_count{role=~\"$role\", type=~\"$requesttype\", owner=~\"$owner\"}[$AggInterval]))", "interval": "", "legendFormat": "{{owner}}-{{role}}-{{type}}", "refId": "A" @@ -3189,7 +3189,7 @@ "steppedLine": false, "targets": [ { - "expr": "sum by (owner, role, method, errorcode) (rate(diem_client_service_internal_error_count{role=~\"$role\", type=~\"$requesttype\", method=~\"$method\", owner=~\"$owner\"}[$AggInterval]))", + "expr": "sum by (owner, role, method, errorcode) (rate(aptos_client_service_internal_error_count{role=~\"$role\", type=~\"$requesttype\", method=~\"$method\", owner=~\"$owner\"}[$AggInterval]))", "interval": "", "legendFormat": "{{owner}}-{{role}}-{{method}} {{errortype}}", "refId": "A" @@ -3291,7 +3291,7 @@ "steppedLine": false, "targets": [ { - "expr": "sum by (owner, role, method, errortype) (rate(diem_client_service_invalid_requests_count{role=~\"$role\", type=~\"$requesttype\", method=~\"$method\", owner=~\"$owner\"}[$AggInterval]))", + "expr": "sum by (owner, role, method, errortype) (rate(aptos_client_service_invalid_requests_count{role=~\"$role\", type=~\"$requesttype\", method=~\"$method\", owner=~\"$owner\"}[$AggInterval]))", "interval": "", "legendFormat": "{{owner}}-{{role}}-{{method}} {{errortype}}", "refId": "A" @@ -3404,7 +3404,7 @@ "steppedLine": false, "targets": [ { - "expr": "histogram_quantile(0.50, sum by (owner, role, le)(rate(diem_client_service_rpc_request_latency_seconds_bucket{role=~\"$role\", owner=~\"$owner\",type=~\"$requesttype\"}[$AggInterval])))", + "expr": "histogram_quantile(0.50, sum by (owner, role, le)(rate(aptos_client_service_rpc_request_latency_seconds_bucket{role=~\"$role\", owner=~\"$owner\",type=~\"$requesttype\"}[$AggInterval])))", "format": "time_series", "interval": "", "legendFormat": "{{owner}}-{{role}}", @@ -3518,7 +3518,7 @@ "steppedLine": false, "targets": [ { - "expr": "histogram_quantile(0.90, sum by (owner, role, le)(rate(diem_client_service_rpc_request_latency_seconds_bucket{role=~\"$role\", owner=~\"$owner\",type=~\"$requesttype\"}[$AggInterval])))", + "expr": "histogram_quantile(0.90, sum by (owner, role, le)(rate(aptos_client_service_rpc_request_latency_seconds_bucket{role=~\"$role\", owner=~\"$owner\",type=~\"$requesttype\"}[$AggInterval])))", "format": "time_series", "interval": "", "legendFormat": "{{owner}}-{{role}}", @@ -3632,7 +3632,7 @@ "steppedLine": false, "targets": [ { - "expr": "histogram_quantile(0.99, sum by (owner, role, le)(rate(diem_client_service_rpc_request_latency_seconds_bucket{role=~\"$role\", owner=~\"$owner\",type=~\"$requesttype\"}[$AggInterval])))", + "expr": "histogram_quantile(0.99, sum by (owner, role, le)(rate(aptos_client_service_rpc_request_latency_seconds_bucket{role=~\"$role\", owner=~\"$owner\",type=~\"$requesttype\"}[$AggInterval])))", "format": "time_series", "interval": "", "legendFormat": "{{owner}}-{{role}}", diff --git a/terraform/helm/validator/files/dashboards/mempool.json b/terraform/helm/validator/files/dashboards/mempool.json index ccf3793a3412f..084fde972c943 100644 --- a/terraform/helm/validator/files/dashboards/mempool.json +++ b/terraform/helm/validator/files/dashboards/mempool.json @@ -197,7 +197,7 @@ "steppedLine": false, "targets": [ { - "expr": "sum by (owner, role, status) (rate(diem_shared_mempool_transactions_processed{status=\"success\", owner=~\"$owner\", role=~\"$role\"}[$interval]))", + "expr": "sum by (owner, role, status) (rate(aptos_shared_mempool_transactions_processed{status=\"success\", owner=~\"$owner\", role=~\"$role\"}[$interval]))", "format": "time_series", "interval": "", "intervalFactor": 1, @@ -393,7 +393,7 @@ "steppedLine": false, "targets": [ { - "expr": "sum by (owner, role, network) (diem_mempool_active_upstream_peers_count{owner=~\"$owner\", role=~\"$role\"})", + "expr": "sum by (owner, role, network) (aptos_mempool_active_upstream_peers_count{owner=~\"$owner\", role=~\"$role\"})", "interval": "", "legendFormat": "{{owner}}:{{role}} ({{network}} network)", "refId": "A" @@ -490,7 +490,7 @@ "steppedLine": false, "targets": [ { - "expr": "sum by (owner, role, network, sender) (rate(diem_shared_mempool_transactions_processed{status=\"vm_validation\", owner=~\"$owner\", role=~\"$role\"}[$interval]))", + "expr": "sum by (owner, role, network, sender) (rate(aptos_shared_mempool_transactions_processed{status=\"vm_validation\", owner=~\"$owner\", role=~\"$role\"}[$interval]))", "interval": "", "legendFormat": "{{owner}}:{{role}} <- ({{network}} network:{{sender}})", "refId": "A" @@ -601,7 +601,7 @@ "steppedLine": false, "targets": [ { - "expr": "rate(diem_mempool_service_latency_ms_count{result=\"fail\", owner=~\"$owner\", role=~\"$role\"}[$interval])", + "expr": "rate(aptos_mempool_service_latency_ms_count{result=\"fail\", owner=~\"$owner\", role=~\"$role\"}[$interval])", "interval": "", "legendFormat": "{{owner}}:{{role}} - {{type}}", "refId": "A" @@ -698,7 +698,7 @@ "steppedLine": false, "targets": [ { - "expr": "rate(diem_mempool_db_error_count{owner=~\"$owner\", role=~\"$role\"}[$interval])", + "expr": "rate(aptos_mempool_db_error_count{owner=~\"$owner\", role=~\"$role\"}[$interval])", "interval": "", "legendFormat": "{{owner}}:{{role}}", "refId": "A" @@ -795,7 +795,7 @@ "steppedLine": false, "targets": [ { - "expr": "rate(diem_mempool_json_rpc_callback_fail_count{owner=~\"$owner\", role=~\"$role\"}[$interval])", + "expr": "rate(aptos_mempool_json_rpc_callback_fail_count{owner=~\"$owner\", role=~\"$role\"}[$interval])", "interval": "", "legendFormat": "{{owner}}:{{role}}", "refId": "A" @@ -892,7 +892,7 @@ "steppedLine": false, "targets": [ { - "expr": "rate(diem_mempool_network_send_fail_count{owner=~\"$owner\", role=~\"$role\"}[$interval])", + "expr": "rate(aptos_mempool_network_send_fail_count{owner=~\"$owner\", role=~\"$role\"}[$interval])", "interval": "", "legendFormat": "{{owner}}:{{role}}", "refId": "A" @@ -989,7 +989,7 @@ "steppedLine": false, "targets": [ { - "expr": "rate(diem_mempool_vm_reconfig_update_fail_count{owner=~\"$owner\", role=~\"$role\"}[$interval])", + "expr": "rate(aptos_mempool_vm_reconfig_update_fail_count{owner=~\"$owner\", role=~\"$role\"}[$interval])", "interval": "", "legendFormat": "{{owner}}:{{role}}", "refId": "A" @@ -1086,7 +1086,7 @@ "steppedLine": false, "targets": [ { - "expr": "rate(diem_mempool_core_mempool_invariant_violated_count{owner=\"$owner\", role=\"$role\"}[$interval])", + "expr": "rate(aptos_mempool_core_mempool_invariant_violated_count{owner=\"$owner\", role=\"$role\"}[$interval])", "interval": "", "legendFormat": "{{owner}}:{{role}}", "refId": "A" @@ -1183,7 +1183,7 @@ "steppedLine": false, "targets": [ { - "expr": "rate(diem_mempool_unexpected_network_count{owner=~\"$owner\", role=~\"$role\"}[$interval])", + "expr": "rate(aptos_mempool_unexpected_network_count{owner=~\"$owner\", role=~\"$role\"}[$interval])", "interval": "", "legendFormat": "{{owner}}:{{role}} <- {{network}}:{{peer}}", "refId": "A" @@ -1779,7 +1779,7 @@ "steppedLine": false, "targets": [ { - "expr": "rate(diem_shared_mempool_transactions_processed{status!=\"success\", status!=\"vm_validation\", owner=~\"$owner\", role=~\"$role\"}[$interval])", + "expr": "rate(aptos_shared_mempool_transactions_processed{status!=\"success\", status!=\"vm_validation\", owner=~\"$owner\", role=~\"$role\"}[$interval])", "interval": "", "legendFormat": "{{owner}}:{{role}} <- ({{network}} network:{{sender}}) - {{status}}", "refId": "A" @@ -2085,7 +2085,7 @@ "steppedLine": false, "targets": [ { - "expr": "rate(diem_mempool_service_transactions_sum{type=\"commit_accepted\", owner=~\"$owner\", role=~\"$role\"}[$interval])\n", + "expr": "rate(aptos_mempool_service_transactions_sum{type=\"commit_accepted\", owner=~\"$owner\", role=~\"$role\"}[$interval])\n", "format": "time_series", "interval": "", "intervalFactor": 1, @@ -2186,7 +2186,7 @@ "steppedLine": false, "targets": [ { - "expr": "rate(diem_mempool_service_latency_ms_sum{type=\"commit_accepted\", owner=~\"$owner\", role=~\"$role\"}[$interval]) / rate(diem_mempool_service_latency_ms_count{type=\"commit_accepted\", owner=~\"$owner\", role=~\"$role\"}[$interval])", + "expr": "rate(aptos_mempool_service_latency_ms_sum{type=\"commit_accepted\", owner=~\"$owner\", role=~\"$role\"}[$interval]) / rate(aptos_mempool_service_latency_ms_count{type=\"commit_accepted\", owner=~\"$owner\", role=~\"$role\"}[$interval])", "format": "time_series", "interval": "", "intervalFactor": 1, @@ -2285,7 +2285,7 @@ "steppedLine": false, "targets": [ { - "expr": "rate(diem_mempool_service_transactions_sum{type=\"commit_rejected\", owner=~\"$owner\", role=~\"$role\"}[$interval])\n", + "expr": "rate(aptos_mempool_service_transactions_sum{type=\"commit_rejected\", owner=~\"$owner\", role=~\"$role\"}[$interval])\n", "interval": "", "legendFormat": "{{owner}}", "refId": "A" @@ -2382,7 +2382,7 @@ "steppedLine": false, "targets": [ { - "expr": "rate(diem_mempool_service_latency_ms_sum{type=\"commit_rejected\", owner=~\"$owner\"}[$interval])/rate(diem_mempool_service_latency_ms_count{type=\"commit_rejected\", owner=~\"$owner\"}[$interval])", + "expr": "rate(aptos_mempool_service_latency_ms_sum{type=\"commit_rejected\", owner=~\"$owner\"}[$interval])/rate(aptos_mempool_service_latency_ms_count{type=\"commit_rejected\", owner=~\"$owner\"}[$interval])", "interval": "", "legendFormat": "{{owner}}", "refId": "A" @@ -2480,7 +2480,7 @@ "steppedLine": false, "targets": [ { - "expr": "rate(diem_mempool_service_transactions_sum{type=\"get_block\", owner=~\"$owner\"}[$interval]) / rate(diem_mempool_service_transactions_count{type=\"get_block\", owner=~\"$owner\"}[$interval])", + "expr": "rate(aptos_mempool_service_transactions_sum{type=\"get_block\", owner=~\"$owner\"}[$interval]) / rate(aptos_mempool_service_transactions_count{type=\"get_block\", owner=~\"$owner\"}[$interval])", "format": "time_series", "interval": "", "intervalFactor": 1, @@ -2580,7 +2580,7 @@ "steppedLine": false, "targets": [ { - "expr": "rate(diem_mempool_service_latency_ms_sum{type=\"get_block\", owner=~\"$owner\"}[$interval]) / rate(diem_mempool_service_latency_ms_count{type=\"get_block\", owner=~\"$owner\"}[$interval])", + "expr": "rate(aptos_mempool_service_latency_ms_sum{type=\"get_block\", owner=~\"$owner\"}[$interval]) / rate(aptos_mempool_service_latency_ms_count{type=\"get_block\", owner=~\"$owner\"}[$interval])", "format": "time_series", "interval": "", "intervalFactor": 1, @@ -2694,7 +2694,7 @@ "steppedLine": false, "targets": [ { - "expr": "rate(diem_shared_mempool_events{owner=~\"$owner\", role=~\"$role\"}[$interval])", + "expr": "rate(aptos_shared_mempool_events{owner=~\"$owner\", role=~\"$role\"}[$interval])", "format": "time_series", "interval": "", "intervalFactor": 1, @@ -2793,7 +2793,7 @@ "steppedLine": false, "targets": [ { - "expr": "rate(diem_mempool_bounded_executor_spawn_latency_sum{stage=\"start\", owner=~\"$owner\", role=~\"$role\"}[$interval]) / rate(diem_mempool_bounded_executor_spawn_latency_count{stage=\"start\", owner=~\"$owner\", role=~\"$role\"}[$interval])", + "expr": "rate(aptos_mempool_bounded_executor_spawn_latency_sum{stage=\"start\", owner=~\"$owner\", role=~\"$role\"}[$interval]) / rate(aptos_mempool_bounded_executor_spawn_latency_count{stage=\"start\", owner=~\"$owner\", role=~\"$role\"}[$interval])", "interval": "", "legendFormat": "{{owner}}:{{role}} - {{task}}", "refId": "A" @@ -2905,7 +2905,7 @@ "steppedLine": false, "targets": [ { - "expr": "sum by (owner, role, network, sender) (rate(diem_shared_mempool_transactions_processed{owner=~\"$owner\", role=~\"$role\"}[$interval]))", + "expr": "sum by (owner, role, network, sender) (rate(aptos_shared_mempool_transactions_processed{owner=~\"$owner\", role=~\"$role\"}[$interval]))", "format": "time_series", "interval": "", "intervalFactor": 1, @@ -3005,7 +3005,7 @@ "steppedLine": false, "targets": [ { - "expr": "sum by (owner, role, network, sender) (rate(diem_shared_mempool_transactions_processed{status!=\"vm_validation\", owner=~\"$owner\", role=~\"$role\"}[$interval]))", + "expr": "sum by (owner, role, network, sender) (rate(aptos_shared_mempool_transactions_processed{status!=\"vm_validation\", owner=~\"$owner\", role=~\"$role\"}[$interval]))", "format": "time_series", "interval": "", "intervalFactor": 1, @@ -3105,7 +3105,7 @@ "steppedLine": false, "targets": [ { - "expr": "rate(diem_shared_mempool_request_latency_sum{owner=~\"$owner\", role=~\"$role\"}[$interval]) / rate(diem_shared_mempool_request_latency_count{owner=~\"$owner\", role=~\"$role\"}[$interval])", + "expr": "rate(aptos_shared_mempool_request_latency_sum{owner=~\"$owner\", role=~\"$role\"}[$interval]) / rate(aptos_shared_mempool_request_latency_count{owner=~\"$owner\", role=~\"$role\"}[$interval])", "interval": "", "legendFormat": "{{owner}}:{{role}} <- ({{network}} network:{{sender}})", "refId": "A" @@ -3202,7 +3202,7 @@ "steppedLine": false, "targets": [ { - "expr": "rate(diem_mempool_process_txn_breakdown_latency_sum{portion=\"vm_validation\", owner=~\"$owner\", role=~\"$role\"}[$interval]) / rate(diem_mempool_process_txn_breakdown_latency_count{portion=\"vm_validation\", owner=~\"$owner\", role=~\"$role\"}[$interval])", + "expr": "rate(aptos_mempool_process_txn_breakdown_latency_sum{portion=\"vm_validation\", owner=~\"$owner\", role=~\"$role\"}[$interval]) / rate(aptos_mempool_process_txn_breakdown_latency_count{portion=\"vm_validation\", owner=~\"$owner\", role=~\"$role\"}[$interval])", "interval": "", "legendFormat": "{{owner}}:{{role}}", "refId": "A" @@ -3299,7 +3299,7 @@ "steppedLine": false, "targets": [ { - "expr": "rate(diem_mempool_process_txn_breakdown_latency_sum{portion=\"storage_fetch\", owner=~\"$owner\", role=~\"$role\"}[$interval]) / rate(diem_mempool_process_txn_breakdown_latency_count{portion=\"storage_fetch\", owner=~\"$owner\", role=~\"$role\"}[$interval])", + "expr": "rate(aptos_mempool_process_txn_breakdown_latency_sum{portion=\"storage_fetch\", owner=~\"$owner\", role=~\"$role\"}[$interval]) / rate(aptos_mempool_process_txn_breakdown_latency_count{portion=\"storage_fetch\", owner=~\"$owner\", role=~\"$role\"}[$interval])", "interval": "", "legendFormat": "{{owner}}:{{role}}", "refId": "A" @@ -3410,7 +3410,7 @@ "steppedLine": false, "targets": [ { - "expr": "rate(diem_shared_mempool_transaction_broadcast_sum{owner=~\"$owner\", role=~\"$role\"}[$interval]) / rate(diem_shared_mempool_transaction_broadcast_count{owner=~\"$owner\", role=~\"$role\"}[$interval])", + "expr": "rate(aptos_shared_mempool_transaction_broadcast_sum{owner=~\"$owner\", role=~\"$role\"}[$interval]) / rate(aptos_shared_mempool_transaction_broadcast_count{owner=~\"$owner\", role=~\"$role\"}[$interval])", "interval": "", "legendFormat": "{{owner}}:{{role}} -> ({{network}} network:{{recipient}})", "refId": "A" @@ -3508,7 +3508,7 @@ "steppedLine": false, "targets": [ { - "expr": "rate(diem_shared_mempool_transaction_broadcast_sum{owner=~\"$owner\", role=~\"$role\"}[$interval])", + "expr": "rate(aptos_shared_mempool_transaction_broadcast_sum{owner=~\"$owner\", role=~\"$role\"}[$interval])", "format": "time_series", "interval": "", "intervalFactor": 1, @@ -3801,7 +3801,7 @@ "steppedLine": false, "targets": [ { - "expr": "rate(diem_shared_mempool_broadcast_roundtrip_latency_sum{owner=~\"$owner\", role=~\"$role\"}[$interval]) / rate(diem_shared_mempool_broadcast_roundtrip_latency_count{owner=~\"$owner\", role=~\"$role\"}[$interval])", + "expr": "rate(aptos_shared_mempool_broadcast_roundtrip_latency_sum{owner=~\"$owner\", role=~\"$role\"}[$interval]) / rate(aptos_shared_mempool_broadcast_roundtrip_latency_count{owner=~\"$owner\", role=~\"$role\"}[$interval])", "interval": "", "legendFormat": "{{owner}}:{{role}} -> ({{network}} network:{{recipient}})", "refId": "A" @@ -3898,7 +3898,7 @@ "steppedLine": false, "targets": [ { - "expr": "diem_shared_mempool_pending_broadcasts_count{owner=~\"$owner\", role=~\"$role\"}", + "expr": "aptos_shared_mempool_pending_broadcasts_count{owner=~\"$owner\", role=~\"$role\"}", "interval": "", "legendFormat": "{{owner}}:{{role}} -> ({{network}}:{{recipient}})", "refId": "A" @@ -3995,7 +3995,7 @@ "steppedLine": false, "targets": [ { - "expr": "rate(diem_shared_mempool_rebroadcast_count{type=\"expired\", owner=~\"$owner\", role=~\"$role\"}[$interval])", + "expr": "rate(aptos_shared_mempool_rebroadcast_count{type=\"expired\", owner=~\"$owner\", role=~\"$role\"}[$interval])", "interval": "", "legendFormat": "{{owner}}:{{role}} -> {{network}}:{{recipient}}", "refId": "A" @@ -4092,7 +4092,7 @@ "steppedLine": false, "targets": [ { - "expr": "rate(diem_shared_mempool_rebroadcast_count{type=\"retry\", owner=~\"$owner\", role=~\"role\"}[$interval])", + "expr": "rate(aptos_shared_mempool_rebroadcast_count{type=\"retry\", owner=~\"$owner\", role=~\"role\"}[$interval])", "interval": "", "legendFormat": "{{owner}}:{{role}} -> ({{network}}:{{recipient}})", "refId": "A" @@ -4189,7 +4189,7 @@ "steppedLine": false, "targets": [ { - "expr": "rate(diem_shared_mempool_rebroadcast_count{type=\"backpressure\", owner=~\"$owner\", role=~\"$role\"}[$interval])", + "expr": "rate(aptos_shared_mempool_rebroadcast_count{type=\"backpressure\", owner=~\"$owner\", role=~\"$role\"}[$interval])", "interval": "", "legendFormat": "{{owner}}:{{role}} -> {{network}}:{{recipient}}", "refId": "A" @@ -4300,7 +4300,7 @@ "steppedLine": false, "targets": [ { - "expr": "diem_shared_mempool_ack_count{direction=\"sent\", owner=~\"$owner\", role=~\"$role\"}", + "expr": "aptos_shared_mempool_ack_count{direction=\"sent\", owner=~\"$owner\", role=~\"$role\"}", "interval": "", "legendFormat": "{{owner}}:{{role}} -> {{network}}:{{recipient}} - {{type}}", "refId": "A" @@ -4397,7 +4397,7 @@ "steppedLine": false, "targets": [ { - "expr": "rate(diem_shared_mempool_ack_count{direction=\"received\", owner=~\"$owner\", role=~\"$role\"}[$interval])", + "expr": "rate(aptos_shared_mempool_ack_count{direction=\"received\", owner=~\"$owner\", role=~\"$role\"}[$interval])", "interval": "", "legendFormat": "{{owner}}:{{role}} <- {{network}}:{{recipient}} - {{type}}", "refId": "A" diff --git a/terraform/helm/validator/files/dashboards/monitoring.json b/terraform/helm/validator/files/dashboards/monitoring.json index b3cde96b85c34..4bdf923763026 100644 --- a/terraform/helm/validator/files/dashboards/monitoring.json +++ b/terraform/helm/validator/files/dashboards/monitoring.json @@ -138,7 +138,7 @@ "pluginVersion": "7.0.0", "targets": [ { - "expr": "up{job=\"federate\"} == 0 or up{job=\"diem-procs\"} == 0 or up{job=\"kubernetes-cadvisor\"} == 0 or up{job=\"pushgateway\"} == 0", + "expr": "up{job=\"federate\"} == 0 or up{job=\"aptos-procs\"} == 0 or up{job=\"kubernetes-cadvisor\"} == 0 or up{job=\"pushgateway\"} == 0", "format": "table", "instant": true, "interval": "", diff --git a/terraform/helm/validator/files/dashboards/overview.json b/terraform/helm/validator/files/dashboards/overview.json index 56360934ea430..e3bc227697f69 100644 --- a/terraform/helm/validator/files/dashboards/overview.json +++ b/terraform/helm/validator/files/dashboards/overview.json @@ -340,7 +340,7 @@ "pluginVersion": "8.4.2", "targets": [ { - "expr": "up{job=\"federate\"} == 0 or up{job=\"diem-procs\", role=\"validator\"} == 0", + "expr": "up{job=\"federate\"} == 0 or up{job=\"aptos-procs\", role=\"validator\"} == 0", "format": "table", "instant": true, "interval": "", diff --git a/terraform/helm/validator/files/dashboards/safety-rules.json b/terraform/helm/validator/files/dashboards/safety-rules.json index 797b2027cae78..5a6b4bbdf8cb5 100644 --- a/terraform/helm/validator/files/dashboards/safety-rules.json +++ b/terraform/helm/validator/files/dashboards/safety-rules.json @@ -92,7 +92,7 @@ "steppedLine": false, "targets": [ { - "expr": "increase(diem_safety_rules_queries{owner=~\"$owner\", result=\"error\"}[$interval])", + "expr": "increase(aptos_safety_rules_queries{owner=~\"$owner\", result=\"error\"}[$interval])", "interval": "", "legendFormat": "{{owner}}_{{method}}", "refId": "A" @@ -202,7 +202,7 @@ "steppedLine": false, "targets": [ { - "expr": "diem_safety_rules_state{field=\"epoch\", owner=~\"$owner\"}", + "expr": "aptos_safety_rules_state{field=\"epoch\", owner=~\"$owner\"}", "interval": "", "legendFormat": "{{owner}}", "refId": "A" @@ -304,7 +304,7 @@ "steppedLine": false, "targets": [ { - "expr": "diem_safety_rules_state{field=\"last_voted_round\", owner=~\"$owner\"}", + "expr": "aptos_safety_rules_state{field=\"last_voted_round\", owner=~\"$owner\"}", "interval": "", "legendFormat": "{{owner}}", "refId": "A" @@ -400,7 +400,7 @@ "steppedLine": false, "targets": [ { - "expr": "diem_safety_rules_state{field=\"preferred_round\", owner=~\"$owner\"}", + "expr": "aptos_safety_rules_state{field=\"preferred_round\", owner=~\"$owner\"}", "interval": "", "legendFormat": "{{owner}}", "refId": "A" @@ -496,7 +496,7 @@ "steppedLine": false, "targets": [ { - "expr": "diem_safety_rules_state{field=\"waypoint_version\", owner=~\"$owner\"}", + "expr": "aptos_safety_rules_state{field=\"waypoint_version\", owner=~\"$owner\"}", "interval": "", "legendFormat": "{{owner}}", "refId": "A" @@ -606,7 +606,7 @@ "steppedLine": false, "targets": [ { - "expr": "increase(diem_safety_rules_queries{method=\"initialize\", owner=~\"$owner\"}[$interval])", + "expr": "increase(aptos_safety_rules_queries{method=\"initialize\", owner=~\"$owner\"}[$interval])", "interval": "", "legendFormat": "{{owner}}_{{result}}", "refId": "A" @@ -702,7 +702,7 @@ "steppedLine": false, "targets": [ { - "expr": "increase(diem_safety_rules_queries{owner=~\"$owner\", method=\"consensus_state\"}[$interval])", + "expr": "increase(aptos_safety_rules_queries{owner=~\"$owner\", method=\"consensus_state\"}[$interval])", "interval": "", "legendFormat": "{{owner}}_{{result}}", "refId": "A" @@ -798,7 +798,7 @@ "steppedLine": false, "targets": [ { - "expr": "increase(diem_safety_rules_queries{owner=~\"$owner\", method=\"construct_and_sign_vote\"}[$interval])", + "expr": "increase(aptos_safety_rules_queries{owner=~\"$owner\", method=\"construct_and_sign_vote\"}[$interval])", "interval": "", "legendFormat": "{{owner}}_{{result}}", "refId": "A" @@ -894,7 +894,7 @@ "steppedLine": false, "targets": [ { - "expr": "increase(diem_safety_rules_queries{owner=~\"$owner\", method=\"sign_proposal\"}[$interval])", + "expr": "increase(aptos_safety_rules_queries{owner=~\"$owner\", method=\"sign_proposal\"}[$interval])", "interval": "", "legendFormat": "{{owner}}_{{result}}", "refId": "A" @@ -990,7 +990,7 @@ "steppedLine": false, "targets": [ { - "expr": "increase(diem_safety_rules_queries{owner=~\"$owner\", method=\"sign_timeout\"}[$interval])", + "expr": "increase(aptos_safety_rules_queries{owner=~\"$owner\", method=\"sign_timeout\"}[$interval])", "interval": "", "legendFormat": "{{owner}}_{{result}}", "refId": "A" diff --git a/terraform/helm/validator/files/dashboards/storage.json b/terraform/helm/validator/files/dashboards/storage.json index 10f0098baa130..43b7fdce4e43f 100644 --- a/terraform/helm/validator/files/dashboards/storage.json +++ b/terraform/helm/validator/files/dashboards/storage.json @@ -22700,7 +22700,7 @@ "steppedLine": false, "targets": [ { - "expr": "diem_backup_service_latency_s_count{owner=~\"$owner\", role=~\"$role\", endpoint=\"db_state\"} and irate(diem_backup_service_latency_s_count[1m]) > 0", + "expr": "aptos_backup_service_latency_s_count{owner=~\"$owner\", role=~\"$role\", endpoint=\"db_state\"} and irate(aptos_backup_service_latency_s_count[1m]) > 0", "interval": "", "legendFormat": "{{owner}} {{kubernetes_pod_name}}", "refId": "A" @@ -22799,7 +22799,7 @@ "steppedLine": false, "targets": [ { - "expr": "diem_backup_service_latency_s_count{owner=~\"$owner\", role=~\"$role\", endpoint=\"epoch_ending_ledger_infos\"} and irate(diem_backup_service_latency_s_count[1m]) > 0", + "expr": "aptos_backup_service_latency_s_count{owner=~\"$owner\", role=~\"$role\", endpoint=\"epoch_ending_ledger_infos\"} and irate(aptos_backup_service_latency_s_count[1m]) > 0", "format": "time_series", "instant": false, "interval": "", @@ -22898,7 +22898,7 @@ "steppedLine": false, "targets": [ { - "expr": "diem_backup_service_latency_s_count{owner=~\"$owner\", role=~\"$role\", endpoint=\"state_snapshot\"} and irate(diem_backup_service_latency_s_count[1m]) > 0", + "expr": "aptos_backup_service_latency_s_count{owner=~\"$owner\", role=~\"$role\", endpoint=\"state_snapshot\"} and irate(aptos_backup_service_latency_s_count[1m]) > 0", "interval": "", "legendFormat": "{{owner}} {{kubernetes_pod_name}}", "refId": "A" @@ -22997,7 +22997,7 @@ "steppedLine": false, "targets": [ { - "expr": "diem_backup_service_latency_s_count{owner=~\"$owner\", role=~\"$role\", endpoint=\"transactions\"} and irate(diem_backup_service_latency_s_count[1m]) > 0", + "expr": "aptos_backup_service_latency_s_count{owner=~\"$owner\", role=~\"$role\", endpoint=\"transactions\"} and irate(aptos_backup_service_latency_s_count[1m]) > 0", "interval": "", "legendFormat": "{{owner}} {{kubernetes_pod_name}}", "refId": "A" @@ -23093,13 +23093,13 @@ "steppedLine": false, "targets": [ { - "expr": "diem_backup_handler_epoch_ending_epoch{owner=~\"$owner\", role=~\"$role\"} and irate(diem_backup_handler_epoch_ending_epoch[1m]) > 0", + "expr": "aptos_backup_handler_epoch_ending_epoch{owner=~\"$owner\", role=~\"$role\"} and irate(aptos_backup_handler_epoch_ending_epoch[1m]) > 0", "interval": "", "legendFormat": "{{owner}} {{kubernetes_pod_name}}", "refId": "A" }, { - "expr": "diem_storage_next_block_epoch{owner=~\"$owner\", role=~\"$role\"} and irate(diem_backup_handler_epoch_ending_epoch[1m]) > 0", + "expr": "diem_storage_next_block_epoch{owner=~\"$owner\", role=~\"$role\"} and irate(aptos_backup_handler_epoch_ending_epoch[1m]) > 0", "interval": "", "legendFormat": "{{owner}} {{kubernetes_pod_name}}", "refId": "B" @@ -23198,13 +23198,13 @@ "steppedLine": false, "targets": [ { - "expr": "diem_backup_handler_state_snapshot_version{owner=~\"$owner\", role=~\"$role\"}", + "expr": "aptos_backup_handler_state_snapshot_version{owner=~\"$owner\", role=~\"$role\"}", "interval": "", "legendFormat": "{{owner}} {{kubernetes_pod_name}}-snapshot", "refId": "A" }, { - "expr": "diem_storage_latest_transaction_version{owner=~\"$owner\", role=~\"$role\"} and diem_backup_handler_state_snapshot_version", + "expr": "diem_storage_latest_transaction_version{owner=~\"$owner\", role=~\"$role\"} and aptos_backup_handler_state_snapshot_version", "interval": "", "legendFormat": "{{owner}} {{kubernetes_pod_name}}-latest", "refId": "B" @@ -23303,13 +23303,13 @@ "steppedLine": false, "targets": [ { - "expr": "diem_backup_handler_state_snapshot_leaf_index{owner=~\"$owner\", role=~\"$role\"} + 1 ", + "expr": "aptos_backup_handler_state_snapshot_leaf_index{owner=~\"$owner\", role=~\"$role\"} + 1 ", "interval": "", "legendFormat": "{{owner}} {{kubernetes_pod_name}}-progress", "refId": "A" }, { - "expr": "(diem_storage_ledger{owner=~\"$owner\", role=~\"$role\", type=\"new_state_leaves\"} - ignoring(type) diem_storage_ledger{type=\"stale_state_leaves\"}) and diem_backup_handler_state_snapshot_leaf_index", + "expr": "(diem_storage_ledger{owner=~\"$owner\", role=~\"$role\", type=\"new_state_leaves\"} - ignoring(type) diem_storage_ledger{type=\"stale_state_leaves\"}) and aptos_backup_handler_state_snapshot_leaf_index", "interval": "", "legendFormat": "{{owner}} {{kubernetes_pod_name}}-total", "refId": "B" @@ -23408,7 +23408,7 @@ "steppedLine": false, "targets": [ { - "expr": "irate(diem_backup_handler_state_snapshot_leaf_index{owner=~\"$owner\", role=~\"$role\"}[1m])", + "expr": "irate(aptos_backup_handler_state_snapshot_leaf_index{owner=~\"$owner\", role=~\"$role\"}[1m])", "interval": "", "legendFormat": "{{owner}} {{kubernetes_pod_name}}", "refId": "A" @@ -23507,13 +23507,13 @@ "steppedLine": false, "targets": [ { - "expr": "diem_backup_handler_transaction_version{owner=~\"$owner\", role=~\"$role\"} and irate(diem_backup_handler_transaction_version[1m]) > 0", + "expr": "aptos_backup_handler_transaction_version{owner=~\"$owner\", role=~\"$role\"} and irate(aptos_backup_handler_transaction_version[1m]) > 0", "interval": "", "legendFormat": "{{owner}} {{kubernetes_pod_name}}", "refId": "A" }, { - "expr": "diem_storage_latest_transaction_version{owner=~\"$owner\", role=~\"$role\"} and irate(diem_backup_handler_transaction_version[1m]) > 0", + "expr": "diem_storage_latest_transaction_version{owner=~\"$owner\", role=~\"$role\"} and irate(aptos_backup_handler_transaction_version[1m]) > 0", "interval": "", "legendFormat": "{{owner}} {{kubernetes_pod_name}}", "refId": "B" @@ -23612,7 +23612,7 @@ "steppedLine": false, "targets": [ { - "expr": "irate(diem_backup_handler_transaction_version[1m]) > 0", + "expr": "irate(aptos_backup_handler_transaction_version[1m]) > 0", "interval": "", "legendFormat": "{{owner}} {{kubernetes_pod_name}}", "refId": "A" @@ -23723,7 +23723,7 @@ "steppedLine": false, "targets": [ { - "expr": "sum(irate(diem_backup_service_sent_bytes{owner=~\"$owner\", role=~\"$role\", endpoint=~\"$backup_service_api_name\"}[1m])) by(owner, kubernetes_pod_name) > 0", + "expr": "sum(irate(aptos_backup_service_sent_bytes{owner=~\"$owner\", role=~\"$role\", endpoint=~\"$backup_service_api_name\"}[1m])) by(owner, kubernetes_pod_name) > 0", "interval": "", "legendFormat": "{{owner}} {{kubernetes_pod_name}}", "refId": "A" @@ -23831,7 +23831,7 @@ "steppedLine": false, "targets": [ { - "expr": "irate(diem_backup_service_sent_bytes{endpoint=\"$backup_service_api_name\"}[1m]) and irate(diem_backup_service_sent_bytes[1m]) > 0", + "expr": "irate(aptos_backup_service_sent_bytes{endpoint=\"$backup_service_api_name\"}[1m]) and irate(aptos_backup_service_sent_bytes[1m]) > 0", "interval": "", "legendFormat": "{{owner}} {{kubernetes_pod_name}}", "refId": "A" @@ -23939,7 +23939,7 @@ "steppedLine": false, "targets": [ { - "expr": "irate(diem_backup_service_sent_bytes{endpoint=\"$backup_service_api_name\"}[1m]) and irate(diem_backup_service_sent_bytes[1m]) > 0", + "expr": "irate(aptos_backup_service_sent_bytes{endpoint=\"$backup_service_api_name\"}[1m]) and irate(aptos_backup_service_sent_bytes[1m]) > 0", "interval": "", "legendFormat": "{{owner}} {{kubernetes_pod_name}}", "refId": "A" @@ -24046,7 +24046,7 @@ "steppedLine": false, "targets": [ { - "expr": "irate(diem_backup_service_sent_bytes{endpoint=\"$backup_service_api_name\"}[1m]) and irate(diem_backup_service_sent_bytes[1m]) > 0", + "expr": "irate(aptos_backup_service_sent_bytes{endpoint=\"$backup_service_api_name\"}[1m]) and irate(aptos_backup_service_sent_bytes[1m]) > 0", "interval": "", "legendFormat": "{{owner}} {{kubernetes_pod_name}}", "refId": "A" @@ -24154,7 +24154,7 @@ "steppedLine": false, "targets": [ { - "expr": "irate(diem_backup_service_sent_bytes{endpoint=\"$backup_service_api_name\"}[1m]) and irate(diem_backup_service_sent_bytes[1m]) > 0", + "expr": "irate(aptos_backup_service_sent_bytes{endpoint=\"$backup_service_api_name\"}[1m]) and irate(aptos_backup_service_sent_bytes[1m]) > 0", "interval": "", "legendFormat": "{{owner}} {{kubernetes_pod_name}}", "refId": "A" @@ -24262,7 +24262,7 @@ "steppedLine": false, "targets": [ { - "expr": "irate(diem_backup_service_sent_bytes{endpoint=\"$backup_service_api_name\"}[1m]) and irate(diem_backup_service_sent_bytes[1m]) > 0", + "expr": "irate(aptos_backup_service_sent_bytes{endpoint=\"$backup_service_api_name\"}[1m]) and irate(aptos_backup_service_sent_bytes[1m]) > 0", "interval": "", "legendFormat": "{{owner}} {{kubernetes_pod_name}}", "refId": "A" @@ -24370,7 +24370,7 @@ "steppedLine": false, "targets": [ { - "expr": "irate(diem_backup_service_sent_bytes{endpoint=\"$backup_service_api_name\"}[1m]) and irate(diem_backup_service_sent_bytes[1m]) > 0", + "expr": "irate(aptos_backup_service_sent_bytes{endpoint=\"$backup_service_api_name\"}[1m]) and irate(aptos_backup_service_sent_bytes[1m]) > 0", "interval": "", "legendFormat": "{{owner}} {{kubernetes_pod_name}}", "refId": "A" @@ -24478,7 +24478,7 @@ "steppedLine": false, "targets": [ { - "expr": "irate(diem_backup_service_sent_bytes{endpoint=\"$backup_service_api_name\"}[1m]) and irate(diem_backup_service_sent_bytes[1m]) > 0", + "expr": "irate(aptos_backup_service_sent_bytes{endpoint=\"$backup_service_api_name\"}[1m]) and irate(aptos_backup_service_sent_bytes[1m]) > 0", "interval": "", "legendFormat": "{{owner}} {{kubernetes_pod_name}}", "refId": "A" @@ -26116,14 +26116,14 @@ ] }, "datasource": "Prometheus", - "definition": "diem_backup_service_latency_s_count", + "definition": "aptos_backup_service_latency_s_count", "hide": 0, "includeAll": true, "label": null, "multi": true, "name": "backup_service_api_name", "options": [], - "query": "diem_backup_service_latency_s_count", + "query": "aptos_backup_service_latency_s_count", "refresh": 1, "regex": "/endpoint=\"(\\w+)\"/", "skipUrlSync": false, diff --git a/terraform/helm/validator/files/dashboards/validator-connectivity.json b/terraform/helm/validator/files/dashboards/validator-connectivity.json index df9579a9fe27a..df237f88858e4 100644 --- a/terraform/helm/validator/files/dashboards/validator-connectivity.json +++ b/terraform/helm/validator/files/dashboards/validator-connectivity.json @@ -210,7 +210,7 @@ "pluginVersion": "7.2.0", "targets": [ { - "expr": "up{job=\"federate\"} == 0 or up{job=\"diem-procs\", role=\"validator\"} == 0", + "expr": "up{job=\"federate\"} == 0 or up{job=\"aptos-procs\", role=\"validator\"} == 0", "format": "table", "instant": true, "interval": "", diff --git a/terraform/helm/validator/files/dashboards/validator.json b/terraform/helm/validator/files/dashboards/validator.json index 845d675c8d70f..a2113718032b3 100644 --- a/terraform/helm/validator/files/dashboards/validator.json +++ b/terraform/helm/validator/files/dashboards/validator.json @@ -1256,7 +1256,7 @@ "steppedLine": false, "targets": [ { - "expr": "increase(diem_key_manager_state{state=\"keys_still_fresh\", owner=~\"$owner\"}[1h]) > bool 1", + "expr": "increase(aptos_key_manager_state{state=\"keys_still_fresh\", owner=~\"$owner\"}[1h]) > bool 1", "interval": "", "legendFormat": "{{owner}}", "refId": "A" diff --git a/terraform/helm/validator/files/dashboards/vm.json b/terraform/helm/validator/files/dashboards/vm.json index 2e3c2fbc01e63..443d73307c639 100644 --- a/terraform/helm/validator/files/dashboards/vm.json +++ b/terraform/helm/validator/files/dashboards/vm.json @@ -93,7 +93,7 @@ "steppedLine": false, "targets": [ { - "expr": "rate(diem_vm_user_transactions_executed{status=\"success\", owner=~\"$owner\", role=~\"$role\"}[$interval])", + "expr": "rate(aptos_vm_user_transactions_executed{status=\"success\", owner=~\"$owner\", role=~\"$role\"}[$interval])", "format": "time_series", "interval": "", "intervalFactor": 1, @@ -192,7 +192,7 @@ "steppedLine": false, "targets": [ { - "expr": "rate(diem_vm_system_transactions_executed{owner=~\"$owner\", role=~\"$role\"}[$interval])", + "expr": "rate(aptos_vm_system_transactions_executed{owner=~\"$owner\", role=~\"$role\"}[$interval])", "format": "time_series", "interval": "", "intervalFactor": 1, @@ -291,7 +291,7 @@ "steppedLine": false, "targets": [ { - "expr": "rate(diem_vm_transactions_validated{status=\"success\", owner=~\"$owner\", role=~\"$role\"}[$interval])", + "expr": "rate(aptos_vm_transactions_validated{status=\"success\", owner=~\"$owner\", role=~\"$role\"}[$interval])", "format": "time_series", "interval": "", "intervalFactor": 1, @@ -390,7 +390,7 @@ "steppedLine": false, "targets": [ { - "expr": "rate(diem_vm_num_txns_per_block_sum{owner=~\"$owner\", role=~\"$role\"}[$interval]) / rate(diem_vm_num_txns_per_block_count{owner=~\"$owner\", role=~\"$role\"}[$interval])", + "expr": "rate(aptos_vm_num_txns_per_block_sum{owner=~\"$owner\", role=~\"$role\"}[$interval]) / rate(aptos_vm_num_txns_per_block_count{owner=~\"$owner\", role=~\"$role\"}[$interval])", "format": "time_series", "interval": "", "intervalFactor": 1, @@ -503,7 +503,7 @@ "steppedLine": false, "targets": [ { - "expr": "rate(diem_vm_txn_gas_usage_sum{owner=~\"$owner\", role=~\"$role\"}[$interval]) / rate(diem_vm_txn_gas_usage_count{owner=~\"$owner\", role=~\"$role\"}[$interval])", + "expr": "rate(aptos_vm_txn_gas_usage_sum{owner=~\"$owner\", role=~\"$role\"}[$interval]) / rate(aptos_vm_txn_gas_usage_count{owner=~\"$owner\", role=~\"$role\"}[$interval])", "format": "time_series", "interval": "", "intervalFactor": 1, @@ -616,7 +616,7 @@ "steppedLine": false, "targets": [ { - "expr": "rate(diem_vm_txn_total_seconds_sum{owner=~\"$owner\", role=~\"$role\"}[$interval]) / rate(diem_vm_txn_total_seconds_count{owner=~\"$owner\", role=~\"$role\"}[$interval])", + "expr": "rate(aptos_vm_txn_total_seconds_sum{owner=~\"$owner\", role=~\"$role\"}[$interval]) / rate(aptos_vm_txn_total_seconds_count{owner=~\"$owner\", role=~\"$role\"}[$interval])", "format": "time_series", "interval": "", "intervalFactor": 1, @@ -715,7 +715,7 @@ "steppedLine": false, "targets": [ { - "expr": "rate(diem_vm_txn_validation_seconds_sum{owner=~\"$owner\", role=~\"$role\"}[$interval])/rate(diem_vm_txn_validation_seconds_count{owner=~\"$owner\", role=~\"$role\"}[$interval])", + "expr": "rate(aptos_vm_txn_validation_seconds_sum{owner=~\"$owner\", role=~\"$role\"}[$interval])/rate(aptos_vm_txn_validation_seconds_count{owner=~\"$owner\", role=~\"$role\"}[$interval])", "format": "time_series", "interval": "", "intervalFactor": 1, @@ -814,7 +814,7 @@ "steppedLine": false, "targets": [ { - "expr": "rate(diem_vm_txn_total_seconds_sum{owner=~\"$owner\", role=~\"$role\"}[$interval])/rate(diem_vm_txn_total_seconds_count{owner=~\"$owner\", role=~\"$role\"}[$interval])/(rate(diem_vm_txn_gas_usage_sum{owner=~\"$owner\", role=~\"$role\"}[$interval])/rate(diem_vm_txn_gas_usage_count{owner=~\"$owner\", role=~\"$role\"}[$interval]))", + "expr": "rate(aptos_vm_txn_total_seconds_sum{owner=~\"$owner\", role=~\"$role\"}[$interval])/rate(aptos_vm_txn_total_seconds_count{owner=~\"$owner\", role=~\"$role\"}[$interval])/(rate(aptos_vm_txn_gas_usage_sum{owner=~\"$owner\", role=~\"$role\"}[$interval])/rate(aptos_vm_txn_gas_usage_count{owner=~\"$owner\", role=~\"$role\"}[$interval]))", "format": "time_series", "interval": "", "intervalFactor": 1, diff --git a/terraform/helm/validator/files/haproxy.cfg b/terraform/helm/validator/files/haproxy.cfg index ed13b1d59c41c..c7d46901e8e06 100644 --- a/terraform/helm/validator/files/haproxy.cfg +++ b/terraform/helm/validator/files/haproxy.cfg @@ -1,6 +1,6 @@ global log stdout len 10240 format raw local0 - log {{ include "diem-validator.fullname" . }}-logging:1514 len 10240 local0 + log {{ include "aptos-validator.fullname" . }}-logging:1514 len 10240 local0 maxconn 500000 nbthread 16 user nobody @@ -32,7 +32,7 @@ frontend validator backend validator default-server maxconn 1024 {{ if .Values.haproxy.config.send_proxy_protocol }}send-proxy-v2{{ end }} - server {{ include "diem-validator.fullname" . }}-validator {{ include "diem-validator.fullname" . }}-validator:6180 + server {{ include "aptos-validator.fullname" . }}-validator {{ include "aptos-validator.fullname" . }}-validator:6180 # For testing purposes only! # Exposes the validator's own REST API @@ -50,7 +50,7 @@ frontend validator-api backend validator-api mode http default-server maxconn 1024 - server {{ include "diem-validator.fullname" $ }}-validator {{ include "diem-validator.fullname" $ }}-validator:8080 + server {{ include "aptos-validator.fullname" $ }}-validator {{ include "aptos-validator.fullname" $ }}-validator:8080 {{- end }} {{- range $index, $config := $.Values.fullnode.groups }} @@ -64,7 +64,7 @@ frontend {{ $config.name }}-diemnet backend {{ $config.name }}-diemnet default-server maxconn 1024 {{ if $.Values.haproxy.config.send_proxy_protocol }}send-proxy-v2{{ end }} - server {{ include "diem-validator.fullname" $ }}-{{ $config.name }} {{ include "diem-validator.fullname" $ }}-{{ $config.name }}:6182 + server {{ include "aptos-validator.fullname" $ }}-{{ $config.name }} {{ include "aptos-validator.fullname" $ }}-{{ $config.name }}:6182 frontend {{ $config.name }}-api mode http @@ -81,7 +81,7 @@ frontend {{ $config.name }}-api backend {{ $config.name }}-api mode http default-server maxconn 1024 - server {{ include "diem-validator.fullname" $ }}-{{ $config.name }} {{ include "diem-validator.fullname" $ }}-{{ $config.name }}:8080 + server {{ include "aptos-validator.fullname" $ }}-{{ $config.name }} {{ include "aptos-validator.fullname" $ }}-{{ $config.name }}:8080 {{- end }} diff --git a/terraform/helm/validator/files/prometheus.yml b/terraform/helm/validator/files/prometheus.yml index 63741154e5a5b..dd4921e812ff0 100644 --- a/terraform/helm/validator/files/prometheus.yml +++ b/terraform/helm/validator/files/prometheus.yml @@ -101,7 +101,7 @@ scrape_configs: owner: {{ .Values.validator.name }} {{ end }} -- job_name: "diem-procs" +- job_name: "aptos-procs" kubernetes_sd_configs: - role: pod diff --git a/terraform/helm/validator/files/rules/alerts.yml b/terraform/helm/validator/files/rules/alerts.yml index 6aafd5d9d65b1..20f92afbc34c9 100644 --- a/terraform/helm/validator/files/rules/alerts.yml +++ b/terraform/helm/validator/files/rules/alerts.yml @@ -42,7 +42,7 @@ groups: # Mempool alerts - alert: Mempool has no active upstream peers - expr: (sum by (owner, kubernetes_pod_name) (diem_mempool_active_upstream_peers_count)) == 0 + expr: (sum by (owner, kubernetes_pod_name) (aptos_mempool_active_upstream_peers_count)) == 0 for: 3m labels: severity: error @@ -106,7 +106,7 @@ groups: # DB Backup and Backup Verify - alert: Backup Coordinator Liveness # It's okay if one of these metrics stops changing but the pushgateway still reports the old value, since the alerts following this will detect the staleness. In fact this one is just to detect the absence of these metrics. - expr: absent(irate(diem_backup_metadata_num_file_downloads[1m]) > 0) and on() (absent(diem_db_backup_coordinator_heartbeat_timestamp_s) or absent(diem_db_backup_coordinator_epoch_ending_epoch) or absent(diem_db_backup_coordinator_transaction_version) or absent(diem_db_backup_coordinator_state_snapshot_version)) + expr: absent(irate(aptos_backup_metadata_num_file_downloads[1m]) > 0) and on() (absent(diem_db_backup_coordinator_heartbeat_timestamp_s) or absent(diem_db_backup_coordinator_epoch_ending_epoch) or absent(diem_db_backup_coordinator_transaction_version) or absent(diem_db_backup_coordinator_state_snapshot_version)) for: 10m labels: severity: warning diff --git a/terraform/helm/validator/templates/_helpers.tpl b/terraform/helm/validator/templates/_helpers.tpl index c752b7e6e8a8b..d3c7f993a20ce 100644 --- a/terraform/helm/validator/templates/_helpers.tpl +++ b/terraform/helm/validator/templates/_helpers.tpl @@ -2,7 +2,7 @@ {{/* Expand the name of the chart. */}} -{{- define "diem-validator.name" -}} +{{- define "aptos-validator.name" -}} {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} {{- end -}} @@ -11,7 +11,7 @@ Create a default fully qualified app name. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). If release name contains chart name it will be used as a full name. */}} -{{- define "diem-validator.fullname" -}} +{{- define "aptos-validator.fullname" -}} {{- if .Values.fullnameOverride -}} {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} {{- else -}} @@ -27,16 +27,16 @@ If release name contains chart name it will be used as a full name. {{/* Create chart name and version as used by the chart label. */}} -{{- define "diem-validator.chart" -}} +{{- define "aptos-validator.chart" -}} {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} {{- end -}} {{/* Common labels */}} -{{- define "diem-validator.labels" -}} -helm.sh/chart: {{ include "diem-validator.chart" . }} -{{ include "diem-validator.selectorLabels" . }} +{{- define "aptos-validator.labels" -}} +helm.sh/chart: {{ include "aptos-validator.chart" . }} +{{ include "aptos-validator.selectorLabels" . }} {{- if .Chart.AppVersion }} app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} {{- end }} @@ -46,50 +46,50 @@ app.kubernetes.io/managed-by: {{ .Release.Service }} {{/* Selector labels */}} -{{- define "diem-validator.selectorLabels" -}} -app.kubernetes.io/part-of: {{ include "diem-validator.name" . }} +{{- define "aptos-validator.selectorLabels" -}} +app.kubernetes.io/part-of: {{ include "aptos-validator.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} {{- end -}} {{/* Create the name of the service account to use */}} -{{- define "diem-validator.serviceAccountName" -}} +{{- define "aptos-validator.serviceAccountName" -}} {{- if .Values.serviceAccount.create -}} - {{ default (include "diem-validator.fullname" .) .Values.serviceAccount.name }} + {{ default (include "aptos-validator.fullname" .) .Values.serviceAccount.name }} {{- else -}} {{ default "default" .Values.serviceAccount.name }} {{- end -}} {{- end -}} {{- define "backup.fullname" -}} -{{ include "diem-validator.fullname" . }} +{{ include "aptos-validator.fullname" . }} {{- end -}} {{- define "backup.labels" -}} -{{ include "diem-validator.labels" . }} +{{ include "aptos-validator.labels" . }} {{- end -}} {{- define "backup.selectorLabels" -}} -{{ include "diem-validator.selectorLabels" . }} +{{ include "aptos-validator.selectorLabels" . }} {{- end -}} {{- define "backup.serviceAccount" -}} -{{ include "diem-validator.fullname" . }}-backup +{{ include "aptos-validator.fullname" . }}-backup {{- end -}} {{- define "backup.backupService" -}} -{{ include "diem-validator.fullname" . }}-fullnode:6186 +{{ include "aptos-validator.fullname" . }}-fullnode:6186 {{- end -}} {{- define "backup.persistentVolumeClaim" -}} -{{ include "diem-validator.fullname" . }}-validator-e{{ .Values.chain.era }} +{{ include "aptos-validator.fullname" . }}-validator-e{{ .Values.chain.era }} {{- end -}} {{- define "backup.pushGateway" -}} -http://{{ include "diem-validator.fullname" . }}-pushgateway:9091 +http://{{ include "aptos-validator.fullname" . }}-pushgateway:9091 {{- end -}} {{- define "backup.loggingAddress" -}} -{{ include "diem-validator.fullname" . }}-logging:5044 +{{ include "aptos-validator.fullname" . }}-logging:5044 {{- end -}} diff --git a/terraform/helm/validator/templates/backup-verify.yaml b/terraform/helm/validator/templates/backup-verify.yaml index f5e39824fe954..56e9de4102d59 100644 --- a/terraform/helm/validator/templates/backup-verify.yaml +++ b/terraform/helm/validator/templates/backup-verify.yaml @@ -33,7 +33,7 @@ spec: - {{ . }} {{- end }} - --metadata-cache-dir - - /tmp/diem-backup-verify-metadata + - /tmp/aptos-backup-verify-metadata - command-adapter - --config # use the same config with the backup sts diff --git a/terraform/helm/validator/templates/backup.yaml b/terraform/helm/validator/templates/backup.yaml index 1920196d49d6c..cb9cd26822c5f 100644 --- a/terraform/helm/validator/templates/backup.yaml +++ b/terraform/helm/validator/templates/backup.yaml @@ -44,7 +44,7 @@ spec: - "coordinator" - "run" - "--metadata-cache-dir" - - "/tmp/diem-backup-metadata" + - "/tmp/aptos-backup-metadata" - "--backup-service-address" - "http://{{ include "backup.backupService" . }}" {{- with .Values.backup }} diff --git a/terraform/helm/validator/templates/configmaps.yaml b/terraform/helm/validator/templates/configmaps.yaml index 7e7a3dc6b7df0..e6a121d62de3c 100644 --- a/terraform/helm/validator/templates/configmaps.yaml +++ b/terraform/helm/validator/templates/configmaps.yaml @@ -1,9 +1,9 @@ apiVersion: v1 kind: ConfigMap metadata: - name: {{ include "diem-validator.fullname" . }} + name: {{ include "aptos-validator.fullname" . }} labels: - {{- include "diem-validator.labels" . | nindent 4 }} + {{- include "aptos-validator.labels" . | nindent 4 }} data: {{ tpl (.Files.Glob "files/configs/*.yaml").AsConfig . | indent 2 }} @@ -12,8 +12,8 @@ data: apiVersion: v1 kind: ConfigMap metadata: - name: {{ include "diem-validator.fullname" . }}-dashboards + name: {{ include "aptos-validator.fullname" . }}-dashboards labels: - {{- include "diem-validator.labels" . | nindent 4 }} + {{- include "aptos-validator.labels" . | nindent 4 }} binaryData: {{ (.Files.Glob "files/dashboards/*.json.gz").AsSecrets | indent 2 }} diff --git a/terraform/helm/validator/templates/fullnode.yaml b/terraform/helm/validator/templates/fullnode.yaml index 2d5594edd8eb9..7db3cab50e350 100644 --- a/terraform/helm/validator/templates/fullnode.yaml +++ b/terraform/helm/validator/templates/fullnode.yaml @@ -1,9 +1,9 @@ apiVersion: v1 kind: ServiceAccount metadata: - name: {{ include "diem-validator.fullname" . }}-fullnode + name: {{ include "aptos-validator.fullname" . }}-fullnode labels: - {{- include "diem-validator.labels" . | nindent 4 }} + {{- include "aptos-validator.labels" . | nindent 4 }} {{- range .Values.fullnode.groups }} @@ -12,12 +12,12 @@ metadata: apiVersion: v1 kind: Service metadata: - name: {{ include "diem-validator.fullname" $ }}-{{ .name }} + name: {{ include "aptos-validator.fullname" $ }}-{{ .name }} labels: - {{- include "diem-validator.labels" $ | nindent 4 }} + {{- include "aptos-validator.labels" $ | nindent 4 }} spec: selector: - {{- include "diem-validator.selectorLabels" $ | nindent 4 }} + {{- include "aptos-validator.selectorLabels" $ | nindent 4 }} app.kubernetes.io/name: fullnode group: {{ .name }} ports: @@ -33,18 +33,18 @@ spec: apiVersion: apps/v1 kind: StatefulSet metadata: - name: {{ include "diem-validator.fullname" $ }}-{{ .name }}-e{{ $.Values.chain.era }} + name: {{ include "aptos-validator.fullname" $ }}-{{ .name }}-e{{ $.Values.chain.era }} labels: - {{- include "diem-validator.labels" $ | nindent 4 }} + {{- include "aptos-validator.labels" $ | nindent 4 }} app.kubernetes.io/name: fullnode group: {{ .name }} spec: - serviceName: {{ include "diem-validator.fullname" $ }}-{{ .name }} + serviceName: {{ include "aptos-validator.fullname" $ }}-{{ .name }} replicas: {{ .replicas }} podManagementPolicy: Parallel selector: matchLabels: - {{- include "diem-validator.selectorLabels" $ | nindent 6 }} + {{- include "aptos-validator.selectorLabels" $ | nindent 6 }} app.kubernetes.io/name: fullnode group: {{ .name }} volumeClaimTemplates: @@ -60,7 +60,7 @@ spec: template: metadata: labels: - {{- include "diem-validator.selectorLabels" $ | nindent 8 }} + {{- include "aptos-validator.selectorLabels" $ | nindent 8 }} app.kubernetes.io/name: fullnode group: {{ .name }} annotations: @@ -68,7 +68,7 @@ spec: checksum/fullnode.yaml: {{ tpl ($.Files.Get "files/configs/fullnode.yaml") $ | sha256sum }} checksum/vault.json: {{ tpl ($.Files.Get "files/vault.json") $ | sha256sum }} spec: - priorityClassName: {{ include "diem-validator.fullname" $ }}-medium + priorityClassName: {{ include "aptos-validator.fullname" $ }}-medium terminationGracePeriodSeconds: 0 containers: - name: fullnode @@ -80,7 +80,7 @@ spec: - |- set -ex while [ ! -e /opt/vault/token ] && [ $SECONDS -lt 30 ]; do sleep 1; done - exec /opt/diem/bin/diem-node -f /opt/diem/etc/fullnode.yaml + exec /opt/diem/bin/aptos-node -f /opt/diem/etc/fullnode.yaml {{- with $.Values.fullnode }} resources: {{- toYaml .resources | nindent 10 }} @@ -93,9 +93,9 @@ spec: - name: RUST_BACKTRACE value: "1" - name: STRUCT_LOG_TCP_ADDR - value: '{{ include "diem-validator.fullname" $ }}-logging:5044' + value: '{{ include "aptos-validator.fullname" $ }}-logging:5044' volumeMounts: - - name: diem-config + - name: aptos-config mountPath: /opt/diem/etc - name: genesis-config mountPath: /opt/diem/genesis @@ -162,19 +162,19 @@ spec: fsGroup: 6180 {{- end }} volumes: - - name: diem-config + - name: aptos-config configMap: - name: {{ include "diem-validator.fullname" $ }} + name: {{ include "aptos-validator.fullname" $ }} - name: genesis-config configMap: - name: {{ include "diem-validator.fullname" $ }}-genesis-e{{ $.Values.chain.era }} + name: {{ include "aptos-validator.fullname" $ }}-genesis-e{{ $.Values.chain.era }} - name: vault-config configMap: - name: {{ include "diem-validator.fullname" $ }}-vault + name: {{ include "aptos-validator.fullname" $ }}-vault - name: vault-token emptyDir: medium: Memory - serviceAccountName: {{ include "diem-validator.fullname" $ }}-fullnode + serviceAccountName: {{ include "aptos-validator.fullname" $ }}-fullnode {{- if $.Values.imagePullSecret }} imagePullSecrets: - name: {{ $.Values.imagePullSecret }} diff --git a/terraform/helm/validator/templates/haproxy.yaml b/terraform/helm/validator/templates/haproxy.yaml index 99695de2f5dbd..db86381d574a3 100644 --- a/terraform/helm/validator/templates/haproxy.yaml +++ b/terraform/helm/validator/templates/haproxy.yaml @@ -1,18 +1,18 @@ apiVersion: v1 kind: ServiceAccount metadata: - name: {{ include "diem-validator.fullname" . }}-haproxy + name: {{ include "aptos-validator.fullname" . }}-haproxy labels: - {{- include "diem-validator.labels" . | nindent 4 }} + {{- include "aptos-validator.labels" . | nindent 4 }} --- apiVersion: v1 kind: ConfigMap metadata: - name: {{ include "diem-validator.fullname" . }}-haproxy + name: {{ include "aptos-validator.fullname" . }}-haproxy labels: - {{- include "diem-validator.labels" . | nindent 4 }} + {{- include "aptos-validator.labels" . | nindent 4 }} data: haproxy.cfg: |- {{ (tpl (.Files.Get "files/haproxy.cfg") .) | indent 4 }} @@ -23,15 +23,15 @@ data: apiVersion: v1 kind: Service metadata: - name: {{ include "diem-validator.fullname" . }}-validator-lb + name: {{ include "aptos-validator.fullname" . }}-validator-lb labels: - {{- include "diem-validator.labels" . | nindent 4 }} + {{- include "aptos-validator.labels" . | nindent 4 }} annotations: service.beta.kubernetes.io/aws-load-balancer-type: nlb service.beta.kubernetes.io/oci-load-balancer-security-list-management-mode: All spec: selector: - {{- include "diem-validator.selectorLabels" . | nindent 4 }} + {{- include "aptos-validator.selectorLabels" . | nindent 4 }} app.kubernetes.io/name: haproxy ports: - name: validator @@ -55,15 +55,15 @@ spec: apiVersion: v1 kind: Service metadata: - name: {{ include "diem-validator.fullname" $ }}-{{ $config.name }}-lb + name: {{ include "aptos-validator.fullname" $ }}-{{ $config.name }}-lb labels: - {{- include "diem-validator.labels" $ | nindent 4 }} + {{- include "aptos-validator.labels" $ | nindent 4 }} annotations: service.beta.kubernetes.io/aws-load-balancer-type: nlb service.beta.kubernetes.io/oci-load-balancer-security-list-management-mode: All spec: selector: - {{- include "diem-validator.selectorLabels" $ | nindent 4 }} + {{- include "aptos-validator.selectorLabels" $ | nindent 4 }} app.kubernetes.io/name: haproxy ports: - name: diemnet @@ -93,9 +93,9 @@ spec: apiVersion: apps/v1 kind: Deployment metadata: - name: {{ include "diem-validator.fullname" . }}-haproxy + name: {{ include "aptos-validator.fullname" . }}-haproxy labels: - {{- include "diem-validator.labels" . | nindent 4 }} + {{- include "aptos-validator.labels" . | nindent 4 }} app.kubernetes.io/name: haproxy spec: replicas: {{ .Values.haproxy.replicas }} @@ -104,12 +104,12 @@ spec: maxUnavailable: 1 selector: matchLabels: - {{- include "diem-validator.selectorLabels" . | nindent 6 }} + {{- include "aptos-validator.selectorLabels" . | nindent 6 }} app.kubernetes.io/name: haproxy template: metadata: labels: - {{- include "diem-validator.selectorLabels" . | nindent 8 }} + {{- include "aptos-validator.selectorLabels" . | nindent 8 }} app.kubernetes.io/name: haproxy annotations: seccomp.security.alpha.kubernetes.io/pod: runtime/default @@ -173,13 +173,13 @@ spec: volumes: - name: haproxy-config configMap: - name: {{ include "diem-validator.fullname" . }}-haproxy + name: {{ include "aptos-validator.fullname" . }}-haproxy {{- if .Values.haproxy.tls_secret }} - name: haproxy-tls secret: secretName: {{ .Values.haproxy.tls_secret }} {{- end }} - serviceAccountName: {{ include "diem-validator.fullname" . }}-haproxy + serviceAccountName: {{ include "aptos-validator.fullname" . }}-haproxy {{- if .Values.imagePullSecret }} imagePullSecrets: - name: {{.Values.imagePullSecret}} diff --git a/terraform/helm/validator/templates/logging.yaml b/terraform/helm/validator/templates/logging.yaml index 0a354fd67e053..1ecaf56519166 100644 --- a/terraform/helm/validator/templates/logging.yaml +++ b/terraform/helm/validator/templates/logging.yaml @@ -1,9 +1,9 @@ apiVersion: v1 kind: ConfigMap metadata: - name: {{ include "diem-validator.fullname" . }}-vector + name: {{ include "aptos-validator.fullname" . }}-vector labels: - {{- include "diem-validator.labels" . | nindent 4 }} + {{- include "aptos-validator.labels" . | nindent 4 }} data: vector.toml: |- {{ (tpl (.Files.Get "files/vector.toml") .) | indent 4 }} @@ -13,9 +13,9 @@ data: apiVersion: v1 kind: Secret metadata: - name: {{ include "diem-validator.fullname" . }}-vector + name: {{ include "aptos-validator.fullname" . }}-vector labels: - {{- include "diem-validator.labels" . | nindent 4 }} + {{- include "aptos-validator.labels" . | nindent 4 }} type: kubernetes.io/tls data: tls.crt: {{.Values.loggingClientCert}} @@ -28,12 +28,12 @@ data: apiVersion: v1 kind: Service metadata: - name: {{ include "diem-validator.fullname" . }}-logging + name: {{ include "aptos-validator.fullname" . }}-logging labels: - {{- include "diem-validator.labels" . | nindent 4 }} + {{- include "aptos-validator.labels" . | nindent 4 }} spec: selector: - {{- include "diem-validator.selectorLabels" . | nindent 4 }} + {{- include "aptos-validator.selectorLabels" . | nindent 4 }} app.kubernetes.io/name: logging ports: - name: json @@ -47,22 +47,22 @@ spec: apiVersion: apps/v1 kind: StatefulSet metadata: - name: {{ include "diem-validator.fullname" . }}-logging + name: {{ include "aptos-validator.fullname" . }}-logging labels: - {{- include "diem-validator.labels" . | nindent 4 }} + {{- include "aptos-validator.labels" . | nindent 4 }} app.kubernetes.io/name: logging spec: - serviceName: {{ include "diem-validator.fullname" . }}-logging + serviceName: {{ include "aptos-validator.fullname" . }}-logging replicas: 1 podManagementPolicy: Parallel selector: matchLabels: - {{- include "diem-validator.selectorLabels" . | nindent 6 }} + {{- include "aptos-validator.selectorLabels" . | nindent 6 }} app.kubernetes.io/name: logging template: metadata: labels: - {{- include "diem-validator.selectorLabels" . | nindent 8 }} + {{- include "aptos-validator.selectorLabels" . | nindent 8 }} app.kubernetes.io/name: logging annotations: seccomp.security.alpha.kubernetes.io/pod: runtime/default @@ -75,11 +75,11 @@ spec: {{- end }} - name: vector-config configMap: - name: {{ include "diem-validator.fullname" . }}-vector + name: {{ include "aptos-validator.fullname" . }}-vector {{- if not .Values.loggingToNull }} - name: vector-secret secret: - secretName: {{ include "diem-validator.fullname" . }}-vector + secretName: {{ include "aptos-validator.fullname" . }}-vector {{- end }} {{- with .Values.logging }} containers: @@ -136,4 +136,4 @@ spec: runAsNonRoot: true fsGroup: 65534 {{- end }} - serviceAccountName: {{ include "diem-validator.serviceAccountName" . }} + serviceAccountName: {{ include "aptos-validator.serviceAccountName" . }} diff --git a/terraform/helm/validator/templates/monitoring.yaml b/terraform/helm/validator/templates/monitoring.yaml index 960acf38ac90b..1c303f020a4d3 100644 --- a/terraform/helm/validator/templates/monitoring.yaml +++ b/terraform/helm/validator/templates/monitoring.yaml @@ -1,9 +1,9 @@ apiVersion: v1 kind: ConfigMap metadata: - name: {{ include "diem-validator.fullname" . }}-grafana + name: {{ include "aptos-validator.fullname" . }}-grafana labels: - {{- include "diem-validator.labels" . | nindent 4 }} + {{- include "aptos-validator.labels" . | nindent 4 }} data: prometheus.yml: |- apiVersion: 1 @@ -28,9 +28,9 @@ data: apiVersion: v1 kind: Secret metadata: - name: {{ include "diem-validator.fullname" . }}-monitoring-tls + name: {{ include "aptos-validator.fullname" . }}-monitoring-tls labels: - {{- include "diem-validator.labels" . | nindent 4 }} + {{- include "aptos-validator.labels" . | nindent 4 }} type: kubernetes.io/tls data: tls.crt: {{ .Values.tlsCert }} @@ -44,9 +44,9 @@ data: apiVersion: v1 kind: PersistentVolumeClaim metadata: - name: {{ include "diem-validator.fullname" . }}-prometheus + name: {{ include "aptos-validator.fullname" . }}-prometheus labels: - {{- include "diem-validator.labels" . | nindent 4 }} + {{- include "aptos-validator.labels" . | nindent 4 }} spec: accessModes: - ReadWriteOnce @@ -60,9 +60,9 @@ spec: apiVersion: v1 kind: ConfigMap metadata: - name: {{ include "diem-validator.fullname" . }}-monitoring + name: {{ include "aptos-validator.fullname" . }}-monitoring labels: - {{- include "diem-validator.labels" . | nindent 4 }} + {{- include "aptos-validator.labels" . | nindent 4 }} data: {{ (tpl (.Files.Glob "files/rules/*.yml").AsConfig .) | indent 2 }} prometheus.yml: |- @@ -77,12 +77,12 @@ data: apiVersion: v1 kind: Service metadata: - name: {{ include "diem-validator.fullname" . }}-pushgateway + name: {{ include "aptos-validator.fullname" . }}-pushgateway labels: - {{- include "diem-validator.labels" . | nindent 4 }} + {{- include "aptos-validator.labels" . | nindent 4 }} spec: selector: - {{- include "diem-validator.selectorLabels" . | nindent 4 }} + {{- include "aptos-validator.selectorLabels" . | nindent 4 }} app.kubernetes.io/name: monitoring ports: - port: 9091 @@ -92,16 +92,16 @@ spec: apiVersion: v1 kind: Service metadata: - name: {{ include "diem-validator.fullname" . }}-monitoring + name: {{ include "aptos-validator.fullname" . }}-monitoring labels: - {{- include "diem-validator.labels" . | nindent 4 }} + {{- include "aptos-validator.labels" . | nindent 4 }} annotations: service.beta.kubernetes.io/aws-load-balancer-type: nlb service.beta.kubernetes.io/oci-load-balancer-shape: 10Mbps service.beta.kubernetes.io/oci-load-balancer-security-list-management-mode: All spec: selector: - {{- include "diem-validator.selectorLabels" . | nindent 4 }} + {{- include "aptos-validator.selectorLabels" . | nindent 4 }} app.kubernetes.io/name: monitoring ports: - port: 443 @@ -117,18 +117,18 @@ spec: apiVersion: v1 kind: ServiceAccount metadata: - name: {{ include "diem-validator.fullname" . }}-prometheus + name: {{ include "aptos-validator.fullname" . }}-prometheus labels: - {{- include "diem-validator.labels" . | nindent 4 }} + {{- include "aptos-validator.labels" . | nindent 4 }} --- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRole metadata: - name: {{ include "diem-validator.fullname" . }}-prometheus + name: {{ include "aptos-validator.fullname" . }}-prometheus labels: - {{- include "diem-validator.labels" . | nindent 4 }} + {{- include "aptos-validator.labels" . | nindent 4 }} rules: - apiGroups: [""] resources: @@ -151,16 +151,16 @@ rules: apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRoleBinding metadata: - name: {{ include "diem-validator.fullname" . }}-prometheus + name: {{ include "aptos-validator.fullname" . }}-prometheus labels: - {{- include "diem-validator.labels" . | nindent 4 }} + {{- include "aptos-validator.labels" . | nindent 4 }} roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: {{ include "diem-validator.fullname" . }}-prometheus + name: {{ include "aptos-validator.fullname" . }}-prometheus subjects: - kind: ServiceAccount - name: {{ include "diem-validator.fullname" . }}-prometheus + name: {{ include "aptos-validator.fullname" . }}-prometheus namespace: {{ .Release.Namespace }} --- @@ -168,22 +168,22 @@ subjects: apiVersion: apps/v1 kind: StatefulSet metadata: - name: {{ include "diem-validator.fullname" . }}-monitoring + name: {{ include "aptos-validator.fullname" . }}-monitoring labels: - {{- include "diem-validator.labels" . | nindent 4 }} + {{- include "aptos-validator.labels" . | nindent 4 }} app.kubernetes.io/name: monitoring spec: - serviceName: {{ include "diem-validator.fullname" . }}-monitoring + serviceName: {{ include "aptos-validator.fullname" . }}-monitoring replicas: 1 podManagementPolicy: Parallel selector: matchLabels: - {{- include "diem-validator.selectorLabels" . | nindent 6 }} + {{- include "aptos-validator.selectorLabels" . | nindent 6 }} app.kubernetes.io/name: monitoring template: metadata: labels: - {{- include "diem-validator.selectorLabels" . | nindent 8 }} + {{- include "aptos-validator.selectorLabels" . | nindent 8 }} app.kubernetes.io/name: monitoring annotations: seccomp.security.alpha.kubernetes.io/pod: runtime/default @@ -193,7 +193,7 @@ spec: checksum/rules.yml: {{ (tpl (.Files.Glob "files/rules/*.yml").AsConfig .) | sha256sum }} checksum/dashboards.json: {{ (.Files.Glob "files/dashboards/*.json.gz").AsSecrets | sha256sum }} spec: - priorityClassName: {{ include "diem-validator.fullname" . }}-medium + priorityClassName: {{ include "aptos-validator.fullname" . }}-medium {{- with .Values.monitoring }} containers: - name: prometheus @@ -374,7 +374,7 @@ spec: volumes: - name: grafana-provisioning configMap: - name: {{ include "diem-validator.fullname" . }}-grafana + name: {{ include "aptos-validator.fullname" . }}-grafana items: - key: prometheus.yml path: datasources/prometheus.yml @@ -382,15 +382,15 @@ spec: path: dashboards/dashboards.yml - name: grafana-dashboards-archive configMap: - name: {{ include "diem-validator.fullname" . }}-dashboards + name: {{ include "aptos-validator.fullname" . }}-dashboards - name: grafana-dashboards emptyDir: {} - name: monitoring-config configMap: - name: {{ include "diem-validator.fullname" . }}-monitoring + name: {{ include "aptos-validator.fullname" . }}-monitoring - name: prometheus-data persistentVolumeClaim: - claimName: {{ include "diem-validator.fullname" . }}-prometheus + claimName: {{ include "aptos-validator.fullname" . }}-prometheus - name: pushgateway-data emptyDir: {} - name: alertmanager-data @@ -400,9 +400,9 @@ spec: {{- if .Values.tlsCert }} - name: monitoring-tls secret: - secretName: {{ include "diem-validator.fullname" . }}-monitoring-tls + secretName: {{ include "aptos-validator.fullname" . }}-monitoring-tls {{- end }} - serviceAccountName: {{ include "diem-validator.fullname" . }}-prometheus + serviceAccountName: {{ include "aptos-validator.fullname" . }}-prometheus {{- if .Values.imagePullSecret }} imagePullSecrets: - name: {{.Values.imagePullSecret}} diff --git a/terraform/helm/validator/templates/priority.yaml b/terraform/helm/validator/templates/priority.yaml index 843acfd49c980..39a8bea4f4b04 100644 --- a/terraform/helm/validator/templates/priority.yaml +++ b/terraform/helm/validator/templates/priority.yaml @@ -1,7 +1,7 @@ apiVersion: scheduling.k8s.io/v1 kind: PriorityClass metadata: - name: {{ include "diem-validator.fullname" . }}-high + name: {{ include "aptos-validator.fullname" . }}-high value: 50000 --- @@ -9,5 +9,5 @@ value: 50000 apiVersion: scheduling.k8s.io/v1 kind: PriorityClass metadata: - name: {{ include "diem-validator.fullname" . }}-medium + name: {{ include "aptos-validator.fullname" . }}-medium value: 30000 diff --git a/terraform/helm/validator/templates/psp.yaml b/terraform/helm/validator/templates/psp.yaml index 095dd6cdd220b..51e18e7a9d0e5 100644 --- a/terraform/helm/validator/templates/psp.yaml +++ b/terraform/helm/validator/templates/psp.yaml @@ -1,7 +1,7 @@ apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: - name: {{ include "diem-validator.fullname" . }} + name: {{ include "aptos-validator.fullname" . }} annotations: seccomp.security.alpha.kubernetes.io/allowedProfileNames: runtime/default spec: @@ -45,50 +45,50 @@ spec: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: {{ include "diem-validator.fullname" . }}-psp + name: {{ include "aptos-validator.fullname" . }}-psp rules: - apiGroups: ["policy"] resources: ["podsecuritypolicies"] verbs: ["use"] resourceNames: - - {{ include "diem-validator.fullname" . }} + - {{ include "aptos-validator.fullname" . }} --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: {{ include "diem-validator.fullname" . }}-psp + name: {{ include "aptos-validator.fullname" . }}-psp roleRef: kind: ClusterRole - name: {{ include "diem-validator.fullname" . }}-psp + name: {{ include "aptos-validator.fullname" . }}-psp apiGroup: rbac.authorization.k8s.io subjects: - kind: ServiceAccount namespace: {{ .Release.Namespace }} - name: {{ include "diem-validator.serviceAccountName" . }} + name: {{ include "aptos-validator.serviceAccountName" . }} - kind: ServiceAccount namespace: {{ .Release.Namespace }} - name: {{ include "diem-validator.fullname" . }}-prometheus + name: {{ include "aptos-validator.fullname" . }}-prometheus - kind: ServiceAccount namespace: {{ .Release.Namespace }} - name: {{ include "diem-validator.fullname" . }}-safety-rules + name: {{ include "aptos-validator.fullname" . }}-safety-rules - kind: ServiceAccount namespace: {{ .Release.Namespace }} - name: {{ include "diem-validator.fullname" . }}-validator + name: {{ include "aptos-validator.fullname" . }}-validator - kind: ServiceAccount namespace: {{ .Release.Namespace }} - name: {{ include "diem-validator.fullname" . }}-fullnode + name: {{ include "aptos-validator.fullname" . }}-fullnode - kind: ServiceAccount namespace: {{ .Release.Namespace }} - name: {{ include "diem-validator.fullname" . }}-backup + name: {{ include "aptos-validator.fullname" . }}-backup --- apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: - name: {{ include "diem-validator.fullname" . }}-haproxy + name: {{ include "aptos-validator.fullname" . }}-haproxy annotations: seccomp.security.alpha.kubernetes.io/allowedProfileNames: runtime/default spec: @@ -135,25 +135,25 @@ spec: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: {{ include "diem-validator.fullname" . }}-psp-haproxy + name: {{ include "aptos-validator.fullname" . }}-psp-haproxy rules: - apiGroups: ["policy"] resources: ["podsecuritypolicies"] verbs: ["use"] resourceNames: - - {{ include "diem-validator.fullname" . }}-haproxy + - {{ include "aptos-validator.fullname" . }}-haproxy --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: {{ include "diem-validator.fullname" . }}-psp-haproxy + name: {{ include "aptos-validator.fullname" . }}-psp-haproxy roleRef: kind: ClusterRole - name: {{ include "diem-validator.fullname" . }}-psp-haproxy + name: {{ include "aptos-validator.fullname" . }}-psp-haproxy apiGroup: rbac.authorization.k8s.io subjects: - kind: ServiceAccount namespace: {{ .Release.Namespace }} - name: {{ include "diem-validator.fullname" . }}-haproxy + name: {{ include "aptos-validator.fullname" . }}-haproxy diff --git a/terraform/helm/validator/templates/restore.yaml b/terraform/helm/validator/templates/restore.yaml index 889684978aaf1..7268142619432 100644 --- a/terraform/helm/validator/templates/restore.yaml +++ b/terraform/helm/validator/templates/restore.yaml @@ -29,13 +29,13 @@ spec: - -c - |- set -ex - # cleanup diemdb + # cleanup aptosdb if [ ! -f /opt/diem/data/restore-uid ] || [ "$(cat /opt/diem/data/restore-uid)" != "$CONTROLLER_UID" ]; then rm -rf /opt/diem/data/db echo "$CONTROLLER_UID" > /opt/diem/data/restore-uid fi # start restore process - /usr/local/bin/db-restore --concurrent-downloads {{ .config.concurrent_downloads }}{{ range .config.trusted_waypoints }} --trust-waypoint {{ . }}{{ end }} --target-db-dir /opt/diem/data/db auto --metadata-cache-dir /tmp/diem-restore-metadata command-adapter --config /opt/diem/etc/{{ .config.location }}.toml + /usr/local/bin/db-restore --concurrent-downloads {{ .config.concurrent_downloads }}{{ range .config.trusted_waypoints }} --trust-waypoint {{ . }}{{ end }} --target-db-dir /opt/diem/data/db auto --metadata-cache-dir /tmp/aptos-restore-metadata command-adapter --config /opt/diem/etc/{{ .config.location }}.toml env: - name: RUST_LOG value: "debug" @@ -55,7 +55,7 @@ spec: volumeMounts: - name: backup-config mountPath: /opt/diem/etc - - name: diem-data + - name: aptos-data mountPath: /opt/diem/data - name: tmp mountPath: /tmp @@ -89,7 +89,7 @@ spec: name: {{ include "backup.fullname" . }}-backup - name: tmp emptyDir: {} - - name: diem-data + - name: aptos-data persistentVolumeClaim: claimName: {{ include "backup.persistentVolumeClaim" . }} serviceAccountName: {{ include "backup.serviceAccount" . }} diff --git a/terraform/helm/validator/templates/safety-rules.yaml b/terraform/helm/validator/templates/safety-rules.yaml index b83dd489f209b..6512282e9429e 100644 --- a/terraform/helm/validator/templates/safety-rules.yaml +++ b/terraform/helm/validator/templates/safety-rules.yaml @@ -1,21 +1,21 @@ apiVersion: v1 kind: ServiceAccount metadata: - name: {{ include "diem-validator.fullname" . }}-safety-rules + name: {{ include "aptos-validator.fullname" . }}-safety-rules labels: - {{- include "diem-validator.labels" . | nindent 4 }} + {{- include "aptos-validator.labels" . | nindent 4 }} --- apiVersion: v1 kind: Service metadata: - name: {{ include "diem-validator.fullname" . }}-safety-rules + name: {{ include "aptos-validator.fullname" . }}-safety-rules labels: - {{- include "diem-validator.labels" . | nindent 4 }} + {{- include "aptos-validator.labels" . | nindent 4 }} spec: selector: - {{- include "diem-validator.selectorLabels" . | nindent 4 }} + {{- include "aptos-validator.selectorLabels" . | nindent 4 }} app.kubernetes.io/name: safety-rules ports: - port: 6185 @@ -25,22 +25,22 @@ spec: apiVersion: apps/v1 kind: StatefulSet metadata: - name: {{ include "diem-validator.fullname" . }}-safety-rules + name: {{ include "aptos-validator.fullname" . }}-safety-rules labels: - {{- include "diem-validator.labels" . | nindent 4 }} + {{- include "aptos-validator.labels" . | nindent 4 }} app.kubernetes.io/name: safety-rules spec: - serviceName: {{ include "diem-validator.fullname" . }}-safety-rules + serviceName: {{ include "aptos-validator.fullname" . }}-safety-rules replicas: 1 podManagementPolicy: Parallel selector: matchLabels: - {{- include "diem-validator.selectorLabels" . | nindent 6 }} + {{- include "aptos-validator.selectorLabels" . | nindent 6 }} app.kubernetes.io/name: safety-rules template: metadata: labels: - {{- include "diem-validator.selectorLabels" . | nindent 8 }} + {{- include "aptos-validator.selectorLabels" . | nindent 8 }} app.kubernetes.io/name: safety-rules annotations: seccomp.security.alpha.kubernetes.io/pod: runtime/default @@ -48,7 +48,7 @@ spec: checksum/vault.json: {{ tpl (.Files.Get "files/vault.json") . | sha256sum }} chain/era: "{{ .Values.chain.era }}" spec: - priorityClassName: {{ include "diem-validator.fullname" . }}-high + priorityClassName: {{ include "aptos-validator.fullname" . }}-high terminationGracePeriodSeconds: 0 containers: - name: safety-rules @@ -73,9 +73,9 @@ spec: - name: RUST_BACKTRACE value: "1" - name: PUSH_METRICS_ENDPOINT - value: 'http://{{ include "diem-validator.fullname" . }}-pushgateway:9091/metrics/job/safety_rules' + value: 'http://{{ include "aptos-validator.fullname" . }}-pushgateway:9091/metrics/job/safety_rules' - name: STRUCT_LOG_TCP_ADDR - value: '{{ include "diem-validator.fullname" . }}-logging:5044' + value: '{{ include "aptos-validator.fullname" . }}-logging:5044' volumeMounts: - name: config-volume mountPath: /opt/diem/etc @@ -135,17 +135,17 @@ spec: volumes: - name: config-volume configMap: - name: {{ include "diem-validator.fullname" . }} + name: {{ include "aptos-validator.fullname" . }} - name: vault-config configMap: - name: {{ include "diem-validator.fullname" . }}-vault + name: {{ include "aptos-validator.fullname" . }}-vault - name: vault-token emptyDir: medium: Memory - name: genesis-config configMap: - name: {{ include "diem-validator.fullname" . }}-genesis-e{{ .Values.chain.era }} - serviceAccountName: {{ include "diem-validator.fullname" . }}-safety-rules + name: {{ include "aptos-validator.fullname" . }}-genesis-e{{ .Values.chain.era }} + serviceAccountName: {{ include "aptos-validator.fullname" . }}-safety-rules {{- if .Values.imagePullSecret }} imagePullSecrets: - name: {{.Values.imagePullSecret}} @@ -156,13 +156,13 @@ spec: apiVersion: networking.k8s.io/v1 kind: NetworkPolicy metadata: - name: {{ include "diem-validator.fullname" . }}-safety-rules + name: {{ include "aptos-validator.fullname" . }}-safety-rules labels: - {{- include "diem-validator.labels" . | nindent 4 }} + {{- include "aptos-validator.labels" . | nindent 4 }} spec: podSelector: matchLabels: - {{- include "diem-validator.selectorLabels" . | nindent 6 }} + {{- include "aptos-validator.selectorLabels" . | nindent 6 }} app.kubernetes.io/name: safety-rules policyTypes: - Ingress @@ -172,7 +172,7 @@ spec: - from: - podSelector: matchLabels: - {{- include "diem-validator.selectorLabels" . | nindent 10 }} + {{- include "aptos-validator.selectorLabels" . | nindent 10 }} app.kubernetes.io/name: validator ports: - protocol: TCP @@ -193,7 +193,7 @@ spec: - to: - podSelector: matchLabels: - {{- include "diem-validator.selectorLabels" . | nindent 10 }} + {{- include "aptos-validator.selectorLabels" . | nindent 10 }} app.kubernetes.io/name: monitoring ports: - protocol: TCP @@ -202,7 +202,7 @@ spec: - to: - podSelector: matchLabels: - {{- include "diem-validator.selectorLabels" . | nindent 10 }} + {{- include "aptos-validator.selectorLabels" . | nindent 10 }} app.kubernetes.io/name: logging ports: - protocol: TCP diff --git a/terraform/helm/validator/templates/serviceaccount.yaml b/terraform/helm/validator/templates/serviceaccount.yaml index bcf9c8ddbff60..f79c0fa1d0811 100644 --- a/terraform/helm/validator/templates/serviceaccount.yaml +++ b/terraform/helm/validator/templates/serviceaccount.yaml @@ -2,9 +2,9 @@ apiVersion: v1 kind: ServiceAccount metadata: - name: {{ include "diem-validator.serviceAccountName" . }} + name: {{ include "aptos-validator.serviceAccountName" . }} labels: -{{ include "diem-validator.labels" . | nindent 4 }} +{{ include "aptos-validator.labels" . | nindent 4 }} {{- end }} --- @@ -12,8 +12,8 @@ metadata: apiVersion: v1 kind: ServiceAccount metadata: - name: {{ include "diem-validator.fullname" . }}-backup + name: {{ include "aptos-validator.fullname" . }}-backup labels: - {{- include "diem-validator.labels" . | nindent 4 }} + {{- include "aptos-validator.labels" . | nindent 4 }} annotations: {{- toYaml .Values.backup.serviceAccount.annotations | nindent 4 }} diff --git a/terraform/helm/validator/templates/tools.yaml b/terraform/helm/validator/templates/tools.yaml index 58a4ed1f69fdb..bf57c36652e73 100644 --- a/terraform/helm/validator/templates/tools.yaml +++ b/terraform/helm/validator/templates/tools.yaml @@ -1,21 +1,21 @@ apiVersion: apps/v1 kind: StatefulSet metadata: - name: {{ include "diem-validator.fullname" . }}-tools + name: {{ include "aptos-validator.fullname" . }}-tools labels: - {{- include "diem-validator.labels" . | nindent 4 }} + {{- include "aptos-validator.labels" . | nindent 4 }} spec: - serviceName: {{ include "diem-validator.fullname" . }}-tools + serviceName: {{ include "aptos-validator.fullname" . }}-tools replicas: 0 podManagementPolicy: Parallel selector: matchLabels: - {{- include "diem-validator.selectorLabels" . | nindent 6 }} + {{- include "aptos-validator.selectorLabels" . | nindent 6 }} app.kubernetes.io/name: tools template: metadata: labels: - {{- include "diem-validator.selectorLabels" . | nindent 8 }} + {{- include "aptos-validator.selectorLabels" . | nindent 8 }} app.kubernetes.io/name: tools annotations: seccomp.security.alpha.kubernetes.io/pod: runtime/default @@ -28,7 +28,7 @@ spec: {{- end }} command: ["sleep", "infinity"] volumeMounts: - - name: diem-data + - name: aptos-data mountPath: /opt/diem/data - name: tmp mountPath: /tmp @@ -56,9 +56,9 @@ spec: runAsGroup: 6180 fsGroup: 6180 volumes: - - name: diem-data + - name: aptos-data persistentVolumeClaim: - claimName: {{ include "diem-validator.fullname" . }}-validator-e{{ .Values.chain.era }} + claimName: {{ include "aptos-validator.fullname" . }}-validator-e{{ .Values.chain.era }} - name: tmp emptyDir: {} - serviceAccountName: {{ include "diem-validator.serviceAccountName" . }} + serviceAccountName: {{ include "aptos-validator.serviceAccountName" . }} diff --git a/terraform/helm/validator/templates/validator.yaml b/terraform/helm/validator/templates/validator.yaml index 3ee1fd67e3841..3bf5d0170f6d3 100644 --- a/terraform/helm/validator/templates/validator.yaml +++ b/terraform/helm/validator/templates/validator.yaml @@ -1,18 +1,18 @@ apiVersion: v1 kind: ServiceAccount metadata: - name: {{ include "diem-validator.fullname" . }}-validator + name: {{ include "aptos-validator.fullname" . }}-validator labels: - {{- include "diem-validator.labels" . | nindent 4 }} + {{- include "aptos-validator.labels" . | nindent 4 }} --- apiVersion: v1 kind: Secret metadata: - name: {{ include "diem-validator.fullname" . }}-validator + name: {{ include "aptos-validator.fullname" . }}-validator labels: - {{- include "diem-validator.labels" . | nindent 4 }} + {{- include "aptos-validator.labels" . | nindent 4 }} type: Opaque stringData: seed: "{{ .Values.validator.configSeed }}" @@ -23,9 +23,9 @@ stringData: apiVersion: v1 kind: PersistentVolumeClaim metadata: - name: {{ include "diem-validator.fullname" . }}-validator-e{{ .Values.chain.era }} + name: {{ include "aptos-validator.fullname" . }}-validator-e{{ .Values.chain.era }} labels: - {{- include "diem-validator.labels" . | nindent 4 }} + {{- include "aptos-validator.labels" . | nindent 4 }} spec: accessModes: - ReadWriteOnce @@ -39,12 +39,12 @@ spec: apiVersion: v1 kind: Service metadata: - name: {{ include "diem-validator.fullname" . }}-validator + name: {{ include "aptos-validator.fullname" . }}-validator labels: - {{- include "diem-validator.labels" . | nindent 4 }} + {{- include "aptos-validator.labels" . | nindent 4 }} spec: selector: - {{- include "diem-validator.selectorLabels" . | nindent 4 }} + {{- include "aptos-validator.selectorLabels" . | nindent 4 }} app.kubernetes.io/name: validator ports: - name: validator @@ -61,29 +61,29 @@ spec: apiVersion: apps/v1 kind: StatefulSet metadata: - name: {{ include "diem-validator.fullname" . }}-validator + name: {{ include "aptos-validator.fullname" . }}-validator labels: - {{- include "diem-validator.labels" . | nindent 4 }} + {{- include "aptos-validator.labels" . | nindent 4 }} app.kubernetes.io/name: validator spec: - serviceName: {{ include "diem-validator.fullname" . }}-validator + serviceName: {{ include "aptos-validator.fullname" . }}-validator replicas: 1 podManagementPolicy: Parallel selector: matchLabels: - {{- include "diem-validator.selectorLabels" . | nindent 6 }} + {{- include "aptos-validator.selectorLabels" . | nindent 6 }} app.kubernetes.io/name: validator template: metadata: labels: - {{- include "diem-validator.selectorLabels" . | nindent 8 }} + {{- include "aptos-validator.selectorLabels" . | nindent 8 }} app.kubernetes.io/name: validator annotations: seccomp.security.alpha.kubernetes.io/pod: runtime/default checksum/validator.yaml: {{ tpl (.Files.Get "files/configs/validator.yaml") . | sha256sum }} checksum/vault.json: {{ tpl (.Files.Get "files/vault.json") . | sha256sum }} spec: - priorityClassName: {{ include "diem-validator.fullname" . }}-high + priorityClassName: {{ include "aptos-validator.fullname" . }}-high terminationGracePeriodSeconds: 0 containers: - name: validator @@ -96,7 +96,7 @@ spec: - |- set -ex while [ ! -e /opt/vault/token ] && [ $SECONDS -lt 30 ]; do sleep 1; done - exec /opt/diem/bin/diem-node -f /opt/diem/etc/validator.yaml + exec /opt/diem/bin/aptos-node -f /opt/diem/etc/validator.yaml resources: {{- toYaml .resources | nindent 10 }} env: @@ -106,15 +106,15 @@ spec: value: {{ .rust_log_remote }} {{- end }} - name: STRUCT_LOG_TCP_ADDR - value: '{{ include "diem-validator.fullname" . }}-logging:5044' + value: '{{ include "aptos-validator.fullname" . }}-logging:5044' - name: RUST_BACKTRACE value: "1" volumeMounts: - - name: diem-config + - name: aptos-config mountPath: /opt/diem/etc - name: genesis-config mountPath: /opt/diem/genesis - - name: diem-data + - name: aptos-data mountPath: /opt/diem/data - name: vault-config mountPath: /etc/vault @@ -177,22 +177,22 @@ spec: fsGroup: 6180 {{- end }} volumes: - - name: diem-config + - name: aptos-config configMap: - name: {{ include "diem-validator.fullname" . }} + name: {{ include "aptos-validator.fullname" . }} - name: genesis-config configMap: - name: {{ include "diem-validator.fullname" . }}-genesis-e{{ .Values.chain.era }} - - name: diem-data + name: {{ include "aptos-validator.fullname" . }}-genesis-e{{ .Values.chain.era }} + - name: aptos-data persistentVolumeClaim: - claimName: {{ include "diem-validator.fullname" . }}-validator-e{{ .Values.chain.era }} + claimName: {{ include "aptos-validator.fullname" . }}-validator-e{{ .Values.chain.era }} - name: vault-config configMap: - name: {{ include "diem-validator.fullname" . }}-vault + name: {{ include "aptos-validator.fullname" . }}-vault - name: vault-token emptyDir: medium: Memory - serviceAccountName: {{ include "diem-validator.fullname" . }}-validator + serviceAccountName: {{ include "aptos-validator.fullname" . }}-validator {{- if .Values.imagePullSecret }} imagePullSecrets: - name: {{.Values.imagePullSecret}} @@ -203,13 +203,13 @@ spec: apiVersion: networking.k8s.io/v1 kind: NetworkPolicy metadata: - name: {{ include "diem-validator.fullname" . }}-validator + name: {{ include "aptos-validator.fullname" . }}-validator labels: - {{- include "diem-validator.labels" . | nindent 4 }} + {{- include "aptos-validator.labels" . | nindent 4 }} spec: podSelector: matchLabels: - {{- include "diem-validator.selectorLabels" . | nindent 6 }} + {{- include "aptos-validator.selectorLabels" . | nindent 6 }} app.kubernetes.io/name: validator policyTypes: - Ingress @@ -219,7 +219,7 @@ spec: - from: - podSelector: matchLabels: - {{- include "diem-validator.selectorLabels" . | nindent 10 }} + {{- include "aptos-validator.selectorLabels" . | nindent 10 }} app.kubernetes.io/name: haproxy ports: - protocol: TCP @@ -229,7 +229,7 @@ spec: - from: - podSelector: matchLabels: - {{- include "diem-validator.selectorLabels" $ | nindent 10 }} + {{- include "aptos-validator.selectorLabels" $ | nindent 10 }} app.kubernetes.io/name: haproxy ports: - protocol: TCP @@ -239,7 +239,7 @@ spec: - from: - podSelector: matchLabels: - {{- include "diem-validator.selectorLabels" . | nindent 10 }} + {{- include "aptos-validator.selectorLabels" . | nindent 10 }} app.kubernetes.io/name: fullnode ports: - protocol: TCP @@ -248,7 +248,7 @@ spec: - from: - podSelector: matchLabels: - {{- include "diem-validator.selectorLabels" . | nindent 10 }} + {{- include "aptos-validator.selectorLabels" . | nindent 10 }} app.kubernetes.io/name: monitoring ports: - protocol: TCP @@ -262,7 +262,7 @@ spec: - to: - podSelector: matchLabels: - {{- include "diem-validator.selectorLabels" . | nindent 10 }} + {{- include "aptos-validator.selectorLabels" . | nindent 10 }} app.kubernetes.io/name: safety-rules ports: - protocol: TCP @@ -282,7 +282,7 @@ spec: - to: - podSelector: matchLabels: - {{- include "diem-validator.selectorLabels" . | nindent 10 }} + {{- include "aptos-validator.selectorLabels" . | nindent 10 }} app.kubernetes.io/name: logging ports: - protocol: TCP diff --git a/terraform/helm/validator/templates/vault.yaml b/terraform/helm/validator/templates/vault.yaml index 1001eb4e6a1be..99119c6b659ab 100644 --- a/terraform/helm/validator/templates/vault.yaml +++ b/terraform/helm/validator/templates/vault.yaml @@ -1,9 +1,9 @@ apiVersion: v1 kind: ConfigMap metadata: - name: {{ include "diem-validator.fullname" . }}-vault + name: {{ include "aptos-validator.fullname" . }}-vault labels: - {{- include "diem-validator.labels" . | nindent 4 }} + {{- include "aptos-validator.labels" . | nindent 4 }} data: safetyrules.json: |- {{- tpl (.Files.Get "files/vault.json") . | replace "" "safety-rules" | nindent 4 }} @@ -20,9 +20,9 @@ data: apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRole metadata: - name: {{ include "diem-validator.fullname" . }}-tokenreview + name: {{ include "aptos-validator.fullname" . }}-tokenreview labels: - {{- include "diem-validator.labels" . | nindent 4 }} + {{- include "aptos-validator.labels" . | nindent 4 }} rules: - apiGroups: ["authentication.k8s.io"] resources: ["tokenreviews"] @@ -33,20 +33,20 @@ rules: apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRoleBinding metadata: - name: {{ include "diem-validator.fullname" . }}-tokenreview + name: {{ include "aptos-validator.fullname" . }}-tokenreview labels: - {{- include "diem-validator.labels" . | nindent 4 }} + {{- include "aptos-validator.labels" . | nindent 4 }} roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: {{ include "diem-validator.fullname" . }}-tokenreview + name: {{ include "aptos-validator.fullname" . }}-tokenreview subjects: - kind: ServiceAccount - name: {{ include "diem-validator.fullname" . }}-safety-rules + name: {{ include "aptos-validator.fullname" . }}-safety-rules namespace: {{ .Release.Namespace }} - kind: ServiceAccount - name: {{ include "diem-validator.fullname" . }}-validator + name: {{ include "aptos-validator.fullname" . }}-validator namespace: {{ .Release.Namespace }} - kind: ServiceAccount - name: {{ include "diem-validator.fullname" . }}-fullnode + name: {{ include "aptos-validator.fullname" . }}-fullnode namespace: {{ .Release.Namespace }} diff --git a/terraform/testnet/explorer.tf b/terraform/testnet/explorer.tf index 61f2429a7d276..66037091d4e24 100644 --- a/terraform/testnet/explorer.tf +++ b/terraform/testnet/explorer.tf @@ -33,6 +33,6 @@ module "explorer" { blockchain_restapi_url = "https://api.${local.domain}" create_service_account = false - service_account_name = "diem-testnet" + service_account_name = "aptos-testnet" service_account_annotations = {} } diff --git a/terraform/testnet/forge.tf b/terraform/testnet/forge.tf index c01307084e3f6..316fd661b78f5 100644 --- a/terraform/testnet/forge.tf +++ b/terraform/testnet/forge.tf @@ -5,15 +5,15 @@ resource "random_id" "helm-bucket" { byte_length = 4 } -resource "aws_s3_bucket" "diem-testnet-helm" { +resource "aws_s3_bucket" "aptos-testnet-helm" { count = var.enable_forge ? 1 : 0 - bucket = "diem-testnet-${terraform.workspace}-helm-${random_id.helm-bucket.hex}" + bucket = "aptos-testnet-${terraform.workspace}-helm-${random_id.helm-bucket.hex}" } -resource "aws_s3_bucket_public_access_block" "diem-testnet-helm" { +resource "aws_s3_bucket_public_access_block" "aptos-testnet-helm" { count = var.enable_forge ? 1 : 0 - bucket = aws_s3_bucket.diem-testnet-helm[0].id + bucket = aws_s3_bucket.aptos-testnet-helm[0].id block_public_acls = true block_public_policy = true ignore_public_acls = true @@ -25,7 +25,7 @@ resource "aws_s3_bucket_public_access_block" "diem-testnet-helm" { resource "null_resource" "helm-s3-init" { count = var.enable_forge ? 1 : 0 depends_on = [ - aws_s3_bucket.diem-testnet-helm + aws_s3_bucket.aptos-testnet-helm ] triggers = { @@ -35,8 +35,8 @@ resource "null_resource" "helm-s3-init" { provisioner "local-exec" { command = <<-EOT helm plugin install https://github.com/hypnoglow/helm-s3.git || true - helm s3 init s3://${aws_s3_bucket.diem-testnet-helm[0].bucket}/charts - helm repo add testnet-${terraform.workspace} s3://${aws_s3_bucket.diem-testnet-helm[0].bucket}/charts + helm s3 init s3://${aws_s3_bucket.aptos-testnet-helm[0].bucket}/charts + helm repo add testnet-${terraform.workspace} s3://${aws_s3_bucket.aptos-testnet-helm[0].bucket}/charts EOT } } @@ -62,8 +62,8 @@ resource "null_resource" "helm-s3-package" { helm package ${path.module}/../helm/validator -d "$TEMPDIR" --app-version 1.0.0 --version 1.0.0 helm package ${path.module}/../helm/fullnode -d "$TEMPDIR" --app-version 1.0.0 --version 1.0.0 helm s3 push --force "$TEMPDIR"/testnet-*.tgz testnet-${terraform.workspace} - helm s3 push --force "$TEMPDIR"/diem-validator-*.tgz testnet-${terraform.workspace} - helm s3 push --force "$TEMPDIR"/diem-fullnode-*.tgz testnet-${terraform.workspace} + helm s3 push --force "$TEMPDIR"/aptos-validator-*.tgz testnet-${terraform.workspace} + helm s3 push --force "$TEMPDIR"/aptos-fullnode-*.tgz testnet-${terraform.workspace} echo "pushed to fullnode" EOT } @@ -106,8 +106,8 @@ data "aws_iam_policy_document" "forge" { "s3:ListBucket", ] resources = [ - "arn:aws:s3:::${aws_s3_bucket.diem-testnet-helm[0].id}", - "arn:aws:s3:::${aws_s3_bucket.diem-testnet-helm[0].id}/*" + "arn:aws:s3:::${aws_s3_bucket.aptos-testnet-helm[0].id}", + "arn:aws:s3:::${aws_s3_bucket.aptos-testnet-helm[0].id}/*" ] } @@ -130,7 +130,7 @@ data "aws_iam_policy_document" "forge" { resource "aws_iam_role" "forge" { count = var.enable_forge ? 1 : 0 - name = "diem-testnet-${terraform.workspace}-forge" + name = "aptos-testnet-${terraform.workspace}-forge" path = var.iam_path permissions_boundary = var.permissions_boundary_policy assume_role_policy = data.aws_iam_policy_document.forge-assume-role[0].json diff --git a/terraform/testnet/main.tf b/terraform/testnet/main.tf index 5981f794294f7..33d7af27ddec2 100644 --- a/terraform/testnet/main.tf +++ b/terraform/testnet/main.tf @@ -233,7 +233,7 @@ resource "helm_release" "public-fullnode" { chain = { name = "diem-${terraform.workspace}" era = var.era - genesisConfigmap = "diem-testnet-genesis-e${var.era}" + genesisConfigmap = "aptos-testnet-genesis-e${var.era}" } diem_chains = { "diem-${terraform.workspace}" = { @@ -244,7 +244,7 @@ resource "helm_release" "public-fullnode" { tag = local.image_tag } logging = { - address = var.enable_pfn_logger ? "testnet-pfn-diem-logger:5044" : "" + address = var.enable_pfn_logger ? "testnet-pfn-aptos-logger:5044" : "" } }), ] @@ -296,7 +296,7 @@ resource "helm_release" "forge" { jsonencode({ forge = { numValidators = var.num_validators - helmBucket = aws_s3_bucket.diem-testnet-helm[0].bucket + helmBucket = aws_s3_bucket.aptos-testnet-helm[0].bucket image = { tag = local.image_tag } diff --git a/terraform/testnet/testnet/files/prometheus.yml b/terraform/testnet/testnet/files/prometheus.yml index 1fca668c40737..921e2f077b8db 100644 --- a/terraform/testnet/testnet/files/prometheus.yml +++ b/terraform/testnet/testnet/files/prometheus.yml @@ -23,14 +23,14 @@ scrape_configs: metrics_path: '/federate' params: 'match[]': - - '{job="diem-procs"}' + - '{job="aptos-procs"}' - '{job="kubernetes-cadvisor"}' - '{job="kubernetes-nodes"}' - '{job="pushgateway"}' static_configs: {{- range $i, $e := .Values.genesis.numValidators | int | until }} - - targets: {{ printf "val%d-diem-validator-monitoring:443" $i | quote | list }} + - targets: {{ printf "val%d-aptos-validator-monitoring:443" $i | quote | list }} labels: owner: {{ printf "val%d" $i | quote }} {{- end }} @@ -39,7 +39,7 @@ scrape_configs: static_configs: {{- range $i, $e := .Values.genesis.numPublicFullnodes | int | until }} - - targets: {{ printf "pfn%d-diem-fullnode:9101" $i | quote | list }} + - targets: {{ printf "pfn%d-aptos-fullnode:9101" $i | quote | list }} labels: owner: {{ printf "pfn%d" $i | quote }} {{- end }} @@ -110,7 +110,7 @@ scrape_configs: static_configs: {{- if .Values.localVaultBackend }} {{- range $i, $e := .Values.genesis.numValidators | int | until }} - - targets: {{ printf "val%d-diem-validator-vault:8200" $i | quote | list }} + - targets: {{ printf "val%d-aptos-validator-vault:8200" $i | quote | list }} labels: owner: {{ printf "val%d" $i | quote }} {{- end }} diff --git a/terraform/testnet/testnet/files/rules/alerts.yml b/terraform/testnet/testnet/files/rules/alerts.yml index 6aafd5d9d65b1..20f92afbc34c9 100644 --- a/terraform/testnet/testnet/files/rules/alerts.yml +++ b/terraform/testnet/testnet/files/rules/alerts.yml @@ -42,7 +42,7 @@ groups: # Mempool alerts - alert: Mempool has no active upstream peers - expr: (sum by (owner, kubernetes_pod_name) (diem_mempool_active_upstream_peers_count)) == 0 + expr: (sum by (owner, kubernetes_pod_name) (aptos_mempool_active_upstream_peers_count)) == 0 for: 3m labels: severity: error @@ -106,7 +106,7 @@ groups: # DB Backup and Backup Verify - alert: Backup Coordinator Liveness # It's okay if one of these metrics stops changing but the pushgateway still reports the old value, since the alerts following this will detect the staleness. In fact this one is just to detect the absence of these metrics. - expr: absent(irate(diem_backup_metadata_num_file_downloads[1m]) > 0) and on() (absent(diem_db_backup_coordinator_heartbeat_timestamp_s) or absent(diem_db_backup_coordinator_epoch_ending_epoch) or absent(diem_db_backup_coordinator_transaction_version) or absent(diem_db_backup_coordinator_state_snapshot_version)) + expr: absent(irate(aptos_backup_metadata_num_file_downloads[1m]) > 0) and on() (absent(diem_db_backup_coordinator_heartbeat_timestamp_s) or absent(diem_db_backup_coordinator_epoch_ending_epoch) or absent(diem_db_backup_coordinator_transaction_version) or absent(diem_db_backup_coordinator_state_snapshot_version)) for: 10m labels: severity: warning diff --git a/terraform/testnet/testnet/files/rules/test_alerts.yml b/terraform/testnet/testnet/files/rules/test_alerts.yml index 0bff959a2bc68..7b0e25cb95583 100644 --- a/terraform/testnet/testnet/files/rules/test_alerts.yml +++ b/terraform/testnet/testnet/files/rules/test_alerts.yml @@ -4,7 +4,7 @@ groups: rules: {{- if .Values.cluster_test.enabled }} - alert: Scheduled tests stopped making traffic - expr: absent(rate(diem_vm_user_transactions_executed[{{ .Values.cluster_test.intervalMins }}m]) > 0) + expr: absent(rate(aptos_vm_user_transactions_executed[{{ .Values.cluster_test.intervalMins }}m]) > 0) for: {{ .Values.cluster_test.intervalMins }}m labels: severity: warning diff --git a/terraform/testnet/testnet/templates/clustertest.yaml b/terraform/testnet/testnet/templates/clustertest.yaml index 86f0fbbac502f..dd54dbd2508a8 100644 --- a/terraform/testnet/testnet/templates/clustertest.yaml +++ b/terraform/testnet/testnet/templates/clustertest.yaml @@ -31,7 +31,7 @@ spec: - --emit-tx - --mint-file=/opt/diem/etc/mint.key - --chain-id={{ .Values.genesis.chain_id | default .Values.genesis.era }} - - --peers={{- range $i, $e := until (int .Values.genesis.numValidators) -}}val{{$i}}-diem-validator-fullnode-lb:80,{{- end -}} + - --peers={{- range $i, $e := until (int .Values.genesis.numValidators) -}}val{{$i}}-aptos-validator-fullnode-lb:80,{{- end -}} {{- with .Values.cluster_test }} - --duration={{ .config.duration }} - --accounts-per-client={{ .config.accounts_per_client }} diff --git a/terraform/testnet/testnet/templates/faucet.yaml b/terraform/testnet/testnet/templates/faucet.yaml index 5e825d4b78db2..9b9d11021c9af 100644 --- a/terraform/testnet/testnet/templates/faucet.yaml +++ b/terraform/testnet/testnet/templates/faucet.yaml @@ -43,7 +43,7 @@ spec: value: "1" image: {{ .Values.faucet.image.repo }}:{{ .Values.faucet.image.tag | default .Values.imageTag }} imagePullPolicy: {{ .Values.faucet.image.pullPolicy }} - command: ["/opt/diem/bin/diem-faucet"] + command: ["/opt/diem/bin/aptos-faucet"] args: - "--address=0.0.0.0" - "--port=8080" diff --git a/terraform/testnet/testnet/templates/genesis.yaml b/terraform/testnet/testnet/templates/genesis.yaml index 9092950338124..f113b3c22a899 100644 --- a/terraform/testnet/testnet/templates/genesis.yaml +++ b/terraform/testnet/testnet/templates/genesis.yaml @@ -8,7 +8,7 @@ data: layout.yaml: |- owners = [{{- range $i, $e := until (int .Values.genesis.numValidators) -}}"val{{$i}}", {{- end -}}] operators = [{{- range $i, $e := until (int .Values.genesis.numValidators) -}}"val{{$i}}", {{- end -}}] - diem_root = "diem" + aptos_root = "diem" treasury_compliance = "diem" --- @@ -81,48 +81,48 @@ spec: export VAULT_TOKEN=$(vault write -field=token auth/approle/login role_id="{{ .Values.genesis.vaultRoleId }}" secret_id="{{ .Values.genesis.vaultSecretId }}") kubectl get pvc -o name | grep /fn- | grep -v "e{{ .Values.genesis.era }}-" | xargs -r kubectl delete - kubectl get configmap -o name | grep diem-validator-genesis-e | xargs -r kubectl delete + kubectl get configmap -o name | grep aptos-validator-genesis-e | xargs -r kubectl delete kubectl get configmap -o name | grep "{{ include "testnet.fullname" .}}-genesis-e" | xargs -r kubectl delete kubectl get secret -o name | grep "{{ include "testnet.fullname" . }}-faucet-e" | xargs -r kubectl delete - diem-genesis-tool set-layout --shared-backend "$FILE_BACKEND;namespace=common" --path /genesis/layout.yaml - diem-genesis-tool set-move-modules --shared-backend "$FILE_BACKEND;namespace=common" --dir {{ .Values.genesis.moveModuleDir | default "/diem/move/modules"}} - diem-genesis-tool diem-root-key --validator-backend "$VAULT_BACKEND;namespace=diem" --shared-backend "$FILE_BACKEND;namespace=diem" - diem-genesis-tool treasury-compliance-key --validator-backend "$VAULT_BACKEND;namespace=diem" --shared-backend "$FILE_BACKEND;namespace=diem" + aptos-genesis-tool set-layout --shared-backend "$FILE_BACKEND;namespace=common" --path /genesis/layout.yaml + aptos-genesis-tool set-move-modules --shared-backend "$FILE_BACKEND;namespace=common" --dir {{ .Values.genesis.moveModuleDir | default "/diem/move/modules"}} + aptos-genesis-tool aptos-root-key --validator-backend "$VAULT_BACKEND;namespace=diem" --shared-backend "$FILE_BACKEND;namespace=diem" + aptos-genesis-tool treasury-compliance-key --validator-backend "$VAULT_BACKEND;namespace=diem" --shared-backend "$FILE_BACKEND;namespace=diem" for N in $(seq 0 $(({{ .Values.genesis.numValidators}}-1))); do {{- if .Values.localVaultBackend }} - export VAULT_ADDR="http://val${N}-diem-validator-vault:8200" + export VAULT_ADDR="http://val${N}-aptos-validator-vault:8200" export VAULT_TOKEN="root" VAULT_BACKEND="backend=vault;server=$VAULT_ADDR;token=/tmp/vault.token" {{- end }} vault write -f "/transit/keys/val${N}__validator_network/rotate" - diem-genesis-tool owner-key --validator-backend "$VAULT_BACKEND;namespace=val$N" --shared-backend "$FILE_BACKEND;namespace=val$N" - diem-genesis-tool operator-key --validator-backend "$VAULT_BACKEND;namespace=val$N" --shared-backend "$FILE_BACKEND;namespace=val$N" + aptos-genesis-tool owner-key --validator-backend "$VAULT_BACKEND;namespace=val$N" --shared-backend "$FILE_BACKEND;namespace=val$N" + aptos-genesis-tool operator-key --validator-backend "$VAULT_BACKEND;namespace=val$N" --shared-backend "$FILE_BACKEND;namespace=val$N" {{- if .Values.service.fullnode.enableOnchainDiscovery }} - diem-genesis-tool validator-config --validator-backend "$VAULT_BACKEND;namespace=val$N" --shared-backend "$FILE_BACKEND;namespace=val$N" --validator-address "/dns4/val$N-diem-validator-validator-lb/tcp/6180" --fullnode-address "/dns4/fn$N.{{.Values.service.domain}}/tcp/6182" --owner-name "val$N" --chain-id "{{ .Values.genesis.chain_id | default .Values.genesis.era }}" + aptos-genesis-tool validator-config --validator-backend "$VAULT_BACKEND;namespace=val$N" --shared-backend "$FILE_BACKEND;namespace=val$N" --validator-address "/dns4/val$N-aptos-validator-validator-lb/tcp/6180" --fullnode-address "/dns4/fn$N.{{.Values.service.domain}}/tcp/6182" --owner-name "val$N" --chain-id "{{ .Values.genesis.chain_id | default .Values.genesis.era }}" {{- else }} - diem-genesis-tool validator-config --validator-backend "$VAULT_BACKEND;namespace=val$N" --shared-backend "$FILE_BACKEND;namespace=val$N" --validator-address "/dns4/val$N-diem-validator-validator-lb/tcp/6180" --fullnode-address "/dns4/val$N-diem-validator-fullnode-lb/tcp/6182" --owner-name "val$N" --chain-id "{{ .Values.genesis.chain_id | default .Values.genesis.era }}" + aptos-genesis-tool validator-config --validator-backend "$VAULT_BACKEND;namespace=val$N" --shared-backend "$FILE_BACKEND;namespace=val$N" --validator-address "/dns4/val$N-aptos-validator-validator-lb/tcp/6180" --fullnode-address "/dns4/val$N-aptos-validator-fullnode-lb/tcp/6182" --owner-name "val$N" --chain-id "{{ .Values.genesis.chain_id | default .Values.genesis.era }}" {{- end }} - diem-genesis-tool set-operator --shared-backend "$FILE_BACKEND;namespace=val$N" --operator-name "val$N" + aptos-genesis-tool set-operator --shared-backend "$FILE_BACKEND;namespace=val$N" --operator-name "val$N" done - diem-genesis-tool genesis --shared-backend "$FILE_BACKEND" --path /tmp/genesis.blob --chain-id "{{ .Values.genesis.chain_id | default .Values.genesis.era }}" - diem-genesis-tool create-waypoint --shared-backend "$FILE_BACKEND" --chain-id "{{ .Values.genesis.chain_id | default .Values.genesis.era }}" | grep -oE "[0-9]:[0-9a-zA-Z]+" | tee /tmp/waypoint.txt + aptos-genesis-tool genesis --shared-backend "$FILE_BACKEND" --path /tmp/genesis.blob --chain-id "{{ .Values.genesis.chain_id | default .Values.genesis.era }}" + aptos-genesis-tool create-waypoint --shared-backend "$FILE_BACKEND" --chain-id "{{ .Values.genesis.chain_id | default .Values.genesis.era }}" | grep -oE "[0-9]:[0-9a-zA-Z]+" | tee /tmp/waypoint.txt for N in $(seq 0 $(({{ .Values.genesis.numValidators}}-1))); do {{- if .Values.localVaultBackend }} - export VAULT_ADDR="http://val${N}-diem-validator-vault:8200" + export VAULT_ADDR="http://val${N}-aptos-validator-vault:8200" export VAULT_TOKEN="root" VAULT_BACKEND="backend=vault;server=$VAULT_ADDR;token=/tmp/vault.token" {{- end }} - diem-genesis-tool insert-waypoint --set-genesis --validator-backend "$VAULT_BACKEND;namespace=val$N" --waypoint "$(cat /tmp/waypoint.txt)" - kubectl create configmap val$N-diem-validator-genesis-e{{ .Values.genesis.era }} --from-file=genesis.blob=/tmp/genesis.blob + aptos-genesis-tool insert-waypoint --set-genesis --validator-backend "$VAULT_BACKEND;namespace=val$N" --waypoint "$(cat /tmp/waypoint.txt)" + kubectl create configmap val$N-aptos-validator-genesis-e{{ .Values.genesis.era }} --from-file=genesis.blob=/tmp/genesis.blob echo '{"safety_data": {"epoch": 0, "last_voted_round": 0, "preferred_round": 0, "last_vote": null}}' | vault kv put /secret/val$N/safety_data - done VAULT_BACKEND="backend=vault;server={{ .Values.vault.server.address }};ca_certificate={{ .Values.vault.server.ca_cert }};token=/opt/vault/token" - diem-operational-tool extract-private-key --key-name 'treasury_compliance' --key-file /tmp/mint.key --validator-backend "$VAULT_BACKEND;namespace=diem" + aptos-operational-tool extract-private-key --key-name 'treasury_compliance' --key-file /tmp/mint.key --validator-backend "$VAULT_BACKEND;namespace=diem" kubectl create secret generic {{ include "testnet.fullname" . }}-faucet-e{{ .Values.genesis.era }} --from-file=mint.key=/tmp/mint.key --from-file=waypoint.txt=/tmp/waypoint.txt --from-literal=chainid.txt="{{ .Values.genesis.chain_id | default .Values.genesis.era }}" kubectl create configmap {{ include "testnet.fullname" .}}-genesis-e{{ .Values.genesis.era }} --from-file=genesis.blob=/tmp/genesis.blob --from-file=waypoint.txt=/tmp/waypoint.txt --from-literal=chainid.txt="{{ .Values.genesis.chain_id | default .Values.genesis.era }}" --from-literal=era.txt="{{ .Values.genesis.era }}" resources: diff --git a/terraform/testnet/testnet/templates/psp.yaml b/terraform/testnet/testnet/templates/psp.yaml index f523e551c80cc..f815ee4aaea38 100644 --- a/terraform/testnet/testnet/templates/psp.yaml +++ b/terraform/testnet/testnet/templates/psp.yaml @@ -19,14 +19,14 @@ metadata: name: {{ include "testnet.fullname" . }}-pfn roleRef: kind: ClusterRole - name: val0-diem-validator-psp + name: val0-aptos-validator-psp apiGroup: rbac.authorization.k8s.io subjects: {{- range $i, $e := until (int .Values.genesis.numPublicFullnodes) }} - kind: ServiceAccount - name: pfn{{ $e }}-diem-fullnode + name: pfn{{ $e }}-aptos-fullnode namespace: {{ $.Release.Namespace }} {{- end }} - kind: ServiceAccount - name: testnet-pfn-diem-logger + name: testnet-pfn-aptos-logger namespace: {{ $.Release.Namespace }} diff --git a/terraform/testnet/testnet/templates/service.yaml b/terraform/testnet/testnet/templates/service.yaml index 082414a0272ee..091a771a5a25b 100644 --- a/terraform/testnet/testnet/templates/service.yaml +++ b/terraform/testnet/testnet/templates/service.yaml @@ -22,7 +22,7 @@ metadata: spec: selector: app.kubernetes.io/instance: {{ printf "val%d" $i | quote }} - app.kubernetes.io/part-of: diem-validator + app.kubernetes.io/part-of: aptos-validator app.kubernetes.io/name: haproxy ports: - name: diemnet @@ -47,7 +47,7 @@ metadata: alb.ingress.kubernetes.io/healthcheck-path: /-/healthy spec: selector: - app.kubernetes.io/part-of: diem-validator + app.kubernetes.io/part-of: aptos-validator app.kubernetes.io/name: haproxy ports: - port: 80 @@ -67,7 +67,7 @@ metadata: alb.ingress.kubernetes.io/healthcheck-path: /-/healthy spec: selector: - app.kubernetes.io/part-of: diem-fullnode + app.kubernetes.io/part-of: aptos-fullnode app.kubernetes.io/name: fullnode ports: - port: 80 diff --git a/terraform/testnet/vault.tf b/terraform/testnet/vault.tf index 69f0e9ab28400..0e375d7ab4fb4 100644 --- a/terraform/testnet/vault.tf +++ b/terraform/testnet/vault.tf @@ -51,14 +51,14 @@ module "vault" { kubernetes_host = module.validator.kubernetes.kubernetes_host kubernetes_ca_cert = module.validator.kubernetes.kubernetes_ca_cert issuer = module.validator.kubernetes.issuer - service_account_prefix = "val${count.index}-diem-validator" + service_account_prefix = "val${count.index}-aptos-validator" depends_on_ = [vault_mount.secret.accessor, vault_mount.transit.accessor] } -resource "vault_transit_secret_backend_key" "diem_root" { +resource "vault_transit_secret_backend_key" "aptos_root" { backend = vault_mount.transit.path - name = "diem__diem_root" + name = "diem__aptos_root" type = "ed25519" deletion_allowed = true exportable = true @@ -74,12 +74,12 @@ resource "vault_transit_secret_backend_key" "treasury_compliance" { data "vault_policy_document" "genesis-root" { rule { - path = "${vault_mount.transit.path}/keys/${vault_transit_secret_backend_key.diem_root.name}" + path = "${vault_mount.transit.path}/keys/${vault_transit_secret_backend_key.aptos_root.name}" capabilities = ["read"] description = "Allow reading the Diem root public key" } rule { - path = "${vault_mount.transit.path}/export/signing-key/${vault_transit_secret_backend_key.diem_root.name}" + path = "${vault_mount.transit.path}/export/signing-key/${vault_transit_secret_backend_key.aptos_root.name}" capabilities = ["read"] description = "Allow reading the Diem root private key" } diff --git a/terraform/validator/INSTALL.md b/terraform/validator/INSTALL.md index 4144d91c12d59..d7b7f7d188249 100644 --- a/terraform/validator/INSTALL.md +++ b/terraform/validator/INSTALL.md @@ -167,9 +167,9 @@ Terraform with Vault Check your `VAULT_CACERT` env (`echo $VAULT_CERT`), make sure it's the full path to the vault CA certificate file. `` is the token you generated in step 13. -20. Rename `diem-root.tf.example` to `diem-root.tf`, this will add `diem-root` key and `treasury_compliance` key in your vault for this test. +20. Rename `aptos-root.tf.example` to `aptos-root.tf`, this will add `aptos-root` key and `treasury_compliance` key in your vault for this test. - $ cp diem-root.tf.example diem-root.tf + $ cp aptos-root.tf.example aptos-root.tf 21. Apply the configuration, providing your Kubernetes cluster information: @@ -200,34 +200,34 @@ Terraform with Vault * Otherwise on AWS: - $ export VALIDATOR_ADDRESS="$(kubectl get svc ${WORKSPACE}-diem-validator-validator-lb -o go-template='/dns4/{{(index .status.loadBalancer.ingress 0).hostname}}/tcp/{{(index .spec.ports 0).port}}')" - $ export FULLNODE_ADDRESS="$(kubectl get svc ${WORKSPACE}-diem-validator-fullnode-lb -o go-template='/dns4/{{(index .status.loadBalancer.ingress 0).hostname}}/tcp/{{(index .spec.ports 0).port}}')" + $ export VALIDATOR_ADDRESS="$(kubectl get svc ${WORKSPACE}-aptos-validator-validator-lb -o go-template='/dns4/{{(index .status.loadBalancer.ingress 0).hostname}}/tcp/{{(index .spec.ports 0).port}}')" + $ export FULLNODE_ADDRESS="$(kubectl get svc ${WORKSPACE}-aptos-validator-fullnode-lb -o go-template='/dns4/{{(index .status.loadBalancer.ingress 0).hostname}}/tcp/{{(index .spec.ports 0).port}}')" * Otherwise on GCP and Azure: - $ export VALIDATOR_ADDRESS="$(kubectl get svc ${WORKSPACE}-diem-validator-validator-lb -o go-template='/ip4/{{(index .status.loadBalancer.ingress 0).ip}}/tcp/{{(index .spec.ports 0).port}}')" - $ export FULLNODE_ADDRESS="$(kubectl get svc ${WORKSPACE}-diem-validator-fullnode-lb -o go-template='/ip4/{{(index .status.loadBalancer.ingress 0).ip}}/tcp/{{(index .spec.ports 0).port}}')" + $ export VALIDATOR_ADDRESS="$(kubectl get svc ${WORKSPACE}-aptos-validator-validator-lb -o go-template='/ip4/{{(index .status.loadBalancer.ingress 0).ip}}/tcp/{{(index .spec.ports 0).port}}')" + $ export FULLNODE_ADDRESS="$(kubectl get svc ${WORKSPACE}-aptos-validator-fullnode-lb -o go-template='/ip4/{{(index .status.loadBalancer.ingress 0).ip}}/tcp/{{(index .spec.ports 0).port}}')" 26. Build the Diem genesis tool binary: $ git clone https://github.com/diem/diem $ cd diem $ git checkout - $ cargo build -p diem-genesis-tool - $ cargo run -p diem-genesis-tool -- help + $ cargo build -p aptos-genesis-tool + $ cargo run -p aptos-genesis-tool -- help Follow [My first transaction][] to setup the environment for building Rust code. 27. Use the genesis script to generate keys, create waypoints, and compile the genesis blob for your blockchain: $ cd ~/$WORKSPACE - $ export GENESIS=~/diem/target/debug/diem-genesis-tool + $ export GENESIS=~/diem/target/debug/aptos-genesis-tool $ export BACKEND="backend=vault;server=https://localhost:8200;ca_certificate=;token=vault.token;namespace=diem" $ ~/diem/scripts/genesis-single.sh $GENESIS $BACKEND $VALIDATOR_ADDRESS $FULLNODE_ADDRESS 28. Insert the genesis blob into the Kubernetes configmap for the chain era (defined in [helm/values.yaml][]): - $ kubectl create configmap $WORKSPACE-diem-validator-genesis-e --from-file=genesis.blob=genesis.blob + $ kubectl create configmap $WORKSPACE-aptos-validator-genesis-e --from-file=genesis.blob=genesis.blob change `` with current chain era number defined in [helm/values.yaml][]. @@ -237,7 +237,7 @@ Terraform with Vault 30. To access the monitoring dashboard run the following: - $ kubectl port-forward $WORKSPACE-diem-validator-monitoring-0 3000 + $ kubectl port-forward $WORKSPACE-aptos-validator-monitoring-0 3000 And then load http://localhost:3000/d/validator diff --git a/terraform/validator/aws/backup.tf b/terraform/validator/aws/backup.tf index 6f4948a555aa0..cdb7862e9541e 100644 --- a/terraform/validator/aws/backup.tf +++ b/terraform/validator/aws/backup.tf @@ -39,7 +39,7 @@ data "aws_iam_policy_document" "backup-assume-role" { condition { test = "StringEquals" variable = "${local.oidc_provider}:sub" - values = ["system:serviceaccount:default:${var.helm_release_name != "" ? var.helm_release_name : local.workspace_name}-diem-validator-backup"] + values = ["system:serviceaccount:default:${var.helm_release_name != "" ? var.helm_release_name : local.workspace_name}-aptos-validator-backup"] } condition { diff --git a/terraform/validator/aws/dns.tf b/terraform/validator/aws/dns.tf index 84966744d6ecd..1b8cefcf2f5cc 100644 --- a/terraform/validator/aws/dns.tf +++ b/terraform/validator/aws/dns.tf @@ -16,7 +16,7 @@ locals { data "kubernetes_service" "validator-lb" { count = var.zone_id != "" ? 1 : 0 metadata { - name = "${local.workspace_name}-diem-validator-validator-lb" + name = "${local.workspace_name}-aptos-validator-validator-lb" } depends_on = [time_sleep.lb_creation] } @@ -24,7 +24,7 @@ data "kubernetes_service" "validator-lb" { data "kubernetes_service" "fullnode-lb" { count = var.zone_id != "" ? 1 : 0 metadata { - name = "${local.workspace_name}-diem-validator-fullnode-lb" + name = "${local.workspace_name}-aptos-validator-fullnode-lb" } depends_on = [time_sleep.lb_creation] } diff --git a/terraform/validator/aws/kubernetes.tf b/terraform/validator/aws/kubernetes.tf index 24d2dae56169d..a8a451ebdad5d 100644 --- a/terraform/validator/aws/kubernetes.tf +++ b/terraform/validator/aws/kubernetes.tf @@ -335,7 +335,7 @@ resource "local_file" "kubernetes" { kubernetes_host = aws_eks_cluster.diem.endpoint kubernetes_ca_cert = base64decode(aws_eks_cluster.diem.certificate_authority.0.data) issuer = aws_eks_cluster.diem.identity[0].oidc[0].issuer - service_account_prefix = "${local.workspace_name}-diem-validator" + service_account_prefix = "${local.workspace_name}-aptos-validator" pod_cidrs = aws_subnet.private[*].cidr_block }) file_permission = "0644" diff --git a/terraform/validator/aws/variables.tf b/terraform/validator/aws/variables.tf index d18532fa75db5..31e94b6c7e654 100644 --- a/terraform/validator/aws/variables.tf +++ b/terraform/validator/aws/variables.tf @@ -24,7 +24,7 @@ variable "record_name" { } variable "helm_chart" { - description = "Path to diem-validator Helm chart file" + description = "Path to aptos-validator Helm chart file" default = "../helm" } diff --git a/terraform/validator/azure/dns.tf b/terraform/validator/azure/dns.tf index 4e7006053bfa8..6aab4a7675cc8 100644 --- a/terraform/validator/azure/dns.tf +++ b/terraform/validator/azure/dns.tf @@ -16,7 +16,7 @@ locals { data "kubernetes_service" "validator-lb" { count = var.zone_name != "" ? 1 : 0 metadata { - name = "${terraform.workspace}-diem-validator-validator-lb" + name = "${terraform.workspace}-aptos-validator-validator-lb" } depends_on = [time_sleep.lb_creation] } @@ -24,7 +24,7 @@ data "kubernetes_service" "validator-lb" { data "kubernetes_service" "fullnode-lb" { count = var.zone_name != "" ? 1 : 0 metadata { - name = "${terraform.workspace}-diem-validator-fullnode-lb" + name = "${terraform.workspace}-aptos-validator-fullnode-lb" } depends_on = [time_sleep.lb_creation] } diff --git a/terraform/validator/azure/kubernetes.tf b/terraform/validator/azure/kubernetes.tf index e310b3d19e44a..10bc7eca37229 100644 --- a/terraform/validator/azure/kubernetes.tf +++ b/terraform/validator/azure/kubernetes.tf @@ -157,7 +157,7 @@ resource "local_file" "kubernetes" { kubernetes_host = azurerm_kubernetes_cluster.diem.kube_config[0].host kubernetes_ca_cert = base64decode(azurerm_kubernetes_cluster.diem.kube_config[0].cluster_ca_certificate) issuer = azurerm_kubernetes_cluster.diem.fqdn - service_account_prefix = "${terraform.workspace}-diem-validator" + service_account_prefix = "${terraform.workspace}-aptos-validator" pod_cidrs = azurerm_subnet.nodes.address_prefixes }) file_permission = "0644" diff --git a/terraform/validator/azure/variables.tf b/terraform/validator/azure/variables.tf index eee8971524a30..2538437fe0783 100644 --- a/terraform/validator/azure/variables.tf +++ b/terraform/validator/azure/variables.tf @@ -24,7 +24,7 @@ variable "record_name" { } variable "helm_chart" { - description = "Path to diem-validator Helm chart file" + description = "Path to aptos-validator Helm chart file" default = "../helm" } diff --git a/terraform/validator/gcp/backup.tf b/terraform/validator/gcp/backup.tf index e7df311153535..77d687bfe643d 100644 --- a/terraform/validator/gcp/backup.tf +++ b/terraform/validator/gcp/backup.tf @@ -21,5 +21,5 @@ resource "google_storage_bucket_iam_member" "backup" { resource "google_service_account_iam_binding" "backup" { service_account_id = google_service_account.backup.name role = "roles/iam.workloadIdentityUser" - members = ["serviceAccount:${google_container_cluster.diem.workload_identity_config[0].identity_namespace}[default/${terraform.workspace}-diem-validator-backup]"] + members = ["serviceAccount:${google_container_cluster.diem.workload_identity_config[0].identity_namespace}[default/${terraform.workspace}-aptos-validator-backup]"] } diff --git a/terraform/validator/gcp/dns.tf b/terraform/validator/gcp/dns.tf index 0c62e9335bfc0..82b86005e5873 100644 --- a/terraform/validator/gcp/dns.tf +++ b/terraform/validator/gcp/dns.tf @@ -16,7 +16,7 @@ locals { data "kubernetes_service" "validator-lb" { count = var.zone_name != "" ? 1 : 0 metadata { - name = "${terraform.workspace}-diem-validator-validator-lb" + name = "${terraform.workspace}-aptos-validator-validator-lb" } depends_on = [time_sleep.lb_creation] } @@ -24,7 +24,7 @@ data "kubernetes_service" "validator-lb" { data "kubernetes_service" "fullnode-lb" { count = var.zone_name != "" ? 1 : 0 metadata { - name = "${terraform.workspace}-diem-validator-fullnode-lb" + name = "${terraform.workspace}-aptos-validator-fullnode-lb" } depends_on = [time_sleep.lb_creation] } diff --git a/terraform/validator/gcp/kubernetes.tf b/terraform/validator/gcp/kubernetes.tf index dcb72d2ffe8a5..3436f8ccfc8bd 100644 --- a/terraform/validator/gcp/kubernetes.tf +++ b/terraform/validator/gcp/kubernetes.tf @@ -157,7 +157,7 @@ resource "local_file" "kubernetes" { kubernetes_host = "https://${google_container_cluster.diem.private_cluster_config[0].private_endpoint}" kubernetes_ca_cert = base64decode(google_container_cluster.diem.master_auth[0].cluster_ca_certificate) issuer = "https://container.googleapis.com/v1/${google_container_cluster.diem.id}" - service_account_prefix = "${terraform.workspace}-diem-validator" + service_account_prefix = "${terraform.workspace}-aptos-validator" pod_cidrs = [google_container_cluster.diem.cluster_ipv4_cidr] }) file_permission = "0644" diff --git a/terraform/validator/gcp/variables.tf b/terraform/validator/gcp/variables.tf index 9a3790c4879f0..5ad224f00be20 100644 --- a/terraform/validator/gcp/variables.tf +++ b/terraform/validator/gcp/variables.tf @@ -34,7 +34,7 @@ variable "record_name" { } variable "helm_chart" { - description = "Path to diem-validator Helm chart file" + description = "Path to aptos-validator Helm chart file" default = "../helm" } diff --git a/terraform/validator/vault-init/README.md b/terraform/validator/vault-init/README.md index 20fd88f242163..2e7bd178f2a4b 100644 --- a/terraform/validator/vault-init/README.md +++ b/terraform/validator/vault-init/README.md @@ -16,8 +16,8 @@ in your Vault deployment, but at a high level it creates: `diem/safety_data` * Transit keys: `diem__owner`, `diem__operator`, `diem__consensus`, `diem__validator_network`, `diem__fullnode_network`, `diem__execution` -* Policies: `diem-validator`, `diem-safety-rules`, `diem-key-manager`, - `diem-fullnode`, `diem-management` +* Policies: `aptos-validator`, `aptos-safety-rules`, `aptos-key-manager`, + `aptos-fullnode`, `aptos-management` Kubernetes Integration ---------------------- @@ -43,7 +43,7 @@ If you don't use Terraform or Cloud infrastructure, you can follow this instruct 3. Create vault policies used by validator deployment * Create the policy content in HCL files (json format compatible) https://learn.hashicorp.com/tutorials/vault/getting-started-policies?in=vault/getting-started#policy-format * Write the policies into vault server https://learn.hashicorp.com/tutorials/vault/getting-started-policies?in=vault/getting-started#write-a-policy - * List of policies: diem-validator, diem-safety-rules, diem-key-manager, diem-fullnode, diem-management. Details of each policy can be found in this file [policy.tf][] + * List of policies: aptos-validator, aptos-safety-rules, aptos-key-manager, aptos-fullnode, aptos-management. Details of each policy can be found in this file [policy.tf][] 4. Create KV-v2 data used by validator deployment * List of KV-v2 data can be found in this file as “vault_generic_secret” [main.tf][] diff --git a/terraform/validator/vault-init/diem-root.tf.example b/terraform/validator/vault-init/aptos-root.tf.example similarity index 76% rename from terraform/validator/vault-init/diem-root.tf.example rename to terraform/validator/vault-init/aptos-root.tf.example index c79161419d3f3..d2abf35f32682 100644 --- a/terraform/validator/vault-init/diem-root.tf.example +++ b/terraform/validator/vault-init/aptos-root.tf.example @@ -1,6 +1,6 @@ -resource "vault_transit_secret_backend_key" "diem_root" { +resource "vault_transit_secret_backend_key" "aptos_root" { backend = var.transit_mount - name = "${var.namespace}__diem_root" + name = "${var.namespace}__aptos_root" type = "ed25519" depends_on = [null_resource.mounts_created] } diff --git a/terraform/validator/vault-init/kubernetes.tf b/terraform/validator/vault-init/kubernetes.tf index 2d995ad6744fa..233fadbbb6b87 100644 --- a/terraform/validator/vault-init/kubernetes.tf +++ b/terraform/validator/vault-init/kubernetes.tf @@ -15,7 +15,7 @@ variable "issuer" { variable "service_account_prefix" { type = string - description = "Prefix for Diem service accounts, e.g. default-diem-validator" + description = "Prefix for Diem service accounts, e.g. default-aptos-validator" } variable "pod_cidrs" { diff --git a/testsuite/diem-fuzzer/Cargo.toml b/testsuite/aptos-fuzzer/Cargo.toml similarity index 75% rename from testsuite/diem-fuzzer/Cargo.toml rename to testsuite/aptos-fuzzer/Cargo.toml index 77c6406a4dd4b..72d1731cde795 100644 --- a/testsuite/diem-fuzzer/Cargo.toml +++ b/testsuite/aptos-fuzzer/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "diem-fuzzer" +name = "aptos-fuzzer" version = "0.1.0" authors = ["Diem Association "] description = "Diem fuzzer" @@ -25,8 +25,8 @@ rand = "0.8.3" ureq = { version = "1.5.4", features = ["json", "native-tls"], default-features = false } bcs = "0.1.2" -diem-proptest-helpers = { path = "../../crates/diem-proptest-helpers" } -diem-workspace-hack = { version = "0.1", path = "../../crates/diem-workspace-hack" } +aptos-proptest-helpers = { path = "../../crates/aptos-proptest-helpers" } +aptos-workspace-hack = { version = "0.1", path = "../../crates/aptos-workspace-hack" } # List out modules with data structures being fuzzed here. accumulator = { path = "../../storage/accumulator", features = ["fuzzing"] } @@ -34,19 +34,19 @@ consensus = { path = "../../consensus", features = ["fuzzing"] } consensus-types = { path = "../../consensus/consensus-types", features = ["fuzzing"] } executor = { path = "../../execution/executor", features = ["fuzzing"] } executor-types = { path = "../../execution/executor-types", features = ["fuzzing"] } -language-e2e-tests = { path = "../../diem-move/e2e-tests" } -diem-crypto = { path = "../../crates/diem-crypto", features = ["fuzzing"]} -diem-jellyfish-merkle = { path = "../../storage/jellyfish-merkle", features = ["fuzzing"] } -diem-mempool = { path = "../../mempool" } -diem-types = { path = "../../types", features = ["fuzzing"] } -diem-vault-client = { path = "../../secure/storage/vault", features = ["fuzzing"] } -diemdb = { path = "../../storage/diemdb", features = ["fuzzing"] } +language-e2e-tests = { path = "../../aptos-move/e2e-tests" } +aptos-crypto = { path = "../../crates/aptos-crypto", features = ["fuzzing"]} +aptos-jellyfish-merkle = { path = "../../storage/jellyfish-merkle", features = ["fuzzing"] } +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/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860", features = ["fuzzing"] } move-core-types = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860", features = ["fuzzing"] } 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", "diemdb"] } +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/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860", features = ["fuzzing"] } diff --git a/testsuite/diem-fuzzer/README.md b/testsuite/aptos-fuzzer/README.md similarity index 87% rename from testsuite/diem-fuzzer/README.md rename to testsuite/aptos-fuzzer/README.md index 3a73b28ef0e0f..4baa36d3c961e 100644 --- a/testsuite/diem-fuzzer/README.md +++ b/testsuite/aptos-fuzzer/README.md @@ -11,21 +11,21 @@ Install [`cargo-fuzz`](https://rust-fuzz.github.io/book/cargo-fuzz.html) if not ### Fuzzing a target -First, switch to the directory this README is in: `cd testsuite/diem-fuzzer`. +First, switch to the directory this README is in: `cd testsuite/aptos-fuzzer`. -To list out known fuzz targets, run `cargo run --bin diem-fuzzer list`. +To list out known fuzz targets, run `cargo run --bin aptos-fuzzer list`. To be effective, fuzzing requires a corpus of existing inputs. This crate contains support for generating corpuses with `proptest`. Generate -a corpus with `cargo run --bin diem-fuzzer generate `. +a corpus with `cargo run --bin aptos-fuzzer generate `. Once a corpus has been generated, the fuzzer is ready to use, simply run: ``` -RUSTC_BOOTSTRAP=1 cargo run --bin diem-fuzzer --release fuzz +RUSTC_BOOTSTRAP=1 cargo run --bin aptos-fuzzer --release fuzz ``` -For more options, run `cargo run --bin diem-fuzzer -- --help`. Note that `RUSTC_BOOTSTRAP=1` is +For more options, run `cargo run --bin aptos-fuzzer -- --help`. Note that `RUSTC_BOOTSTRAP=1` is required as `cargo fuzz` uses unstable compiler flags. ### Adding a new target @@ -36,7 +36,7 @@ creating a new type and implementing `FuzzTargetImpl` for it. For examples, see the existing implementations in `src/fuzz_targets/`. Remember to add your target to `ALL_TARGETS` in `src/fuzz_targets.rs`. -Once that has been done, `cargo run --bin diem-fuzzer list` should list your new target. +Once that has been done, `cargo run --bin aptos-fuzzer list` should list your new target. ### Debugging and testing artifacts @@ -86,7 +86,7 @@ See [Google OSS-Fuzz's documentation on reproducing bugs](https://google.github. To obtain a flamegraph of a harness test, run the following command: ```sh -FUZZ_TARGET=compiled_module cargo flamegraph -p diem-fuzzer --bin flamegraph +FUZZ_TARGET=compiled_module cargo flamegraph -p aptos-fuzzer --bin flamegraph ``` It is good to first generate some corpus and run the fuzzer over it for a bit (to find new corpus). The larger corpus, the better flamegraph you will obtain. @@ -96,7 +96,7 @@ It is good to first generate some corpus and run the fuzzer over it for a bit (t To test coverage of our fuzzers you can run the following command with [grcov](https://github.com/mozilla/grcov): ```sh -RUSTFLAGS='--cfg feature="fuzzing"' CORPUS_PATH=fuzz/corpus cargo xtest --html-cov-dir -p diem-fuzzer -- --test-threads 1 --ignored coverage +RUSTFLAGS='--cfg feature="fuzzing"' CORPUS_PATH=fuzz/corpus cargo xtest --html-cov-dir -p aptos-fuzzer -- --test-threads 1 --ignored coverage ``` ### Building a single fuzzer @@ -108,7 +108,7 @@ For this, build.rs can create a fuzzer binary based on an environement variable. Use it as such: ```sh -cd diem/testsuite/diem-fuzzer +cd diem/testsuite/aptos-fuzzer fuzz/google-oss-fuzz/build_fuzzer.sh ConsensusProposal . ./ConsensusProposal ``` @@ -131,7 +131,7 @@ sudo xcode-select -s /Applications/Xcode_X.Y.Z.app If you get a linker error like ```sh -$ RUSTC_BOOTSTRAP=1 cargo run --bin diem-fuzzer --release fuzz +$ RUSTC_BOOTSTRAP=1 cargo run --bin aptos-fuzzer --release fuzz # ... error: linking with `cc` failed: exit code: 1 | diff --git a/testsuite/diem-fuzzer/artifacts/CompiledModuleTarget/crash-5d65cfbc b/testsuite/aptos-fuzzer/artifacts/CompiledModuleTarget/crash-5d65cfbc similarity index 100% rename from testsuite/diem-fuzzer/artifacts/CompiledModuleTarget/crash-5d65cfbc rename to testsuite/aptos-fuzzer/artifacts/CompiledModuleTarget/crash-5d65cfbc diff --git a/testsuite/diem-fuzzer/artifacts/CompiledModuleTarget/oom-54725f11 b/testsuite/aptos-fuzzer/artifacts/CompiledModuleTarget/oom-54725f11 similarity index 100% rename from testsuite/diem-fuzzer/artifacts/CompiledModuleTarget/oom-54725f11 rename to testsuite/aptos-fuzzer/artifacts/CompiledModuleTarget/oom-54725f11 diff --git a/testsuite/diem-fuzzer/artifacts/ConsensusProposal/crash-34c5631cb9944549796a14547cef7223a6ab78d6 b/testsuite/aptos-fuzzer/artifacts/ConsensusProposal/crash-34c5631cb9944549796a14547cef7223a6ab78d6 similarity index 100% rename from testsuite/diem-fuzzer/artifacts/ConsensusProposal/crash-34c5631cb9944549796a14547cef7223a6ab78d6 rename to testsuite/aptos-fuzzer/artifacts/ConsensusProposal/crash-34c5631cb9944549796a14547cef7223a6ab78d6 diff --git a/testsuite/diem-fuzzer/artifacts/ValueTarget/crash-7619620b59914850df844994de43e3d10684f2b6 b/testsuite/aptos-fuzzer/artifacts/ValueTarget/crash-7619620b59914850df844994de43e3d10684f2b6 similarity index 100% rename from testsuite/diem-fuzzer/artifacts/ValueTarget/crash-7619620b59914850df844994de43e3d10684f2b6 rename to testsuite/aptos-fuzzer/artifacts/ValueTarget/crash-7619620b59914850df844994de43e3d10684f2b6 diff --git a/testsuite/diem-fuzzer/artifacts/ValueTarget/oom-9761fc3aeea49b5f4420ff159ca3f8a6fb0502d0 b/testsuite/aptos-fuzzer/artifacts/ValueTarget/oom-9761fc3aeea49b5f4420ff159ca3f8a6fb0502d0 similarity index 100% rename from testsuite/diem-fuzzer/artifacts/ValueTarget/oom-9761fc3aeea49b5f4420ff159ca3f8a6fb0502d0 rename to testsuite/aptos-fuzzer/artifacts/ValueTarget/oom-9761fc3aeea49b5f4420ff159ca3f8a6fb0502d0 diff --git a/testsuite/diem-fuzzer/artifacts/ValueTarget/oom-ce8ba3d1 b/testsuite/aptos-fuzzer/artifacts/ValueTarget/oom-ce8ba3d1 similarity index 100% rename from testsuite/diem-fuzzer/artifacts/ValueTarget/oom-ce8ba3d1 rename to testsuite/aptos-fuzzer/artifacts/ValueTarget/oom-ce8ba3d1 diff --git a/testsuite/diem-fuzzer/artifacts/VaultTransitExportResponse/insufficient_key_len_slicing_error b/testsuite/aptos-fuzzer/artifacts/VaultTransitExportResponse/insufficient_key_len_slicing_error similarity index 100% rename from testsuite/diem-fuzzer/artifacts/VaultTransitExportResponse/insufficient_key_len_slicing_error rename to testsuite/aptos-fuzzer/artifacts/VaultTransitExportResponse/insufficient_key_len_slicing_error diff --git a/testsuite/diem-fuzzer/fuzz/.gitignore b/testsuite/aptos-fuzzer/fuzz/.gitignore similarity index 100% rename from testsuite/diem-fuzzer/fuzz/.gitignore rename to testsuite/aptos-fuzzer/fuzz/.gitignore diff --git a/testsuite/diem-fuzzer/fuzz/Cargo.toml b/testsuite/aptos-fuzzer/fuzz/Cargo.toml similarity index 81% rename from testsuite/diem-fuzzer/fuzz/Cargo.toml rename to testsuite/aptos-fuzzer/fuzz/Cargo.toml index a80846d83bcc1..c1f4fb6e37585 100644 --- a/testsuite/diem-fuzzer/fuzz/Cargo.toml +++ b/testsuite/aptos-fuzzer/fuzz/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "diem-fuzz" +name = "aptos-fuzz" version = "0.1.0" edition = "2018" authors = ["Diem Association "] @@ -14,8 +14,8 @@ cargo-fuzz = true [dependencies] libfuzzer-sys = "=0.3.2" -diem-fuzzer = { path = ".." } -diem-workspace-hack = { version = "0.1", path = "../../../crates/diem-workspace-hack" } +aptos-fuzzer = { path = ".." } +aptos-workspace-hack = { version = "0.1", path = "../../../crates/aptos-workspace-hack" } once_cell = "1.7.2" # Prevent this from interfering with workspaces diff --git a/testsuite/diem-fuzzer/fuzz/build.rs b/testsuite/aptos-fuzzer/fuzz/build.rs similarity index 100% rename from testsuite/diem-fuzzer/fuzz/build.rs rename to testsuite/aptos-fuzzer/fuzz/build.rs diff --git a/testsuite/diem-fuzzer/fuzz/fuzz_targets/fuzz_runner.rs b/testsuite/aptos-fuzzer/fuzz/fuzz_targets/fuzz_runner.rs similarity index 95% rename from testsuite/diem-fuzzer/fuzz/fuzz_targets/fuzz_runner.rs rename to testsuite/aptos-fuzzer/fuzz/fuzz_targets/fuzz_runner.rs index 5b219bb137cc8..f6b7c56bdc3e5 100644 --- a/testsuite/diem-fuzzer/fuzz/fuzz_targets/fuzz_runner.rs +++ b/testsuite/aptos-fuzzer/fuzz/fuzz_targets/fuzz_runner.rs @@ -3,7 +3,7 @@ #![no_main] -use diem_fuzzer::FuzzTarget; +use aptos_fuzzer::FuzzTarget; use libfuzzer_sys::fuzz_target; use once_cell::sync::Lazy; use std::process; diff --git a/testsuite/diem-fuzzer/fuzz/google-oss-fuzz/build.sh b/testsuite/aptos-fuzzer/fuzz/google-oss-fuzz/build.sh similarity index 87% rename from testsuite/diem-fuzzer/fuzz/google-oss-fuzz/build.sh rename to testsuite/aptos-fuzzer/fuzz/google-oss-fuzz/build.sh index a72be2c3efde9..06ba7c1297906 100755 --- a/testsuite/diem-fuzzer/fuzz/google-oss-fuzz/build.sh +++ b/testsuite/aptos-fuzzer/fuzz/google-oss-fuzz/build.sh @@ -3,7 +3,7 @@ # SPDX-License-Identifier: Apache-2.0 # This build script is used with Google OSS-Fuzz to build fuzzer with their docker container. -# It must be called from diem/testsuite/diem-fuzzer +# It must be called from diem/testsuite/aptos-fuzzer # usage: OUT=out_dir ./build.sh # recipe: @@ -16,7 +16,7 @@ cargo fetch # 1. list fuzzers -cargo run --bin diem-fuzzer list --no-desc > fuzzer_list +cargo run --bin aptos-fuzzer list --no-desc > fuzzer_list # 2. build corpus and move to $OUT cat fuzzer_list | while read -r line diff --git a/testsuite/diem-fuzzer/fuzz/google-oss-fuzz/build_corpus.sh b/testsuite/aptos-fuzzer/fuzz/google-oss-fuzz/build_corpus.sh similarity index 86% rename from testsuite/diem-fuzzer/fuzz/google-oss-fuzz/build_corpus.sh rename to testsuite/aptos-fuzzer/fuzz/google-oss-fuzz/build_corpus.sh index 72e6f3d7bad78..0a0490a69393d 100755 --- a/testsuite/diem-fuzzer/fuzz/google-oss-fuzz/build_corpus.sh +++ b/testsuite/aptos-fuzzer/fuzz/google-oss-fuzz/build_corpus.sh @@ -8,6 +8,6 @@ export SINGLE_FUZZ_TARGET="$1" export OUT_DIR="$2" -cargo run --bin diem-fuzzer generate -n 128 $SINGLE_FUZZ_TARGET +cargo run --bin aptos-fuzzer generate -n 128 $SINGLE_FUZZ_TARGET zip -r $OUT_DIR/"$SINGLE_FUZZ_TARGET"_seed_corpus.zip fuzz/corpus/$SINGLE_FUZZ_TARGET rm -r fuzz/corpus/$SINGLE_FUZZ_TARGET diff --git a/testsuite/diem-fuzzer/fuzz/google-oss-fuzz/build_fuzzer.sh b/testsuite/aptos-fuzzer/fuzz/google-oss-fuzz/build_fuzzer.sh similarity index 100% rename from testsuite/diem-fuzzer/fuzz/google-oss-fuzz/build_fuzzer.sh rename to testsuite/aptos-fuzzer/fuzz/google-oss-fuzz/build_fuzzer.sh diff --git a/testsuite/diem-fuzzer/fuzz/google-oss-fuzz/fuzzer_builder.rs b/testsuite/aptos-fuzzer/fuzz/google-oss-fuzz/fuzzer_builder.rs similarity index 91% rename from testsuite/diem-fuzzer/fuzz/google-oss-fuzz/fuzzer_builder.rs rename to testsuite/aptos-fuzzer/fuzz/google-oss-fuzz/fuzzer_builder.rs index 4c6d131cbbe85..98840bdeff712 100755 --- a/testsuite/diem-fuzzer/fuzz/google-oss-fuzz/fuzzer_builder.rs +++ b/testsuite/aptos-fuzzer/fuzz/google-oss-fuzz/fuzzer_builder.rs @@ -3,7 +3,7 @@ #![no_main] -use diem_fuzzer::FuzzTarget; +use aptos_fuzzer::FuzzTarget; use libfuzzer_sys::fuzz_target; // contains FUZZ_TARGET diff --git a/testsuite/aptos-fuzzer/lsan_suppressions.txt b/testsuite/aptos-fuzzer/lsan_suppressions.txt new file mode 100644 index 0000000000000..db7b498f77c68 --- /dev/null +++ b/testsuite/aptos-fuzzer/lsan_suppressions.txt @@ -0,0 +1,3 @@ +leak:lazy_static +leak:backtrace +leak:aptos_mempool::tests::mocks::MockSharedMempool diff --git a/testsuite/diem-fuzzer/src/bin/flamegraph.rs b/testsuite/aptos-fuzzer/src/bin/flamegraph.rs similarity index 97% rename from testsuite/diem-fuzzer/src/bin/flamegraph.rs rename to testsuite/aptos-fuzzer/src/bin/flamegraph.rs index c785e9f326de6..6bd2818fd37b6 100644 --- a/testsuite/diem-fuzzer/src/bin/flamegraph.rs +++ b/testsuite/aptos-fuzzer/src/bin/flamegraph.rs @@ -1,7 +1,7 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_fuzzer::FuzzTarget; +use aptos_fuzzer::FuzzTarget; use std::{env, fs, path::PathBuf}; // diff --git a/testsuite/diem-fuzzer/src/bin/investigate.rs b/testsuite/aptos-fuzzer/src/bin/investigate.rs similarity index 97% rename from testsuite/diem-fuzzer/src/bin/investigate.rs rename to testsuite/aptos-fuzzer/src/bin/investigate.rs index 54623228e2788..6af9f123ed677 100644 --- a/testsuite/diem-fuzzer/src/bin/investigate.rs +++ b/testsuite/aptos-fuzzer/src/bin/investigate.rs @@ -1,7 +1,7 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_fuzzer::FuzzTarget; +use aptos_fuzzer::FuzzTarget; use std::{fs, path::PathBuf}; use structopt::StructOpt; diff --git a/testsuite/diem-fuzzer/src/commands.rs b/testsuite/aptos-fuzzer/src/commands.rs similarity index 98% rename from testsuite/diem-fuzzer/src/commands.rs rename to testsuite/aptos-fuzzer/src/commands.rs index fd58e017e342f..1d53bb996cfe6 100644 --- a/testsuite/diem-fuzzer/src/commands.rs +++ b/testsuite/aptos-fuzzer/src/commands.rs @@ -3,7 +3,7 @@ use crate::FuzzTarget; use anyhow::{bail, format_err, Context, Result}; -use diem_proptest_helpers::ValueGenerator; +use aptos_proptest_helpers::ValueGenerator; use sha1::{Digest, Sha1}; use std::{ env, diff --git a/testsuite/diem-fuzzer/src/coverage.rs b/testsuite/aptos-fuzzer/src/coverage.rs similarity index 100% rename from testsuite/diem-fuzzer/src/coverage.rs rename to testsuite/aptos-fuzzer/src/coverage.rs diff --git a/testsuite/diem-fuzzer/src/fuzz_targets.rs b/testsuite/aptos-fuzzer/src/fuzz_targets.rs similarity index 100% rename from testsuite/diem-fuzzer/src/fuzz_targets.rs rename to testsuite/aptos-fuzzer/src/fuzz_targets.rs diff --git a/testsuite/diem-fuzzer/src/fuzz_targets/consensus.rs b/testsuite/aptos-fuzzer/src/fuzz_targets/consensus.rs similarity index 93% rename from testsuite/diem-fuzzer/src/fuzz_targets/consensus.rs rename to testsuite/aptos-fuzzer/src/fuzz_targets/consensus.rs index d6fa2ef085b5a..63e6e59ef4722 100644 --- a/testsuite/diem-fuzzer/src/fuzz_targets/consensus.rs +++ b/testsuite/aptos-fuzzer/src/fuzz_targets/consensus.rs @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 use crate::FuzzTargetImpl; +use aptos_proptest_helpers::ValueGenerator; use consensus::round_manager_fuzzing::{fuzz_proposal, generate_corpus_proposal}; -use diem_proptest_helpers::ValueGenerator; #[derive(Clone, Debug, Default)] pub struct ConsensusProposal; diff --git a/testsuite/diem-fuzzer/src/fuzz_targets/executor.rs b/testsuite/aptos-fuzzer/src/fuzz_targets/executor.rs similarity index 96% rename from testsuite/diem-fuzzer/src/fuzz_targets/executor.rs rename to testsuite/aptos-fuzzer/src/fuzz_targets/executor.rs index 7970ff7e47bda..41d7211f05dc5 100644 --- a/testsuite/diem-fuzzer/src/fuzz_targets/executor.rs +++ b/testsuite/aptos-fuzzer/src/fuzz_targets/executor.rs @@ -2,9 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 use crate::{corpus_from_strategy, fuzz_data_to_value, FuzzTargetImpl}; -use diem_crypto::HashValue; -use diem_proptest_helpers::ValueGenerator; -use diem_types::{ +use aptos_crypto::HashValue; +use aptos_proptest_helpers::ValueGenerator; +use aptos_types::{ ledger_info::LedgerInfoWithSignatures, transaction::{Transaction, TransactionListWithProof}, }; diff --git a/testsuite/diem-fuzzer/src/fuzz_targets/mempool.rs b/testsuite/aptos-fuzzer/src/fuzz_targets/mempool.rs similarity index 92% rename from testsuite/diem-fuzzer/src/fuzz_targets/mempool.rs rename to testsuite/aptos-fuzzer/src/fuzz_targets/mempool.rs index 684484542502d..070ca34fadf6a 100644 --- a/testsuite/diem-fuzzer/src/fuzz_targets/mempool.rs +++ b/testsuite/aptos-fuzzer/src/fuzz_targets/mempool.rs @@ -2,10 +2,10 @@ // SPDX-License-Identifier: Apache-2.0 use crate::{corpus_from_strategy, fuzz_data_to_value, FuzzTargetImpl}; -use diem_mempool::fuzzing::{ +use aptos_mempool::fuzzing::{ mempool_incoming_transactions_strategy, test_mempool_process_incoming_transactions_impl, }; -use diem_proptest_helpers::ValueGenerator; +use aptos_proptest_helpers::ValueGenerator; #[derive(Debug, Default)] pub struct MempoolIncomingTransactions; diff --git a/testsuite/diem-fuzzer/src/fuzz_targets/move_vm.rs b/testsuite/aptos-fuzzer/src/fuzz_targets/move_vm.rs similarity index 98% rename from testsuite/diem-fuzzer/src/fuzz_targets/move_vm.rs rename to testsuite/aptos-fuzzer/src/fuzz_targets/move_vm.rs index bc93620ece667..ebd678f56b247 100644 --- a/testsuite/diem-fuzzer/src/fuzz_targets/move_vm.rs +++ b/testsuite/aptos-fuzzer/src/fuzz_targets/move_vm.rs @@ -3,8 +3,8 @@ use crate::FuzzTargetImpl; use anyhow::{bail, Result}; +use aptos_proptest_helpers::ValueGenerator; use byteorder::{BigEndian, ReadBytesExt, WriteBytesExt}; -use diem_proptest_helpers::ValueGenerator; use move_core_types::value::{MoveStructLayout, MoveTypeLayout}; use move_vm_types::values::{prop::layout_and_value_strategy, Value}; use std::io::Cursor; diff --git a/testsuite/diem-fuzzer/src/fuzz_targets/network.rs b/testsuite/aptos-fuzzer/src/fuzz_targets/network.rs similarity index 98% rename from testsuite/diem-fuzzer/src/fuzz_targets/network.rs rename to testsuite/aptos-fuzzer/src/fuzz_targets/network.rs index a2967a477b934..5c0e0a058a42f 100644 --- a/testsuite/diem-fuzzer/src/fuzz_targets/network.rs +++ b/testsuite/aptos-fuzzer/src/fuzz_targets/network.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 use crate::{corpus_from_strategy, fuzz_data_to_value, FuzzTargetImpl}; -use diem_proptest_helpers::ValueGenerator; +use aptos_proptest_helpers::ValueGenerator; // // Noise wrapper diff --git a/testsuite/diem-fuzzer/src/fuzz_targets/proof.rs b/testsuite/aptos-fuzzer/src/fuzz_targets/proof.rs similarity index 98% rename from testsuite/diem-fuzzer/src/fuzz_targets/proof.rs rename to testsuite/aptos-fuzzer/src/fuzz_targets/proof.rs index 8855cd8349e62..f2717cbeff973 100644 --- a/testsuite/diem-fuzzer/src/fuzz_targets/proof.rs +++ b/testsuite/aptos-fuzzer/src/fuzz_targets/proof.rs @@ -2,9 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 use crate::{corpus_from_strategy, fuzz_data_to_value, FuzzTargetImpl}; -use diem_crypto::HashValue; -use diem_proptest_helpers::ValueGenerator; -use diem_types::{ +use aptos_crypto::HashValue; +use aptos_proptest_helpers::ValueGenerator; +use aptos_types::{ account_state_blob::AccountStateBlob, ledger_info::LedgerInfo, proof::{ diff --git a/testsuite/diem-fuzzer/src/fuzz_targets/safety_rules.rs b/testsuite/aptos-fuzzer/src/fuzz_targets/safety_rules.rs similarity index 98% rename from testsuite/diem-fuzzer/src/fuzz_targets/safety_rules.rs rename to testsuite/aptos-fuzzer/src/fuzz_targets/safety_rules.rs index 78dd2d2bb4480..ef4f9f1151e11 100644 --- a/testsuite/diem-fuzzer/src/fuzz_targets/safety_rules.rs +++ b/testsuite/aptos-fuzzer/src/fuzz_targets/safety_rules.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 use crate::{corpus_from_strategy, fuzz_data_to_value, FuzzTargetImpl}; -use diem_proptest_helpers::ValueGenerator; +use aptos_proptest_helpers::ValueGenerator; use safety_rules::fuzzing_utils::{ arb_block_data, arb_epoch_change_proof, arb_maybe_signed_vote_proposal, arb_safety_rules_input, arb_timeout, diff --git a/testsuite/diem-fuzzer/src/fuzz_targets/secure_storage_vault.rs b/testsuite/aptos-fuzzer/src/fuzz_targets/secure_storage_vault.rs similarity index 99% rename from testsuite/diem-fuzzer/src/fuzz_targets/secure_storage_vault.rs rename to testsuite/aptos-fuzzer/src/fuzz_targets/secure_storage_vault.rs index 381b8bf65ddb6..9a4d56f329a65 100644 --- a/testsuite/diem-fuzzer/src/fuzz_targets/secure_storage_vault.rs +++ b/testsuite/aptos-fuzzer/src/fuzz_targets/secure_storage_vault.rs @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 use crate::{corpus_from_strategy, fuzz_data_to_value, FuzzTargetImpl}; -use diem_proptest_helpers::ValueGenerator; -use diem_vault_client::{ +use aptos_proptest_helpers::ValueGenerator; +use aptos_vault_client::{ fuzzing::{ arb_generic_response, arb_policy_list_response, arb_secret_list_response, arb_secret_read_response, arb_token_create_response, arb_token_renew_response, diff --git a/testsuite/diem-fuzzer/src/fuzz_targets/state_sync.rs b/testsuite/aptos-fuzzer/src/fuzz_targets/state_sync.rs similarity index 94% rename from testsuite/diem-fuzzer/src/fuzz_targets/state_sync.rs rename to testsuite/aptos-fuzzer/src/fuzz_targets/state_sync.rs index 891fe1f4bb8d6..0f8e34a877b82 100644 --- a/testsuite/diem-fuzzer/src/fuzz_targets/state_sync.rs +++ b/testsuite/aptos-fuzzer/src/fuzz_targets/state_sync.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 use crate::{corpus_from_strategy, fuzz_data_to_value, FuzzTargetImpl}; -use diem_proptest_helpers::ValueGenerator; +use aptos_proptest_helpers::ValueGenerator; use state_sync_v1::fuzzing::{arb_state_sync_msg, test_state_sync_msg_fuzzer_impl}; #[derive(Debug, Default)] diff --git a/testsuite/diem-fuzzer/src/fuzz_targets/storage.rs b/testsuite/aptos-fuzzer/src/fuzz_targets/storage.rs similarity index 97% rename from testsuite/diem-fuzzer/src/fuzz_targets/storage.rs rename to testsuite/aptos-fuzzer/src/fuzz_targets/storage.rs index 9ba46d22c1b3d..009baf33d6cf7 100644 --- a/testsuite/diem-fuzzer/src/fuzz_targets/storage.rs +++ b/testsuite/aptos-fuzzer/src/fuzz_targets/storage.rs @@ -7,15 +7,15 @@ use accumulator::test_helpers::{ test_append_empty_impl, test_append_many_impl, test_consistency_proof_impl, test_get_frozen_subtree_hashes_impl, test_proof_impl, test_range_proof_impl, }; -use diem_crypto::HashValue; -use diem_jellyfish_merkle::test_helper::{ +use aptos_crypto::HashValue; +use aptos_jellyfish_merkle::test_helper::{ arb_existent_kvs_and_nonexistent_keys, arb_kv_pair_with_distinct_last_nibble, arb_tree_with_index, test_get_leaf_count, test_get_range_proof, test_get_with_proof, test_get_with_proof_with_distinct_last_nibble, }; -use diem_proptest_helpers::ValueGenerator; -use diem_types::account_state_blob::AccountStateBlob; -use diemdb::{ +use aptos_proptest_helpers::ValueGenerator; +use aptos_types::account_state_blob::AccountStateBlob; +use aptosdb::{ schema::fuzzing::fuzz_decode, test_helper::arb_blocks_to_commit, test_save_blocks_impl, }; use proptest::{ diff --git a/testsuite/diem-fuzzer/src/fuzz_targets/transaction.rs b/testsuite/aptos-fuzzer/src/fuzz_targets/transaction.rs similarity index 98% rename from testsuite/diem-fuzzer/src/fuzz_targets/transaction.rs rename to testsuite/aptos-fuzzer/src/fuzz_targets/transaction.rs index bd67a501aa7b6..b07525285851b 100644 --- a/testsuite/diem-fuzzer/src/fuzz_targets/transaction.rs +++ b/testsuite/aptos-fuzzer/src/fuzz_targets/transaction.rs @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 use crate::{corpus_from_strategy, fuzz_data_to_value, FuzzTargetImpl}; -use diem_proptest_helpers::ValueGenerator; -use diem_types::transaction::SignedTransaction; +use aptos_proptest_helpers::ValueGenerator; +use aptos_types::transaction::SignedTransaction; use language_e2e_tests::account_universe::{ all_transactions_strategy, log_balance_strategy, run_and_assert_universe, AUTransactionGen, AccountUniverseGen, diff --git a/testsuite/diem-fuzzer/src/fuzz_targets/vm.rs b/testsuite/aptos-fuzzer/src/fuzz_targets/vm.rs similarity index 95% rename from testsuite/diem-fuzzer/src/fuzz_targets/vm.rs rename to testsuite/aptos-fuzzer/src/fuzz_targets/vm.rs index 6dd32ebe331d2..eb02d518e787e 100644 --- a/testsuite/diem-fuzzer/src/fuzz_targets/vm.rs +++ b/testsuite/aptos-fuzzer/src/fuzz_targets/vm.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 use crate::FuzzTargetImpl; -use diem_proptest_helpers::ValueGenerator; +use aptos_proptest_helpers::ValueGenerator; use move_binary_format::file_format::CompiledModule; use proptest::prelude::*; diff --git a/testsuite/diem-fuzzer/src/lib.rs b/testsuite/aptos-fuzzer/src/lib.rs similarity index 98% rename from testsuite/diem-fuzzer/src/lib.rs rename to testsuite/aptos-fuzzer/src/lib.rs index c5081efa785f1..bd7d71e8ca6cf 100644 --- a/testsuite/diem-fuzzer/src/lib.rs +++ b/testsuite/aptos-fuzzer/src/lib.rs @@ -1,7 +1,7 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_proptest_helpers::ValueGenerator; +use aptos_proptest_helpers::ValueGenerator; use proptest::{ strategy::{Strategy, ValueTree}, test_runner::{self, RngAlgorithm, TestRunner}, diff --git a/testsuite/diem-fuzzer/src/main.rs b/testsuite/aptos-fuzzer/src/main.rs similarity index 99% rename from testsuite/diem-fuzzer/src/main.rs rename to testsuite/aptos-fuzzer/src/main.rs index bde05eb621651..2ccba74c003a6 100644 --- a/testsuite/diem-fuzzer/src/main.rs +++ b/testsuite/aptos-fuzzer/src/main.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 //! Helpers for fuzz testing. -use diem_fuzzer::{commands, FuzzTarget}; +use aptos_fuzzer::{commands, FuzzTarget}; use once_cell::sync::Lazy; use std::{env, ffi::OsString, fs, path::PathBuf}; use structopt::StructOpt; diff --git a/testsuite/diem-fuzzer/tests/artifacts.rs b/testsuite/aptos-fuzzer/tests/artifacts.rs similarity index 98% rename from testsuite/diem-fuzzer/tests/artifacts.rs rename to testsuite/aptos-fuzzer/tests/artifacts.rs index 4a2546e784929..18cf1efab7d26 100644 --- a/testsuite/diem-fuzzer/tests/artifacts.rs +++ b/testsuite/aptos-fuzzer/tests/artifacts.rs @@ -3,7 +3,7 @@ //! Test artifacts: examples known to have crashed in the past. -use diem_fuzzer::FuzzTarget; +use aptos_fuzzer::FuzzTarget; use rusty_fork::{fork, rusty_fork_id}; use stats_alloc::{Region, StatsAlloc, INSTRUMENTED_SYSTEM}; use std::{alloc::System, env, fs, path::Path}; diff --git a/testsuite/diem-fuzzer/lsan_suppressions.txt b/testsuite/diem-fuzzer/lsan_suppressions.txt deleted file mode 100644 index ba753fa07df52..0000000000000 --- a/testsuite/diem-fuzzer/lsan_suppressions.txt +++ /dev/null @@ -1,3 +0,0 @@ -leak:lazy_static -leak:backtrace -leak:diem_mempool::tests::mocks::MockSharedMempool diff --git a/testsuite/forge-cli/Cargo.toml b/testsuite/forge-cli/Cargo.toml index c48ce14469052..74a899b435e46 100644 --- a/testsuite/forge-cli/Cargo.toml +++ b/testsuite/forge-cli/Cargo.toml @@ -11,8 +11,8 @@ edition = "2018" [dependencies] anyhow = { version = "1.0.52", features = ["backtrace"] } -diem-sdk = { path = "../../sdk" } -diem-rest-client = { path = "../../crates/diem-rest-client"} +aptos-sdk = { path = "../../sdk" } +aptos-rest-client = { path = "../../crates/aptos-rest-client"} forge = { path = "../forge" } itertools = "0.10.0" rand_core = "0.6.2" @@ -20,7 +20,7 @@ structopt = "0.3.21" tokio = { version = "1.8.1", features = ["full"] } testcases = { path = "../testcases" } url = "2.2.2" -diem-workspace-hack = { version = "0.1", path = "../../crates/diem-workspace-hack" } +aptos-workspace-hack = { version = "0.1", path = "../../crates/aptos-workspace-hack" } [[bin]] name = "forge" diff --git a/testsuite/forge-cli/src/main.rs b/testsuite/forge-cli/src/main.rs index ab209fc4aff85..0eeb89e16b46d 100644 --- a/testsuite/forge-cli/src/main.rs +++ b/testsuite/forge-cli/src/main.rs @@ -1,8 +1,8 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_rest_client::Client as RestClient; -use diem_sdk::{move_types::account_address::AccountAddress, transaction_builder::Currency}; +use aptos_rest_client::Client as RestClient; +use aptos_sdk::{move_types::account_address::AccountAddress, transaction_builder::Currency}; use forge::{ForgeConfig, Options, Result, *}; use std::{env, num::NonZeroUsize, process, time::Duration}; use structopt::StructOpt; diff --git a/testsuite/forge/Cargo.toml b/testsuite/forge/Cargo.toml index f6dd35fdd7c96..c97fba278e3eb 100644 --- a/testsuite/forge/Cargo.toml +++ b/testsuite/forge/Cargo.toml @@ -38,14 +38,14 @@ tokio = { version = "1.8.1", features = ["full"] } url = "2.2.2" debug-interface = { path = "../../crates/debug-interface" } -diem-config = { path = "../../config" } -diem-framework-releases = { path = "../../diem-move/diem-framework/DPN/releases" } -diem-genesis-tool = { path = "../../config/management/genesis" } -diem-logger = { path = "../../crates/diem-logger" } -diem-retrier = { path = "../../crates/diem-retrier" } -diem-sdk = { path = "../../sdk" } -diem-rest-client = { path = "../../crates/diem-rest-client"} -diem-secure-storage = { path = "../../secure/storage" } -diem-transaction-builder = { path = "../../sdk/transaction-builder" } -diem-workspace-hack = { version = "0.1", path = "../../crates/diem-workspace-hack" } +aptos-config = { path = "../../config" } +diem-framework-releases = { path = "../../aptos-move/diem-framework/DPN/releases" } +aptos-genesis-tool = { path = "../../config/management/genesis" } +aptos-logger = { path = "../../crates/aptos-logger" } +aptos-retrier = { path = "../../crates/aptos-retrier" } +aptos-sdk = { path = "../../sdk" } +aptos-rest-client = { path = "../../crates/aptos-rest-client"} +aptos-secure-storage = { path = "../../secure/storage" } +aptos-transaction-builder = { path = "../../sdk/transaction-builder" } +aptos-workspace-hack = { version = "0.1", path = "../../crates/aptos-workspace-hack" } transaction-emitter = { path = "../../crates/transaction-emitter" } diff --git a/testsuite/forge/src/backend/k8s/cluster_helper.rs b/testsuite/forge/src/backend/k8s/cluster_helper.rs index 7d437075389b6..47e81a5062c5b 100644 --- a/testsuite/forge/src/backend/k8s/cluster_helper.rs +++ b/testsuite/forge/src/backend/k8s/cluster_helper.rs @@ -3,7 +3,7 @@ use crate::{get_validators, k8s_retry_strategy, nodes_healthcheck, Result}; use anyhow::{bail, format_err}; -use diem_logger::*; +use aptos_logger::*; use futures::future::try_join_all; use hyper::{Client, Uri}; use hyper_proxy::{Intercept, Proxy, ProxyConnector}; @@ -41,10 +41,10 @@ const TRUSTED_SCALING_FACTOR: i64 = 1; const GENESIS_MODULES_DIR: &str = "/diem/move/modules"; async fn wait_genesis_job(kube_client: &K8sClient, era: &str) -> Result<()> { - diem_retrier::retry_async(k8s_retry_strategy(), || { + aptos_retrier::retry_async(k8s_retry_strategy(), || { let jobs: Api = Api::namespaced(kube_client.clone(), "default"); Box::pin(async move { - let job_name = format!("diem-testnet-genesis-e{}", era); + let job_name = format!("aptos-testnet-genesis-e{}", era); debug!("Running get job: {}", &job_name); let genesis_job = jobs.get_status(&job_name).await.unwrap(); debug!("Status: {:?}", genesis_job.status); @@ -67,7 +67,7 @@ async fn nodegroup_state_check(desire_size: i64) -> Result<()> { return Ok(()); } - diem_retrier::retry_async(k8s_retry_strategy(), || { + aptos_retrier::retry_async(k8s_retry_strategy(), || { Box::pin(async move { let status_args = ["get", "nodes"]; let raw_nodegroup_values = Command::new(KUBECTL_BIN) @@ -181,7 +181,7 @@ fn upgrade_helm_release(release_name: &str, helm_chart: &str, options: &[&str]) fn upgrade_validator(validator_name: &str, helm_repo: &str, options: &[&str]) -> Result<()> { upgrade_helm_release( validator_name, - &format!("{}/diem-validator", helm_repo), + &format!("{}/aptos-validator", helm_repo), options, ) } @@ -373,7 +373,7 @@ fn era_to_string(era_value: &Value) -> Result { pub async fn create_k8s_client() -> K8sClient { let _ = Command::new(KUBECTL_BIN).arg("proxy").spawn(); - let _ = diem_retrier::retry_async(k8s_retry_strategy(), || { + let _ = aptos_retrier::retry_async(k8s_retry_strategy(), || { Box::pin(async move { debug!("Running local kube pod healthcheck on {}", HEALTH_CHECK_URL); reqwest::get(HEALTH_CHECK_URL).await?.text().await?; @@ -558,7 +558,7 @@ async fn describe_update( nodegroup_name: String, update_id: String, ) -> Result<()> { - diem_retrier::retry_async(k8s_retry_strategy(), || { + aptos_retrier::retry_async(k8s_retry_strategy(), || { let client = eks_client.clone(); let nodegroup_name = nodegroup_name.clone(); let update_id = update_id.clone(); diff --git a/testsuite/forge/src/backend/k8s/mod.rs b/testsuite/forge/src/backend/k8s/mod.rs index 8dcec5938196f..84e169b04532e 100644 --- a/testsuite/forge/src/backend/k8s/mod.rs +++ b/testsuite/forge/src/backend/k8s/mod.rs @@ -15,8 +15,8 @@ pub use cluster_helper::*; pub use node::K8sNode; pub use swarm::*; -use diem_sdk::crypto::ed25519::ED25519_PRIVATE_KEY_LENGTH; -use diem_secure_storage::{CryptoStorage, KVStorage, VaultStorage}; +use aptos_sdk::crypto::ed25519::ED25519_PRIVATE_KEY_LENGTH; +use aptos_secure_storage::{CryptoStorage, KVStorage, VaultStorage}; pub struct K8sFactory { root_key: [u8; ED25519_PRIVATE_KEY_LENGTH], @@ -61,7 +61,7 @@ impl K8sFactory { ); vault.available()?; let root_key = vault - .export_private_key("diem__diem_root") + .export_private_key("diem__aptos_root") .unwrap() .to_bytes(); let treasury_compliance_key = vault diff --git a/testsuite/forge/src/backend/k8s/node.rs b/testsuite/forge/src/backend/k8s/node.rs index ffffc8505fd19..74ee957f6320c 100644 --- a/testsuite/forge/src/backend/k8s/node.rs +++ b/testsuite/forge/src/backend/k8s/node.rs @@ -5,9 +5,9 @@ use crate::{ scale_sts_replica, FullNode, HealthCheckError, Node, NodeExt, Result, Validator, Version, }; use anyhow::{format_err, Context}; -use diem_config::config::NodeConfig; -use diem_rest_client::Client as RestClient; -use diem_sdk::types::PeerId; +use aptos_config::config::NodeConfig; +use aptos_rest_client::Client as RestClient; +use aptos_sdk::types::PeerId; use reqwest::Url; use serde_json::Value; use std::{ diff --git a/testsuite/forge/src/backend/k8s/swarm.rs b/testsuite/forge/src/backend/k8s/swarm.rs index 0481a0439f8f1..f7b546f484724 100644 --- a/testsuite/forge/src/backend/k8s/swarm.rs +++ b/testsuite/forge/src/backend/k8s/swarm.rs @@ -6,9 +6,9 @@ use crate::{ set_validator_image_tag, ChainInfo, FullNode, Node, Result, Swarm, Validator, Version, }; use anyhow::{anyhow, bail, format_err}; -use diem_config::config::NodeConfig; -use diem_logger::*; -use diem_sdk::{ +use aptos_config::config::NodeConfig; +use aptos_logger::*; +use aptos_sdk::{ crypto::ed25519::Ed25519PrivateKey, types::{ chain_id::{ChainId, NamedChain}, @@ -59,7 +59,7 @@ impl K8sSwarm { let client = validators.values().next().unwrap().rest_client(); let key = load_root_key(root_key); let account_key = AccountKey::from_private_key(key); - let address = diem_sdk::types::account_config::diem_root_address(); + let address = aptos_sdk::types::account_config::aptos_root_address(); let sequence_number = query_sequence_numbers(&client, &[address]) .await .map_err(|e| { @@ -73,7 +73,7 @@ impl K8sSwarm { let key = load_tc_key(treasury_compliance_key); let account_key = AccountKey::from_private_key(key); - let address = diem_sdk::types::account_config::treasury_compliance_account_address(); + let address = aptos_sdk::types::account_config::treasury_compliance_account_address(); let sequence_number = query_sequence_numbers(&client, &[address]) .await .map_err(|e| { @@ -87,7 +87,7 @@ impl K8sSwarm { let key = load_tc_key(treasury_compliance_key); let account_key = AccountKey::from_private_key(key); - let address = diem_sdk::types::account_config::testnet_dd_account_address(); + let address = aptos_sdk::types::account_config::testnet_dd_account_address(); let sequence_number = query_sequence_numbers(&client, &[address]) .await .map_err(|e| { @@ -251,7 +251,7 @@ impl Swarm for K8sSwarm { } pub(crate) fn k8s_retry_strategy() -> impl Iterator { - diem_retrier::exp_retry_strategy(1000, 10000, 50) + aptos_retrier::exp_retry_strategy(1000, 10000, 50) } #[derive(Clone, Debug)] @@ -295,7 +295,7 @@ pub(crate) async fn get_validators( let node_id = parse_node_id(&s.name).expect("error to parse node id"); let node = K8sNode { name: format!("val{}", node_id), - sts_name: format!("val{}-diem-validator-validator", node_id), + sts_name: format!("val{}-aptos-validator-validator", node_id), // TODO: fetch this from running node peer_id: PeerId::random(), node_id, @@ -333,7 +333,7 @@ pub(crate) async fn get_fullnodes( let node_id = parse_node_id(&s.name).expect("error to parse node id"); let node = K8sNode { name: format!("val{}", node_id), - sts_name: format!("val{}-diem-validator-fullnode-e{}", node_id, era), + sts_name: format!("val{}-aptos-validator-fullnode-e{}", node_id, era), // TODO: fetch this from running node peer_id: PeerId::random(), node_id, @@ -373,7 +373,7 @@ pub async fn nodes_healthcheck(nodes: Vec<&K8sNode>) -> Result> { let node_name = node.name().to_string(); println!("Attempting health check: {}", node_name); // perform healthcheck with retry, returning unhealthy - let check = diem_retrier::retry_async(k8s_retry_strategy(), || { + let check = aptos_retrier::retry_async(k8s_retry_strategy(), || { Box::pin(async move { match node.rest_client().get_ledger_information().await { Ok(_) => { diff --git a/testsuite/forge/src/backend/local/cargo.rs b/testsuite/forge/src/backend/local/cargo.rs index 691a8e932ce24..7aaccc66be1aa 100644 --- a/testsuite/forge/src/backend/local/cargo.rs +++ b/testsuite/forge/src/backend/local/cargo.rs @@ -30,39 +30,39 @@ pub fn metadata() -> Result { } /// Get the diem node binary from the current working directory -pub fn get_diem_node_binary_from_worktree() -> Result<(String, PathBuf)> { +pub fn get_aptos_node_binary_from_worktree() -> Result<(String, PathBuf)> { let metadata = metadata()?; let mut revision = git_rev_parse(&metadata, "HEAD")?; if git_is_worktree_dirty()? { revision.push_str("-dirty"); } - let bin_path = cargo_build_diem_node(&metadata.workspace_root, &metadata.target_directory)?; + let bin_path = cargo_build_aptos_node(&metadata.workspace_root, &metadata.target_directory)?; Ok((revision, bin_path)) } -/// This function will attempt to build the diem-node binary at an arbitrary revision. +/// This function will attempt to build the aptos-node binary at an arbitrary revision. /// Using the `target/forge` as a working directory it will do the following: -/// 1. Look for a binary named `diem-node--`, if it already exists return it +/// 1. Look for a binary named `aptos-node--`, if it already exists return it /// 2. If the binary doesn't exist check out the revision to `target/forge/revision` by doing /// `git archive --format=tar | tar x` /// 3. Using the `target/forge/target` directory as a cargo artifact directory, build the -/// binary and then move it to `target/forge/diem-node--` -pub fn get_diem_node_binary_at_revision(revision: &str) -> Result<(String, PathBuf)> { +/// binary and then move it to `target/forge/aptos-node--` +pub fn get_aptos_node_binary_at_revision(revision: &str) -> Result<(String, PathBuf)> { let metadata = metadata()?; let forge_directory = metadata.target_directory.join("forge"); let revision = git_rev_parse(&metadata, format!("{}^{{commit}}", revision))?; let checkout_dir = forge_directory.join(&revision); let forge_target_directory = forge_directory.join("target"); - let diem_node_bin = forge_directory.join(format!( - "diem-node--{}{}", + let aptos_node_bin = forge_directory.join(format!( + "aptos-node--{}{}", revision, env::consts::EXE_SUFFIX )); - if diem_node_bin.exists() { - return Ok((revision, diem_node_bin)); + if aptos_node_bin.exists() { + return Ok((revision, aptos_node_bin)); } fs::create_dir_all(&forge_target_directory)?; @@ -70,13 +70,13 @@ pub fn get_diem_node_binary_at_revision(revision: &str) -> Result<(String, PathB checkout_revision(&metadata, &revision, &checkout_dir)?; fs::rename( - cargo_build_diem_node(&checkout_dir, &forge_target_directory)?, - &diem_node_bin, + cargo_build_aptos_node(&checkout_dir, &forge_target_directory)?, + &aptos_node_bin, )?; let _ = fs::remove_dir_all(&checkout_dir); - Ok((revision, diem_node_bin)) + Ok((revision, aptos_node_bin)) } fn git_rev_parse>(metadata: &Metadata, rev: R) -> Result { @@ -145,7 +145,7 @@ pub fn git_merge_base>(rev: R) -> Result { } } -fn cargo_build_diem_node(directory: D, target_directory: T) -> Result +fn cargo_build_aptos_node(directory: D, target_directory: T) -> Result where D: AsRef, T: AsRef, @@ -155,16 +155,16 @@ where let output = Command::new("cargo") .current_dir(directory) .env("CARGO_TARGET_DIR", target_directory) - .args(&["build", "--bin=diem-node", "--features=failpoints"]) + .args(&["build", "--bin=aptos-node", "--features=failpoints"]) .output() - .context("Failed to build diem-node")?; + .context("Failed to build aptos-node")?; if output.status.success() { let bin_path = - target_directory.join(format!("debug/{}{}", "diem-node", env::consts::EXE_SUFFIX)); + target_directory.join(format!("debug/{}{}", "aptos-node", env::consts::EXE_SUFFIX)); if !bin_path.exists() { bail!( - "Can't find binary diem-node at expected path {:?}", + "Can't find binary aptos-node at expected path {:?}", bin_path ); } @@ -174,7 +174,7 @@ where io::stderr().write_all(&output.stderr)?; bail!( - "Failed to build diem-node: 'cd {} && CARGO_TARGET_DIR={} cargo build --bin=diem-node", + "Failed to build aptos-node: 'cd {} && CARGO_TARGET_DIR={} cargo build --bin=aptos-node", directory.display(), target_directory.display(), ); diff --git a/testsuite/forge/src/backend/local/mod.rs b/testsuite/forge/src/backend/local/mod.rs index 345523de5ddac..642ae5e26889a 100644 --- a/testsuite/forge/src/backend/local/mod.rs +++ b/testsuite/forge/src/backend/local/mod.rs @@ -55,7 +55,7 @@ impl LocalFactory { pub fn from_workspace() -> Result { let mut versions = HashMap::new(); - let new_version = cargo::get_diem_node_binary_from_worktree().map(|(revision, bin)| { + let new_version = cargo::get_aptos_node_binary_from_worktree().map(|(revision, bin)| { let version = Version::new(usize::max_value(), revision.clone()); LocalVersion { revision, @@ -71,7 +71,7 @@ impl LocalFactory { pub fn from_revision(revision: &str) -> Result { let mut versions = HashMap::new(); let new_version = - cargo::get_diem_node_binary_at_revision(revision).map(|(revision, bin)| { + cargo::get_aptos_node_binary_at_revision(revision).map(|(revision, bin)| { let version = Version::new(usize::max_value(), revision.clone()); LocalVersion { revision, @@ -85,7 +85,7 @@ impl LocalFactory { } pub fn with_revision_and_workspace(revision: &str) -> Result { - let workspace = cargo::get_diem_node_binary_from_worktree().map(|(revision, bin)| { + let workspace = cargo::get_aptos_node_binary_from_worktree().map(|(revision, bin)| { let version = Version::new(usize::max_value(), revision.clone()); LocalVersion { revision, @@ -94,7 +94,7 @@ impl LocalFactory { } })?; let revision = - cargo::get_diem_node_binary_at_revision(revision).map(|(revision, bin)| { + cargo::get_aptos_node_binary_at_revision(revision).map(|(revision, bin)| { let version = Version::new(usize::min_value(), revision.clone()); LocalVersion { revision, @@ -109,14 +109,14 @@ impl LocalFactory { Ok(Self::new(versions)) } - /// Create a LocalFactory with a diem-node version built at the tip of upstream/main and the + /// Create a LocalFactory with a aptos-node version built at the tip of upstream/main and the /// current workspace, suitable for compatibility testing. pub fn with_upstream_and_workspace() -> Result { let upstream_main = cargo::git_get_upstream_remote().map(|r| format!("{}/main", r))?; Self::with_revision_and_workspace(&upstream_main) } - /// Create a LocalFactory with a diem-node version built at merge-base of upstream/main and the + /// Create a LocalFactory with a aptos-node version built at merge-base of upstream/main and the /// current workspace, suitable for compatibility testing. pub fn with_upstream_merge_base_and_workspace() -> Result { let upstream_main = cargo::git_get_upstream_remote().map(|r| format!("{}/main", r))?; diff --git a/testsuite/forge/src/backend/local/node.rs b/testsuite/forge/src/backend/local/node.rs index ce179c9d6f5e9..01d3d8feb23b6 100644 --- a/testsuite/forge/src/backend/local/node.rs +++ b/testsuite/forge/src/backend/local/node.rs @@ -3,9 +3,9 @@ use crate::{FullNode, HealthCheckError, LocalVersion, Node, NodeExt, Validator, Version}; use anyhow::{anyhow, Context, Result}; -use diem_config::config::NodeConfig; -use diem_logger::{debug, warn}; -use diem_sdk::types::{account_address::AccountAddress, PeerId}; +use aptos_config::config::NodeConfig; +use aptos_logger::{debug, warn}; +use aptos_sdk::types::{account_address::AccountAddress, PeerId}; use std::{ env, fs::{self, OpenOptions}, diff --git a/testsuite/forge/src/backend/local/swarm.rs b/testsuite/forge/src/backend/local/swarm.rs index 16ba2e046ae78..8f7483cb32f2d 100644 --- a/testsuite/forge/src/backend/local/swarm.rs +++ b/testsuite/forge/src/backend/local/swarm.rs @@ -6,9 +6,9 @@ use crate::{ Validator, Version, }; use anyhow::{anyhow, bail, Result}; -use diem_config::config::NodeConfig; -use diem_genesis_tool::{fullnode_builder::FullnodeConfig, validator_builder::ValidatorBuilder}; -use diem_sdk::{ +use aptos_config::config::NodeConfig; +use aptos_genesis_tool::{fullnode_builder::FullnodeConfig, validator_builder::ValidatorBuilder}; +use aptos_sdk::{ crypto::ed25519::Ed25519PrivateKey, types::{ chain_id::ChainId, transaction::Transaction, waypoint::Waypoint, AccountKey, LocalAccount, @@ -171,14 +171,14 @@ impl LocalSwarmBuilder { .collect::>>()?; let root_account = LocalAccount::new( - diem_sdk::types::account_config::diem_root_address(), + aptos_sdk::types::account_config::aptos_root_address(), AccountKey::from_private_key(root_keys.root_key), 0, ); // Designated dealer account is built to have the same private key as the TC account let designated_dealer_account = LocalAccount::new( - diem_sdk::types::account_config::testnet_dd_account_address(), + aptos_sdk::types::account_config::testnet_dd_account_address(), AccountKey::from_private_key( Ed25519PrivateKey::try_from(root_keys.treasury_compliance_key.to_bytes().as_ref()) .unwrap(), @@ -187,7 +187,7 @@ impl LocalSwarmBuilder { ); let treasury_compliance_account = LocalAccount::new( - diem_sdk::types::account_config::treasury_compliance_account_address(), + aptos_sdk::types::account_config::treasury_compliance_account_address(), AccountKey::from_private_key(root_keys.treasury_compliance_key), 0, ); diff --git a/testsuite/forge/src/github.rs b/testsuite/forge/src/github.rs index ad184e6be23b5..64f399d616b23 100644 --- a/testsuite/forge/src/github.rs +++ b/testsuite/forge/src/github.rs @@ -49,7 +49,7 @@ impl GitHub { })?; let request = self.client.get(url); let response = request - .header(USER_AGENT, "diem-forge") + .header(USER_AGENT, "aptos-forge") .send() .map_err(|e| format_err!("Failed to query github: {:?}", e))?; let response: Vec = response diff --git a/testsuite/forge/src/interface/admin.rs b/testsuite/forge/src/interface/admin.rs index d7e85d007fbfb..328603752812f 100644 --- a/testsuite/forge/src/interface/admin.rs +++ b/testsuite/forge/src/interface/admin.rs @@ -3,8 +3,8 @@ use super::{ChainInfo, CoreContext, Test}; use crate::{Result, TestReport}; -use diem_rest_client::Client as RestClient; -use diem_sdk::types::LocalAccount; +use aptos_rest_client::Client as RestClient; +use aptos_sdk::types::LocalAccount; use reqwest::Url; /// The testing interface which defines a test written from the perspective of the Admin of the diff --git a/testsuite/forge/src/interface/aptos.rs b/testsuite/forge/src/interface/aptos.rs index 6d3b9c492c590..575429c7da992 100644 --- a/testsuite/forge/src/interface/aptos.rs +++ b/testsuite/forge/src/interface/aptos.rs @@ -2,8 +2,8 @@ use super::Test; use crate::{CoreContext, Result, TestReport}; -use diem_rest_client::Client as RestClient; -use diem_sdk::{ +use aptos_rest_client::Client as RestClient; +use aptos_sdk::{ crypto::ed25519::Ed25519PublicKey, transaction_builder::TransactionFactory, types::{ @@ -13,7 +13,7 @@ use diem_sdk::{ LocalAccount, }, }; -use diem_transaction_builder::aptos_stdlib; +use aptos_transaction_builder::aptos_stdlib; use reqwest::Url; #[async_trait::async_trait] diff --git a/testsuite/forge/src/interface/chain_info.rs b/testsuite/forge/src/interface/chain_info.rs index 7f60612abd1b5..31dfdc23a4593 100644 --- a/testsuite/forge/src/interface/chain_info.rs +++ b/testsuite/forge/src/interface/chain_info.rs @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 use crate::{AptosPublicInfo, Coffer, NFTPublicInfo, PublicInfo, Result}; -use diem_rest_client::Client as RestClient; -use diem_sdk::{ +use aptos_rest_client::Client as RestClient; +use aptos_sdk::{ transaction_builder::{Currency, TransactionFactory}, types::{ account_address::AccountAddress, chain_id::ChainId, diff --git a/testsuite/forge/src/interface/nft.rs b/testsuite/forge/src/interface/nft.rs index 41b68f89293cf..2c6e2e9aa2a9a 100644 --- a/testsuite/forge/src/interface/nft.rs +++ b/testsuite/forge/src/interface/nft.rs @@ -3,14 +3,14 @@ use super::Test; use crate::{CoreContext, Result, TestReport}; -use diem_rest_client::Client as RestClient; -use diem_sdk::{ +use aptos_rest_client::Client as RestClient; +use aptos_sdk::{ crypto::{ed25519::Ed25519PrivateKey, PrivateKey, Uniform}, move_types::account_address::AccountAddress, transaction_builder::TransactionFactory, types::{chain_id::ChainId, transaction::authenticator::AuthenticationKey, LocalAccount}, }; -use diem_transaction_builder::experimental_stdlib; +use aptos_transaction_builder::experimental_stdlib; use rand::{rngs::StdRng, SeedableRng}; use reqwest::Url; diff --git a/testsuite/forge/src/interface/node.rs b/testsuite/forge/src/interface/node.rs index 9383bc805bf60..65b24ad1bac35 100644 --- a/testsuite/forge/src/interface/node.rs +++ b/testsuite/forge/src/interface/node.rs @@ -3,10 +3,10 @@ use crate::{Result, Version}; use anyhow::anyhow; +use aptos_config::{config::NodeConfig, network_id::NetworkId}; +use aptos_rest_client::Client as RestClient; +use aptos_sdk::types::PeerId; use debug_interface::AsyncNodeDebugClient; -use diem_config::{config::NodeConfig, network_id::NetworkId}; -use diem_rest_client::Client as RestClient; -use diem_sdk::types::PeerId; use std::{ collections::HashMap, time::{Duration, Instant}, diff --git a/testsuite/forge/src/interface/public.rs b/testsuite/forge/src/interface/public.rs index ad9964b3d6b84..c7aaf4c59cbd7 100644 --- a/testsuite/forge/src/interface/public.rs +++ b/testsuite/forge/src/interface/public.rs @@ -3,8 +3,8 @@ use super::Test; use crate::{CoreContext, Result, TestReport}; -use diem_rest_client::{Client as RestClient, FaucetClient}; -use diem_sdk::{ +use aptos_rest_client::{Client as RestClient, FaucetClient}; +use aptos_sdk::{ move_types::account_address::AccountAddress, transaction_builder::{Currency, TransactionFactory}, types::{chain_id::ChainId, transaction::authenticator::AuthenticationKey, LocalAccount}, diff --git a/testsuite/forge/src/interface/swarm.rs b/testsuite/forge/src/interface/swarm.rs index 1e40ba63c0885..24be45b4db8a0 100644 --- a/testsuite/forge/src/interface/swarm.rs +++ b/testsuite/forge/src/interface/swarm.rs @@ -3,9 +3,9 @@ use crate::{ChainInfo, FullNode, NodeExt, Result, Validator, Version}; use anyhow::{anyhow, bail}; -use diem_config::config::NodeConfig; -use diem_rest_client::Client as RestClient; -use diem_sdk::types::PeerId; +use aptos_config::config::NodeConfig; +use aptos_rest_client::Client as RestClient; +use aptos_sdk::types::PeerId; use futures::future::try_join_all; use std::time::{Duration, Instant}; use tokio::runtime::Runtime; diff --git a/testsuite/generate-format/Cargo.toml b/testsuite/generate-format/Cargo.toml index 2931153f7a146..e9c0446a079b3 100644 --- a/testsuite/generate-format/Cargo.toml +++ b/testsuite/generate-format/Cargo.toml @@ -19,11 +19,11 @@ structopt = "0.3.21" consensus = { path = "../../consensus", features=["fuzzing"] } consensus-types = { path = "../../consensus/consensus-types", features=["fuzzing"] } bcs = "0.1.2" -diem-config = { path = "../../config" } -diem-crypto = { path = "../../crates/diem-crypto", features=["fuzzing"] } -diem-crypto-derive = { path = "../../crates/diem-crypto-derive"} -diem-types = { path = "../../types", features=["fuzzing"] } -diem-workspace-hack = { version = "0.1", path = "../../crates/diem-workspace-hack" } +aptos-config = { path = "../../config" } +aptos-crypto = { path = "../../crates/aptos-crypto", features=["fuzzing"] } +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/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860", features=["fuzzing"] } diff --git a/testsuite/generate-format/src/diem.rs b/testsuite/generate-format/src/aptos.rs similarity index 91% rename from testsuite/generate-format/src/diem.rs rename to testsuite/generate-format/src/aptos.rs index 0fde877ec44b4..c2e4e54d79e2f 100644 --- a/testsuite/generate-format/src/diem.rs +++ b/testsuite/generate-format/src/aptos.rs @@ -1,14 +1,14 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_crypto::{ +use aptos_crypto::{ ed25519::{Ed25519PrivateKey, Ed25519PublicKey}, hash::{CryptoHasher as _, TestOnlyHasher}, multi_ed25519::{MultiEd25519PublicKey, MultiEd25519Signature}, traits::{SigningKey, Uniform}, }; -use diem_crypto_derive::{BCSCryptoHash, CryptoHasher}; -use diem_types::{contract_event, event, transaction, write_set}; +use aptos_crypto_derive::{BCSCryptoHash, CryptoHasher}; +use aptos_types::{contract_event, event, transaction, write_set}; use move_core_types::language_storage; use rand::{rngs::StdRng, SeedableRng}; use serde::{Deserialize, Serialize}; @@ -16,12 +16,12 @@ use serde_reflection::{Registry, Result, Samples, Tracer, TracerConfig}; /// Default output file. pub fn output_file() -> Option<&'static str> { - Some("tests/staged/diem.yaml") + Some("tests/staged/aptos.yaml") } /// This aims at signing canonically serializable BCS data #[derive(CryptoHasher, BCSCryptoHash, Serialize, Deserialize)] -struct TestDiemCrypto(String); +struct TestAptosCrypto(String); /// Record sample values for crypto types used by transactions. fn trace_crypto_values(tracer: &mut Tracer, samples: &mut Samples) -> Result<()> { @@ -29,7 +29,7 @@ fn trace_crypto_values(tracer: &mut Tracer, samples: &mut Samples) -> Result<()> hasher.update(b"Test message"); let hashed_message = hasher.finish(); - let message = TestDiemCrypto("Hello, World".to_string()); + let message = TestAptosCrypto("Hello, World".to_string()); let mut rng: StdRng = SeedableRng::from_seed([0; 32]); let private_key = Ed25519PrivateKey::generate(&mut rng); diff --git a/testsuite/generate-format/src/consensus.rs b/testsuite/generate-format/src/consensus.rs index 7c981502dbe3c..f47eeb5f057a9 100644 --- a/testsuite/generate-format/src/consensus.rs +++ b/testsuite/generate-format/src/consensus.rs @@ -1,13 +1,13 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_crypto::{ +use aptos_crypto::{ ed25519::{Ed25519PrivateKey, Ed25519PublicKey}, multi_ed25519::{MultiEd25519PublicKey, MultiEd25519Signature}, traits::{SigningKey, Uniform}, }; -use diem_crypto_derive::{BCSCryptoHash, CryptoHasher}; -use diem_types::{contract_event, event, transaction, write_set}; +use aptos_crypto_derive::{BCSCryptoHash, CryptoHasher}; +use aptos_types::{contract_event, event, transaction, write_set}; use move_core_types::language_storage; use rand::{rngs::StdRng, SeedableRng}; use serde::{Deserialize, Serialize}; diff --git a/testsuite/generate-format/src/lib.rs b/testsuite/generate-format/src/lib.rs index 48f10723bc961..ef148b9ce3def 100644 --- a/testsuite/generate-format/src/lib.rs +++ b/testsuite/generate-format/src/lib.rs @@ -1,17 +1,17 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -//! How and where to record the Serde format of interesting Diem types. +//! How and where to record the Serde format of interesting Aptos types. //! See API documentation with `cargo doc -p serde-reflection --open` use serde_reflection::Registry; use std::str::FromStr; use structopt::{clap::arg_enum, StructOpt}; +/// Aptos transactions. +mod aptos; /// Consensus messages. mod consensus; -/// Diem transactions. -mod diem; /// Analyze Serde formats to detect certain patterns. mod linter; /// Move ABI. @@ -25,7 +25,7 @@ arg_enum! { #[derive(Debug, StructOpt, Clone, Copy)] /// A corpus of Rust types to trace, and optionally record on disk. pub enum Corpus { - Diem, + Aptos, Consensus, Network, MoveABI, @@ -44,7 +44,7 @@ impl Corpus { /// Compute the registry of formats. pub fn get_registry(self) -> Registry { let result = match self { - Corpus::Diem => diem::get_registry(), + Corpus::Aptos => aptos::get_registry(), Corpus::Consensus => consensus::get_registry(), Corpus::Network => network::get_registry(), Corpus::MoveABI => move_abi::get_registry(), @@ -60,7 +60,7 @@ impl Corpus { /// Where to record this corpus on disk. pub fn output_file(self) -> Option<&'static str> { match self { - Corpus::Diem => diem::output_file(), + Corpus::Aptos => aptos::output_file(), Corpus::Consensus => consensus::output_file(), Corpus::Network => network::output_file(), Corpus::MoveABI => move_abi::output_file(), diff --git a/testsuite/generate-format/src/move_abi.rs b/testsuite/generate-format/src/move_abi.rs index 575717a41d11c..5dc5fc1f1915a 100644 --- a/testsuite/generate-format/src/move_abi.rs +++ b/testsuite/generate-format/src/move_abi.rs @@ -1,7 +1,7 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_types::transaction; +use aptos_types::transaction; use move_core_types::language_storage; use serde_reflection::{Registry, Result, Samples, Tracer, TracerConfig}; diff --git a/testsuite/generate-format/src/network.rs b/testsuite/generate-format/src/network.rs index 773d8f38e68b8..b1e24d99ef3d4 100644 --- a/testsuite/generate-format/src/network.rs +++ b/testsuite/generate-format/src/network.rs @@ -1,11 +1,11 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_crypto::{ +use aptos_crypto::{ traits::Uniform, x25519::{PrivateKey, PublicKey}, }; -use diem_types::network_address as address; +use aptos_types::network_address as address; use network::protocols::wire::{handshake, messaging}; use rand::{rngs::StdRng, SeedableRng}; use serde_reflection::{Registry, Result, Samples, Tracer, TracerConfig}; @@ -49,7 +49,7 @@ pub fn get_registry() -> Result { tracer.trace_type::(&samples)?; tracer.trace_type::(&samples)?; tracer.trace_type::(&samples)?; - tracer.trace_type::(&samples)?; + tracer.trace_type::(&samples)?; tracer.registry() } diff --git a/testsuite/generate-format/tests/staged/diem.yaml b/testsuite/generate-format/tests/staged/aptos.yaml similarity index 100% rename from testsuite/generate-format/tests/staged/diem.yaml rename to testsuite/generate-format/tests/staged/aptos.yaml diff --git a/testsuite/smoke-test/Cargo.toml b/testsuite/smoke-test/Cargo.toml index fff4d60828552..7fbf5b9b805bf 100644 --- a/testsuite/smoke-test/Cargo.toml +++ b/testsuite/smoke-test/Cargo.toml @@ -18,18 +18,18 @@ tokio = { version = "1.8.1", features = ["full"] } walkdir = "2.3.1" reqwest = { version = "0.11.2", features = ["json"] } -aptos-framework-releases = { path = "../../diem-move/diem-framework/aptos-framework/releases" } -diem-config = { path = "../../config" } -diem-crypto = { path = "../../crates/diem-crypto" } -diem-experimental-framework-releases = { path = "../../diem-move/diem-framework/experimental/releases" } -diem-framework = { path = "../../diem-move/diem-framework" } -diem-framework-releases = { path = "../../diem-move/diem-framework/DPN/releases" } -diem-rest-client = { path = "../../crates/diem-rest-client" } -diem-sdk = { path = "../../sdk" } -diem-temppath = { path = "../../crates/diem-temppath" } -diem-transaction-builder = { path = "../../sdk/transaction-builder" } -diem-types = { path = "../../types" } -diem-workspace-hack = { version = "0.1", path = "../../crates/diem-workspace-hack" } +aptos-framework-releases = { path = "../../aptos-move/diem-framework/aptos-framework/releases" } +aptos-config = { path = "../../config" } +aptos-crypto = { path = "../../crates/aptos-crypto" } +diem-experimental-framework-releases = { path = "../../aptos-move/diem-framework/experimental/releases" } +diem-framework = { path = "../../aptos-move/diem-framework" } +diem-framework-releases = { path = "../../aptos-move/diem-framework/DPN/releases" } +aptos-rest-client = { path = "../../crates/aptos-rest-client" } +aptos-sdk = { path = "../../sdk" } +aptos-temppath = { path = "../../crates/aptos-temppath" } +aptos-transaction-builder = { path = "../../sdk/transaction-builder" } +aptos-types = { path = "../../types" } +aptos-workspace-hack = { version = "0.1", path = "../../crates/aptos-workspace-hack" } forge = { path = "../forge" } move-command-line-common = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } move-ir-compiler = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } @@ -47,17 +47,17 @@ futures = "0.3.12" backup-cli = { path = "../../storage/backup/backup-cli" } debug-interface = { path = "../../crates/debug-interface" } generate-key = { path = "../../config/generate-key" } -diem-genesis-tool = {path = "../../config/management/genesis", features = ["testing"] } -diem-global-constants = { path = "../../config/global-constants" } -diem-infallible = { path = "../../crates/diem-infallible" } -diem-logger = { path = "../../crates/diem-logger" } -diem-management = { path = "../../config/management", features = ["testing"] } -diem-operational-tool = {path = "../../config/management/operational", features = ["testing"] } -diem-secure-storage = { path = "../../secure/storage", features = ["testing"] } -diem-time-service = { path = "../../crates/diem-time-service", features = ["testing"] } -diem-vault-client = { path = "../../secure/storage/vault", features = ["fuzzing"] } -diem-writeset-generator = { path = "../../diem-move/writeset-transaction-generator" } -diem-transaction-builder = { path = "../../sdk/transaction-builder" } +aptos-genesis-tool = {path = "../../config/management/genesis", features = ["testing"] } +aptos-global-constants = { path = "../../config/global-constants" } +aptos-infallible = { path = "../../crates/aptos-infallible" } +aptos-logger = { path = "../../crates/aptos-logger" } +aptos-management = { path = "../../config/management", features = ["testing"] } +aptos-operational-tool = {path = "../../config/management/operational", features = ["testing"] } +aptos-secure-storage = { path = "../../secure/storage", features = ["testing"] } +aptos-time-service = { path = "../../crates/aptos-time-service", features = ["testing"] } +aptos-vault-client = { path = "../../secure/storage/vault", features = ["fuzzing"] } +aptos-writeset-generator = { path = "../../aptos-move/writeset-transaction-generator" } +aptos-transaction-builder = { path = "../../sdk/transaction-builder" } [[test]] name = "forge" diff --git a/testsuite/smoke-test/src/aptos/account_creation.rs b/testsuite/smoke-test/src/aptos/account_creation.rs index d2f46ccde47f6..99167e8622bab 100644 --- a/testsuite/smoke-test/src/aptos/account_creation.rs +++ b/testsuite/smoke-test/src/aptos/account_creation.rs @@ -1,7 +1,7 @@ // SPDX-License-Identifier: Apache-2.0 -use diem_transaction_builder::aptos_stdlib; -use diem_types::transaction::authenticator::AuthenticationKeyPreimage; +use aptos_transaction_builder::aptos_stdlib; +use aptos_types::transaction::authenticator::AuthenticationKeyPreimage; use forge::{AptosContext, AptosTest, Result, Test}; pub struct AccountCreation; diff --git a/testsuite/smoke-test/src/aptos/mint_transfer.rs b/testsuite/smoke-test/src/aptos/mint_transfer.rs index 4ae8c5dbe2a94..813fea67782a7 100644 --- a/testsuite/smoke-test/src/aptos/mint_transfer.rs +++ b/testsuite/smoke-test/src/aptos/mint_transfer.rs @@ -1,6 +1,6 @@ // SPDX-License-Identifier: Apache-2.0 -use diem_transaction_builder::aptos_stdlib; +use aptos_transaction_builder::aptos_stdlib; use forge::{AptosContext, AptosTest, Result, Test}; pub struct MintTransfer; diff --git a/testsuite/smoke-test/src/client.rs b/testsuite/smoke-test/src/client.rs index 960ed1b4d6862..6085fee43909d 100644 --- a/testsuite/smoke-test/src/client.rs +++ b/testsuite/smoke-test/src/client.rs @@ -97,7 +97,7 @@ async fn test_concurrent_transfers_single_node() { for _ in 0..20 { let txn = account_0.sign_with_transaction_builder(transaction_factory.peer_to_peer( - diem_sdk::transaction_builder::Currency::XUS, + aptos_sdk::transaction_builder::Currency::XUS, account_1.address(), 1, )); diff --git a/testsuite/smoke-test/src/consensus.rs b/testsuite/smoke-test/src/consensus.rs index 60a927fc42b40..fed98fdaf7c03 100644 --- a/testsuite/smoke-test/src/consensus.rs +++ b/testsuite/smoke-test/src/consensus.rs @@ -5,10 +5,10 @@ use crate::{ operational_tooling::launch_swarm_with_op_tool_and_backend, test_utils::check_create_mint_transfer, }; -use diem_config::config::SecureBackend; -use diem_sdk::types::on_chain_config::OnChainConsensusConfig; -use diem_secure_storage::{KVStorage, Storage}; -use diem_types::network_address::NetworkAddress; +use aptos_config::config::SecureBackend; +use aptos_sdk::types::on_chain_config::OnChainConsensusConfig; +use aptos_secure_storage::{KVStorage, Storage}; +use aptos_types::network_address::NetworkAddress; use forge::{NodeExt, Swarm}; use std::{convert::TryInto, str::FromStr}; diff --git a/testsuite/smoke-test/src/full_nodes.rs b/testsuite/smoke-test/src/full_nodes.rs index 54369df07a43f..862faabd01ceb 100644 --- a/testsuite/smoke-test/src/full_nodes.rs +++ b/testsuite/smoke-test/src/full_nodes.rs @@ -7,11 +7,11 @@ use crate::{ assert_balance, create_and_fund_account, transfer_coins, transfer_coins_non_blocking, }, }; -use diem_config::{ +use aptos_config::{ config::{DiscoveryMethod, NodeConfig, Peer, PeerRole, HANDSHAKE_VERSION}, network_id::NetworkId, }; -use diem_types::network_address::{NetworkAddress, Protocol}; +use aptos_types::network_address::{NetworkAddress, Protocol}; use forge::{NodeExt, Swarm, SwarmExt}; use std::{ collections::HashSet, diff --git a/testsuite/smoke-test/src/fullnode.rs b/testsuite/smoke-test/src/fullnode.rs index d9ed851fa1798..7ace726f565b1 100644 --- a/testsuite/smoke-test/src/fullnode.rs +++ b/testsuite/smoke-test/src/fullnode.rs @@ -4,10 +4,10 @@ use std::time::{Duration, Instant}; use anyhow::bail; -use diem_config::config::NodeConfig; -use diem_rest_client::Client as RestClient; -use diem_sdk::{transaction_builder::Currency, types::LocalAccount}; -use diem_types::account_address::AccountAddress; +use aptos_config::config::NodeConfig; +use aptos_rest_client::Client as RestClient; +use aptos_sdk::{transaction_builder::Currency, types::LocalAccount}; +use aptos_types::account_address::AccountAddress; use forge::{NetworkContext, NetworkTest, NodeExt, Result, Test}; use tokio::runtime::Runtime; diff --git a/testsuite/smoke-test/src/genesis.rs b/testsuite/smoke-test/src/genesis.rs index 130acf8a831d0..11a334f44abef 100644 --- a/testsuite/smoke-test/src/genesis.rs +++ b/testsuite/smoke-test/src/genesis.rs @@ -13,11 +13,11 @@ use crate::{ workspace_builder::workspace_root, }; use anyhow::anyhow; -use diem_operational_tool::test_helper::OperationalTool; -use diem_temppath::TempPath; -use diem_transaction_builder::stdlib::encode_remove_validator_and_reconfigure_script; -use diem_types::{ - account_config::diem_root_address, +use aptos_operational_tool::test_helper::OperationalTool; +use aptos_temppath::TempPath; +use aptos_transaction_builder::stdlib::encode_remove_validator_and_reconfigure_script; +use aptos_types::{ + account_config::aptos_root_address, transaction::{Transaction, WriteSetPayload}, waypoint::Waypoint, }; @@ -36,7 +36,7 @@ use std::{ #[tokio::test] /// This test verifies the flow of a genesis transaction after the chain starts. /// 1. Test the consensus sync_only mode, every node should stop at the same version. -/// 2. Test the db-bootstrapper applying a manual genesis transaction (remove validator 0) on diemdb directly +/// 2. Test the db-bootstrapper applying a manual genesis transaction (remove validator 0) on aptosdb directly /// 3. Test the nodes and clients resume working after updating waypoint /// 4. Test a node lagging behind can sync to the waypoint async fn test_genesis_transaction_flow() { @@ -145,9 +145,9 @@ async fn test_genesis_transaction_flow() { .to_string(), chain_id, ); - let diem_root = create_root_storage(&mut swarm); + let aptos_root = create_root_storage(&mut swarm); let config = op_tool - .validator_config(validator_address, Some(&diem_root)) + .validator_config(validator_address, Some(&aptos_root)) .await .unwrap(); let name = config.name.as_bytes().to_vec(); @@ -156,7 +156,7 @@ async fn test_genesis_transaction_flow() { validator.stop() } let genesis_transaction = Transaction::GenesisTransaction(WriteSetPayload::Script { - execute_as: diem_root_address(), + execute_as: aptos_root_address(), script: encode_remove_validator_and_reconfigure_script(0, name, validator_address), }); let genesis_path = TempPath::new(); @@ -259,7 +259,7 @@ async fn test_genesis_transaction_flow() { chain_id, ); let _ = op_tool - .add_validator(validator_address, &diem_root, false) + .add_validator(validator_address, &aptos_root, false) .await .unwrap(); diff --git a/testsuite/smoke-test/src/network.rs b/testsuite/smoke-test/src/network.rs index 69ea774ca66b3..9891c8389021a 100644 --- a/testsuite/smoke-test/src/network.rs +++ b/testsuite/smoke-test/src/network.rs @@ -2,17 +2,17 @@ // SPDX-License-Identifier: Apache-2.0 use crate::smoke_test_environment::new_local_swarm; -use diem_config::{ +use aptos_config::{ config::{DiscoveryMethod, Identity, NetworkConfig, NodeConfig, PeerSet, PersistableConfig}, network_id::NetworkId, }; -use diem_crypto::{x25519, x25519::PrivateKey}; -use diem_operational_tool::{ +use aptos_crypto::{x25519, x25519::PrivateKey}; +use aptos_operational_tool::{ keys::{EncodingType, KeyType}, test_helper::OperationalTool, }; -use diem_temppath::TempPath; -use diem_types::network_address::{NetworkAddress, Protocol}; +use aptos_temppath::TempPath; +use aptos_types::network_address::{NetworkAddress, Protocol}; use forge::{FullNode, LocalNode, NodeExt, Swarm}; use std::{ collections::HashMap, diff --git a/testsuite/smoke-test/src/nft_transaction.rs b/testsuite/smoke-test/src/nft_transaction.rs index a590a8df1d736..8a342bc3489df 100644 --- a/testsuite/smoke-test/src/nft_transaction.rs +++ b/testsuite/smoke-test/src/nft_transaction.rs @@ -1,13 +1,13 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_rest_client::Client as RestClient; -use diem_sdk::{ +use aptos_rest_client::Client as RestClient; +use aptos_sdk::{ crypto::{ed25519::Ed25519PrivateKey, PrivateKey, SigningKey, Uniform}, types::transaction::{authenticator::AuthenticationKey, SignedTransaction}, }; -use diem_transaction_builder::experimental_stdlib; -use diem_types::nft::tokens; +use aptos_transaction_builder::experimental_stdlib; +use aptos_types::nft::tokens; use forge::{NFTPublicUsageContext, NFTPublicUsageTest, Result, Test}; pub struct NFTTransaction; diff --git a/testsuite/smoke-test/src/operational_tooling.rs b/testsuite/smoke-test/src/operational_tooling.rs index eca2b8b0fbf83..6c1945776d6b4 100644 --- a/testsuite/smoke-test/src/operational_tooling.rs +++ b/testsuite/smoke-test/src/operational_tooling.rs @@ -9,27 +9,27 @@ use crate::{ }, }; use anyhow::{bail, Result}; -use diem_config::{ +use aptos_config::{ config::{PeerRole, SecureBackend}, network_id::NetworkId, }; -use diem_crypto::{ +use aptos_crypto::{ ed25519::{Ed25519PrivateKey, Ed25519PublicKey}, x25519, HashValue, PrivateKey, Uniform, ValidCryptoMaterialStringExt, }; -use diem_global_constants::{ +use aptos_global_constants::{ CONSENSUS_KEY, FULLNODE_NETWORK_KEY, GENESIS_WAYPOINT, OPERATOR_ACCOUNT, OPERATOR_KEY, OWNER_ACCOUNT, OWNER_KEY, VALIDATOR_NETWORK_ADDRESS_KEYS, VALIDATOR_NETWORK_KEY, WAYPOINT, }; -use diem_management::storage::to_x25519; -use diem_operational_tool::{ +use aptos_management::storage::to_x25519; +use aptos_operational_tool::{ keys::{EncodingType, KeyType}, test_helper::OperationalTool, }; -use diem_rest_client::Client as RestClient; -use diem_secure_storage::{CryptoStorage, KVStorage, Storage}; -use diem_temppath::TempPath; -use diem_types::{ +use aptos_rest_client::Client as RestClient; +use aptos_secure_storage::{CryptoStorage, KVStorage, Storage}; +use aptos_temppath::TempPath; +use aptos_types::{ account_address::{from_identity_public_key, AccountAddress}, account_state::AccountState, account_state_blob::AccountStateBlob, diff --git a/testsuite/smoke-test/src/rest_api.rs b/testsuite/smoke-test/src/rest_api.rs index 72d0ffd791fa8..11b4b71f30a96 100644 --- a/testsuite/smoke-test/src/rest_api.rs +++ b/testsuite/smoke-test/src/rest_api.rs @@ -1,8 +1,8 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_rest_client::Client; -use diem_sdk::types::account_config::testnet_dd_account_address; +use aptos_rest_client::Client; +use aptos_sdk::types::account_config::testnet_dd_account_address; use forge::{PublicUsageContext, PublicUsageTest, Result, Test}; pub struct GetIndex; @@ -54,7 +54,7 @@ impl BasicClient { ctx.fund(account2.address(), 10).await?; let tx = account1.sign_with_transaction_builder(ctx.transaction_factory().peer_to_peer( - diem_sdk::transaction_builder::Currency::XUS, + aptos_sdk::transaction_builder::Currency::XUS, account2.address(), 1, )); diff --git a/testsuite/smoke-test/src/scripts_and_modules.rs b/testsuite/smoke-test/src/scripts_and_modules.rs index b558099c2b2cf..6bc83108d0ccc 100644 --- a/testsuite/smoke-test/src/scripts_and_modules.rs +++ b/testsuite/smoke-test/src/scripts_and_modules.rs @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 use anyhow::{bail, format_err}; -use diem_rest_client::Client as RestClient; -use diem_sdk::{ +use aptos_rest_client::Client as RestClient; +use aptos_sdk::{ transaction_builder::{Currency, TransactionFactory}, types::{ account_address::AccountAddress, @@ -11,7 +11,7 @@ use diem_sdk::{ LocalAccount, }, }; -use diem_temppath::TempPath; +use aptos_temppath::TempPath; use forge::{AdminContext, AdminTest, Result, Test}; use move_command_line_common::files::MOVE_EXTENSION; use move_ir_compiler::Compiler; diff --git a/testsuite/smoke-test/src/smoke_test_environment.rs b/testsuite/smoke-test/src/smoke_test_environment.rs index 906b42d72b895..8c4e7bd470414 100644 --- a/testsuite/smoke-test/src/smoke_test_environment.rs +++ b/testsuite/smoke-test/src/smoke_test_environment.rs @@ -9,7 +9,7 @@ use std::num::NonZeroUsize; pub async fn new_local_swarm(num_validators: usize) -> LocalSwarm { static FACTORY: Lazy = Lazy::new(|| LocalFactory::from_workspace().unwrap()); - ::diem_logger::Logger::new().init(); + ::aptos_logger::Logger::new().init(); FACTORY .new_swarm(OsRng, NonZeroUsize::new(num_validators).unwrap()) diff --git a/testsuite/smoke-test/src/state_sync.rs b/testsuite/smoke-test/src/state_sync.rs index d82a0228d0ca7..077bc49faed3e 100644 --- a/testsuite/smoke-test/src/state_sync.rs +++ b/testsuite/smoke-test/src/state_sync.rs @@ -155,7 +155,7 @@ async fn test_startup_sync_state() { let node_config = swarm.validator(node_to_restart).unwrap().config().clone(); swarm.validator_mut(node_to_restart).unwrap().stop(); // TODO Remove hardcoded path to state db - let state_db_path = node_config.storage.dir().join("diemdb"); + let state_db_path = node_config.storage.dir().join("aptosdb"); // Verify that state_db_path exists and // we are not deleting a non-existent directory assert!(state_db_path.as_path().exists()); diff --git a/testsuite/smoke-test/src/state_sync_v2.rs b/testsuite/smoke-test/src/state_sync_v2.rs index aae5182d7f11a..0534e6790d327 100644 --- a/testsuite/smoke-test/src/state_sync_v2.rs +++ b/testsuite/smoke-test/src/state_sync_v2.rs @@ -5,9 +5,9 @@ use crate::{ smoke_test_environment::new_local_swarm, test_utils::{create_and_fund_account, transfer_and_reconfig, transfer_coins}, }; -use diem_config::config::{BootstrappingMode, ContinuousSyncingMode, NodeConfig}; -use diem_rest_client::Client as RestClient; -use diem_sdk::{transaction_builder::TransactionFactory, types::LocalAccount}; +use aptos_config::config::{BootstrappingMode, ContinuousSyncingMode, NodeConfig}; +use aptos_rest_client::Client as RestClient; +use aptos_sdk::{transaction_builder::TransactionFactory, types::LocalAccount}; use forge::{LocalSwarm, NodeExt, Swarm, SwarmExt}; use std::{ fs, @@ -238,7 +238,7 @@ async fn test_validator_sync(mut swarm: LocalSwarm) { let validator_1 = validator_peer_ids[1]; swarm.validator_mut(validator_1).unwrap().stop(); let node_config = swarm.validator_mut(validator_1).unwrap().config().clone(); - let state_db_path = node_config.storage.dir().join("diemdb"); + let state_db_path = node_config.storage.dir().join("aptosdb"); assert!(state_db_path.as_path().exists()); fs::remove_dir_all(state_db_path).unwrap(); diff --git a/testsuite/smoke-test/src/storage.rs b/testsuite/smoke-test/src/storage.rs index 3577c2f69fb4d..32824d28c8eb9 100644 --- a/testsuite/smoke-test/src/storage.rs +++ b/testsuite/smoke-test/src/storage.rs @@ -11,9 +11,9 @@ use crate::{ workspace_builder::workspace_root, }; use anyhow::{bail, Result}; +use aptos_temppath::TempPath; +use aptos_types::{transaction::Version, waypoint::Waypoint}; use backup_cli::metadata::view::BackupStorageState; -use diem_temppath::TempPath; -use diem_types::{transaction::Version, waypoint::Waypoint}; use forge::{NodeExt, Swarm, SwarmExt}; use std::{ fs, @@ -92,7 +92,7 @@ async fn test_db_restore() { insert_waypoint(&mut node0_config, genesis_waypoint); node0_config.save(node0_config_path).unwrap(); let db_dir = node0_config.storage.dir(); - fs::remove_dir_all(db_dir.join("diemdb")).unwrap(); + fs::remove_dir_all(db_dir.join("aptosdb")).unwrap(); fs::remove_dir_all(db_dir.join("consensusdb")).unwrap(); // restore db from backup diff --git a/testsuite/smoke-test/src/test_utils.rs b/testsuite/smoke-test/src/test_utils.rs index 426708e0bd117..85ef0121b7406 100644 --- a/testsuite/smoke-test/src/test_utils.rs +++ b/testsuite/smoke-test/src/test_utils.rs @@ -1,10 +1,10 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_config::config::{Identity, NodeConfig, SecureBackend}; -use diem_crypto::ed25519::Ed25519PublicKey; -use diem_rest_client::Client as RestClient; -use diem_sdk::{ +use aptos_config::config::{Identity, NodeConfig, SecureBackend}; +use aptos_crypto::ed25519::Ed25519PublicKey; +use aptos_rest_client::Client as RestClient; +use aptos_sdk::{ transaction_builder::{Currency, TransactionFactory}, types::{transaction::SignedTransaction, LocalAccount}, }; @@ -105,10 +105,10 @@ pub async fn assert_balance(client: &RestClient, account: &LocalAccount, balance /// node swarm, or a public full node swarm. pub mod diem_swarm_utils { use crate::test_utils::fetch_backend_storage; - use diem_config::config::{NodeConfig, OnDiskStorageConfig, SecureBackend, WaypointConfig}; - use diem_global_constants::{DIEM_ROOT_KEY, TREASURY_COMPLIANCE_KEY}; - use diem_secure_storage::{CryptoStorage, KVStorage, OnDiskStorage, Storage}; - use diem_types::waypoint::Waypoint; + use aptos_config::config::{NodeConfig, OnDiskStorageConfig, SecureBackend, WaypointConfig}; + use aptos_global_constants::{APTOS_ROOT_KEY, TREASURY_COMPLIANCE_KEY}; + use aptos_secure_storage::{CryptoStorage, KVStorage, OnDiskStorage, Storage}; + use aptos_types::waypoint::Waypoint; use forge::{LocalNode, LocalSwarm, Swarm}; /// Loads the nodes's storage backend identified by the node index in the given swarm. @@ -130,7 +130,7 @@ pub mod diem_swarm_utils { root_storage_config.path = swarm.dir().join("root-storage.json"); let mut root_storage = OnDiskStorage::new(root_storage_config.path()); root_storage - .import_private_key(DIEM_ROOT_KEY, root_key) + .import_private_key(APTOS_ROOT_KEY, root_key) .unwrap(); root_storage .import_private_key(TREASURY_COMPLIANCE_KEY, treasury_compliance_key) @@ -143,10 +143,10 @@ pub mod diem_swarm_utils { let f = |backend: &SecureBackend| { let mut storage: Storage = backend.into(); storage - .set(diem_global_constants::WAYPOINT, waypoint) + .set(aptos_global_constants::WAYPOINT, waypoint) .expect("Unable to write waypoint"); storage - .set(diem_global_constants::GENESIS_WAYPOINT, waypoint) + .set(aptos_global_constants::GENESIS_WAYPOINT, waypoint) .expect("Unable to write waypoint"); }; let backend = &node_config.consensus.safety_rules.backend; diff --git a/testsuite/smoke-test/src/transaction.rs b/testsuite/smoke-test/src/transaction.rs index 67d6ffc2dab4e..338a2997db9f2 100644 --- a/testsuite/smoke-test/src/transaction.rs +++ b/testsuite/smoke-test/src/transaction.rs @@ -2,11 +2,11 @@ // SPDX-License-Identifier: Apache-2.0 use anyhow::bail; -use diem_rest_client::{ - diem_api_types::{HexEncodedBytes, ScriptPayload, TransactionPayload}, +use aptos_rest_client::{ + aptos_api_types::{HexEncodedBytes, ScriptPayload, TransactionPayload}, Transaction, }; -use diem_sdk::{ +use aptos_sdk::{ crypto::{ed25519::Ed25519PrivateKey, PrivateKey, SigningKey, Uniform}, transaction_builder::Currency, types::{ @@ -110,7 +110,7 @@ impl ExternalTransactionSigner { }) = user_txn.request.payload { let expected_code = match unsigned_txn.clone().into_payload() { - diem_types::transaction::TransactionPayload::Script(script) => { + aptos_types::transaction::TransactionPayload::Script(script) => { HexEncodedBytes::from(script.code().to_vec()) } _ => bail!("unexpected transaction payload: {:?}", &unsigned_txn), diff --git a/testsuite/smoke-test/src/workspace_builder.rs b/testsuite/smoke-test/src/workspace_builder.rs index dbe173babea2e..b0495d6762cbb 100644 --- a/testsuite/smoke-test/src/workspace_builder.rs +++ b/testsuite/smoke-test/src/workspace_builder.rs @@ -5,22 +5,22 @@ //! //! This utility is to only be used inside of smoke test. -use diem_logger::prelude::*; +use aptos_logger::prelude::*; use once_cell::sync::Lazy; use std::{env, path::PathBuf, process::Command}; const WORKSPACE_BUILD_ERROR_MSG: &str = r#" Unable to build all workspace binaries. Cannot continue running tests. - Try running 'cargo build --all --bins --exclude diem-node' yourself. + Try running 'cargo build --all --bins --exclude aptos-node' yourself. "#; // Global flag indicating if all binaries in the workspace have been built. static WORKSPACE_BUILT: Lazy = Lazy::new(|| { info!("Building project binaries"); let args = if cfg!(debug_assertions) { - // use get_diem_node_with_failpoints to get diem-node binary - vec!["build", "--all", "--bins", "--exclude", "diem-node"] + // use get_aptos_node_with_failpoints to get aptos-node binary + vec!["build", "--all", "--bins", "--exclude", "aptos-node"] } else { vec!["build", "--all", "--bins", "--release"] }; diff --git a/testsuite/testcases/Cargo.toml b/testsuite/testcases/Cargo.toml index 364f30120ccfa..78e59994de33e 100644 --- a/testsuite/testcases/Cargo.toml +++ b/testsuite/testcases/Cargo.toml @@ -12,14 +12,14 @@ edition = "2018" [dependencies] anyhow = "1.0.52" bcs = "0.1.2" -diem-sdk = { path = "../../sdk" } -diem-operational-tool = {path = "../../config/management/operational", features = ["testing"] } -diem-rest-client = { path = "../../crates/diem-rest-client"} +aptos-sdk = { path = "../../sdk" } +aptos-operational-tool = {path = "../../config/management/operational", features = ["testing"] } +aptos-rest-client = { path = "../../crates/aptos-rest-client"} forge = { path = "../forge" } rand = "0.8.3" tokio = { version = "1.8.1", features = ["full"] } -diem-logger = { path = "../../crates/diem-logger" } -diem-workspace-hack = { version = "0.1", path = "../../crates/diem-workspace-hack" } +aptos-logger = { path = "../../crates/aptos-logger" } +aptos-workspace-hack = { version = "0.1", path = "../../crates/aptos-workspace-hack" } [[test]] name = "forge-local-compatibility" diff --git a/testsuite/testcases/src/lib.rs b/testsuite/testcases/src/lib.rs index 55c10292fe9f3..1ba8402ab596b 100644 --- a/testsuite/testcases/src/lib.rs +++ b/testsuite/testcases/src/lib.rs @@ -9,7 +9,7 @@ pub mod performance_test; pub mod reconfiguration_test; pub mod state_sync_performance; -use diem_sdk::{transaction_builder::TransactionFactory, types::PeerId}; +use aptos_sdk::{transaction_builder::TransactionFactory, types::PeerId}; use forge::{NetworkContext, NodeExt, Result, TxnEmitter, TxnStats, Version}; use rand::SeedableRng; use std::{ diff --git a/testsuite/testcases/src/reconfiguration_test.rs b/testsuite/testcases/src/reconfiguration_test.rs index f9a8a5408275c..aea2cadf337ca 100644 --- a/testsuite/testcases/src/reconfiguration_test.rs +++ b/testsuite/testcases/src/reconfiguration_test.rs @@ -2,9 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 use anyhow::ensure; -use diem_operational_tool::rest_client::RestClient as OperationalTool; -use diem_rest_client::Client as RestClient; -use diem_sdk::{ +use aptos_operational_tool::rest_client::RestClient as OperationalTool; +use aptos_rest_client::Client as RestClient; +use aptos_sdk::{ transaction_builder::TransactionFactory, types::on_chain_config::{ConsensusConfigV2, OnChainConsensusConfig}, }; @@ -47,7 +47,7 @@ impl NetworkTest for ReconfigurationTest { .map(|n| n.rest_client()) .collect::>(); let tx_factory = TransactionFactory::new(ctx.swarm().chain_info().chain_id); - let mut diem_root_account = ctx.swarm().chain_info().root_account; + let mut aptos_root_account = ctx.swarm().chain_info().root_account; let allowed_nonce = 0; let full_node_client = validator_clients.iter().choose(&mut rng).unwrap(); let timer = Instant::now(); @@ -58,7 +58,7 @@ impl NetworkTest for ReconfigurationTest { { println!("Remove and add back {}.", affected_pod_name); let validator_name = affected_pod_name.as_bytes().to_vec(); - let remove_txn = diem_root_account.sign_with_transaction_builder( + let remove_txn = aptos_root_account.sign_with_transaction_builder( tx_factory.remove_validator_and_reconfigure( allowed_nonce, validator_name.clone(), @@ -67,13 +67,13 @@ impl NetworkTest for ReconfigurationTest { ); execute_and_wait_transactions( full_node_client, - &mut diem_root_account, + &mut aptos_root_account, vec![remove_txn], ) .await .unwrap(); expect_epoch(full_node_client, 2).await.unwrap(); - let add_txn = diem_root_account.sign_with_transaction_builder( + let add_txn = aptos_root_account.sign_with_transaction_builder( tx_factory.add_validator_and_reconfigure( allowed_nonce, validator_name.clone(), @@ -82,7 +82,7 @@ impl NetworkTest for ReconfigurationTest { ); execute_and_wait_transactions( full_node_client, - &mut diem_root_account, + &mut aptos_root_account, vec![add_txn], ) .await @@ -100,7 +100,7 @@ impl NetworkTest for ReconfigurationTest { }); let downgrade_config = OnChainConsensusConfig::default(); for i in 1..count / 2 { - let upgrade_txn = diem_root_account.sign_with_transaction_builder( + let upgrade_txn = aptos_root_account.sign_with_transaction_builder( tx_factory.update_diem_consensus_config( allowed_nonce, bcs::to_bytes(&upgrade_config).unwrap(), @@ -108,13 +108,13 @@ impl NetworkTest for ReconfigurationTest { ); execute_and_wait_transactions( full_node_client, - &mut diem_root_account, + &mut aptos_root_account, vec![upgrade_txn], ) .await .unwrap(); expect_epoch(full_node_client, (i + 1) * 2).await.unwrap(); - let downgrade_txn = diem_root_account.sign_with_transaction_builder( + let downgrade_txn = aptos_root_account.sign_with_transaction_builder( tx_factory.update_diem_consensus_config( allowed_nonce, bcs::to_bytes(&downgrade_config).unwrap(), @@ -122,7 +122,7 @@ impl NetworkTest for ReconfigurationTest { ); execute_and_wait_transactions( full_node_client, - &mut diem_root_account, + &mut aptos_root_account, vec![downgrade_txn], ) .await @@ -136,12 +136,12 @@ impl NetworkTest for ReconfigurationTest { if count % 2 == 1 { let magic_number = 42; println!("Bump DiemVersion to {}", magic_number); - let update_txn = diem_root_account.sign_with_transaction_builder( + let update_txn = aptos_root_account.sign_with_transaction_builder( tx_factory.update_diem_version(allowed_nonce, magic_number), ); execute_and_wait_transactions( full_node_client, - &mut diem_root_account, + &mut aptos_root_account, vec![update_txn], ) .await diff --git a/testsuite/testcases/tests/forge-local-compatibility.rs b/testsuite/testcases/tests/forge-local-compatibility.rs index 58db00ab0f58a..56033ff76b9ce 100644 --- a/testsuite/testcases/tests/forge-local-compatibility.rs +++ b/testsuite/testcases/tests/forge-local-compatibility.rs @@ -6,7 +6,7 @@ use std::num::NonZeroUsize; use testcases::compatibility_test::SimpleValidatorUpgrade; fn main() -> Result<()> { - ::diem_logger::Logger::init_for_testing(); + ::aptos_logger::Logger::init_for_testing(); let tests = ForgeConfig::default() .with_initial_validator_count(NonZeroUsize::new(4).unwrap()) diff --git a/testsuite/testcases/tests/forge-local-performance.rs b/testsuite/testcases/tests/forge-local-performance.rs index 75230f699781c..d6e062a7f6a25 100644 --- a/testsuite/testcases/tests/forge-local-performance.rs +++ b/testsuite/testcases/tests/forge-local-performance.rs @@ -9,7 +9,7 @@ use testcases::{ }; fn main() -> Result<()> { - ::diem_logger::Logger::init_for_testing(); + ::aptos_logger::Logger::init_for_testing(); let tests = ForgeConfig::default() .with_initial_validator_count(NonZeroUsize::new(4).unwrap()) diff --git a/types/Cargo.toml b/types/Cargo.toml index ee6d1c0ca7721..7226fad9db42b 100644 --- a/types/Cargo.toml +++ b/types/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "diem-types" +name = "aptos-types" version = "0.0.3" authors = ["Diem Association "] description = "Diem types" @@ -28,11 +28,11 @@ thiserror = "1.0.24" tiny-keccak = { version = "2.0.2", default-features = false, features = ["sha3"] } bcs = "0.1.2" -diem-crypto = { path = "../crates/diem-crypto", version = "0.0.3" } -diem-crypto-derive = { path = "../crates/diem-crypto-derive", version = "0.0.3" } +aptos-crypto = { path = "../crates/aptos-crypto", version = "0.0.3" } +aptos-crypto-derive = { path = "../crates/aptos-crypto-derive", version = "0.0.3" } move-core-types = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860", version = "0.0.3" } move-read-write-set-types = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } -diem-workspace-hack = { version = "0.1", path = "../crates/diem-workspace-hack" } +aptos-workspace-hack = { version = "0.1", path = "../crates/aptos-workspace-hack" } [dev-dependencies] regex = "1.4.3" @@ -40,9 +40,9 @@ proptest = "1.0.0" proptest-derive = "0.3.0" serde_json = "1.0.64" -diem-crypto = { path = "../crates/diem-crypto", features = ["fuzzing"] } +aptos-crypto = { path = "../crates/aptos-crypto", features = ["fuzzing"] } move-core-types = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860", features = ["fuzzing"] } [features] default = [] -fuzzing = ["proptest", "proptest-derive", "diem-crypto/fuzzing", "move-core-types/fuzzing"] +fuzzing = ["proptest", "proptest-derive", "aptos-crypto/fuzzing", "move-core-types/fuzzing"] diff --git a/types/src/access_path.rs b/types/src/access_path.rs index b28ab275aa1f6..5ddc14644c6f6 100644 --- a/types/src/access_path.rs +++ b/types/src/access_path.rs @@ -36,7 +36,7 @@ //! `path` will be set to "/a" and use the `get_prefix()` method from statedb use crate::account_address::AccountAddress; -use diem_crypto::hash::HashValue; +use aptos_crypto::hash::HashValue; use move_core_types::language_storage::{ModuleId, ResourceKey, StructTag, CODE_TAG, RESOURCE_TAG}; #[cfg(any(test, feature = "fuzzing"))] use proptest_derive::Arbitrary; diff --git a/types/src/account_address.rs b/types/src/account_address.rs index 55c9cf0286deb..74f96376d91b3 100644 --- a/types/src/account_address.rs +++ b/types/src/account_address.rs @@ -1,7 +1,7 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 use crate::transaction::authenticator::AuthenticationKey; -use diem_crypto::{ +use aptos_crypto::{ ed25519::Ed25519PublicKey, hash::{CryptoHasher, HashValue}, x25519, @@ -31,7 +31,7 @@ pub fn from_identity_public_key(identity_public_key: x25519::PublicKey) -> Accou // with the imported `AccountAddress` from move-core-types. It needs to have the same name since // the hash salt is calculated using the name of the type. mod hasher { - #[derive(serde::Deserialize, diem_crypto_derive::CryptoHasher)] + #[derive(serde::Deserialize, aptos_crypto_derive::CryptoHasher)] struct AccountAddress; } @@ -50,7 +50,7 @@ impl HashAccountAddress for AccountAddress { #[cfg(test)] mod test { use super::{AccountAddress, HashAccountAddress}; - use diem_crypto::hash::HashValue; + use aptos_crypto::hash::HashValue; use hex::FromHex; #[test] diff --git a/types/src/account_config/constants/addresses.rs b/types/src/account_config/constants/addresses.rs index 37955f7580850..79e86f87e2524 100644 --- a/types/src/account_config/constants/addresses.rs +++ b/types/src/account_config/constants/addresses.rs @@ -5,7 +5,7 @@ use crate::account_address::AccountAddress; pub use move_core_types::language_storage::CORE_CODE_ADDRESS; -pub fn diem_root_address() -> AccountAddress { +pub fn aptos_root_address() -> AccountAddress { AccountAddress::from_hex_literal("0xA550C18") .expect("Parsing valid hex literal should always succeed") } diff --git a/types/src/account_config/events/create_account.rs b/types/src/account_config/events/create_account.rs index 47220fbdd214e..945d528e09e85 100644 --- a/types/src/account_config/events/create_account.rs +++ b/types/src/account_config/events/create_account.rs @@ -29,7 +29,7 @@ impl CreateAccountEvent { } pub fn event_key() -> EventKey { - EventKey::new_from_address(&account_config::diem_root_address(), 0) + EventKey::new_from_address(&account_config::aptos_root_address(), 0) } } diff --git a/types/src/account_config/resources/currency_info.rs b/types/src/account_config/resources/currency_info.rs index 2c9d391264fa4..1d436c2dfc628 100644 --- a/types/src/account_config/resources/currency_info.rs +++ b/types/src/account_config/resources/currency_info.rs @@ -4,7 +4,7 @@ use crate::{ access_path::AccessPath, account_config::constants::{ - diem_root_address, type_tag_for_currency_code, CORE_CODE_ADDRESS, DIEM_MODULE_IDENTIFIER, + aptos_root_address, type_tag_for_currency_code, CORE_CODE_ADDRESS, DIEM_MODULE_IDENTIFIER, }, event::EventHandle, }; @@ -116,7 +116,7 @@ impl CurrencyInfoResource { pub fn resource_path_for(currency_code: Identifier) -> AccessPath { let resource_key = ResourceKey::new( - diem_root_address(), + aptos_root_address(), CurrencyInfoResource::struct_tag_for(currency_code), ); AccessPath::resource_access_path(resource_key) diff --git a/types/src/account_state_blob.rs b/types/src/account_state_blob.rs index 694865e68694a..eed645237c75b 100644 --- a/types/src/account_state_blob.rs +++ b/types/src/account_state_blob.rs @@ -10,11 +10,11 @@ use crate::{ transaction::Version, }; use anyhow::{anyhow, ensure, Error, Result}; -use diem_crypto::{ +use aptos_crypto::{ hash::{CryptoHash, CryptoHasher}, HashValue, }; -use diem_crypto_derive::CryptoHasher; +use aptos_crypto_derive::CryptoHasher; #[cfg(any(test, feature = "fuzzing"))] use proptest::{arbitrary::Arbitrary, prelude::*}; #[cfg(any(test, feature = "fuzzing"))] diff --git a/types/src/block_info.rs b/types/src/block_info.rs index cd2a8a37ee83e..677fc1b8ff7bd 100644 --- a/types/src/block_info.rs +++ b/types/src/block_info.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 use crate::{epoch_state::EpochState, on_chain_config::ValidatorSet, transaction::Version}; -use diem_crypto::hash::{HashValue, ACCUMULATOR_PLACEHOLDER_HASH}; +use aptos_crypto::hash::{HashValue, ACCUMULATOR_PLACEHOLDER_HASH}; #[cfg(any(test, feature = "fuzzing"))] use proptest_derive::Arbitrary; use serde::{Deserialize, Serialize}; diff --git a/types/src/block_metadata.rs b/types/src/block_metadata.rs index 49427b99f24d2..dbb1e6ca93779 100644 --- a/types/src/block_metadata.rs +++ b/types/src/block_metadata.rs @@ -3,10 +3,10 @@ use crate::{ account_address::AccountAddress, - account_config::diem_root_address, + account_config::aptos_root_address, event::{EventHandle, EventKey}, }; -use diem_crypto::HashValue; +use aptos_crypto::HashValue; use move_core_types::{ ident_str, identifier::IdentStr, @@ -84,7 +84,7 @@ impl BlockMetadata { } pub fn new_block_event_key() -> EventKey { - EventKey::new_from_address(&diem_root_address(), 17) + EventKey::new_from_address(&aptos_root_address(), 17) } /// The path to the new block event handle under a DiemBlock::BlockMetadata resource. diff --git a/types/src/contract_event.rs b/types/src/contract_event.rs index 5b26f1b1a0284..614d23172f56f 100644 --- a/types/src/contract_event.rs +++ b/types/src/contract_event.rs @@ -14,8 +14,8 @@ use crate::{ transaction::Version, }; use anyhow::{ensure, Context, Error, Result}; -use diem_crypto::hash::CryptoHash; -use diem_crypto_derive::{BCSCryptoHash, CryptoHasher}; +use aptos_crypto::hash::CryptoHash; +use aptos_crypto_derive::{BCSCryptoHash, CryptoHasher}; use move_core_types::{language_storage::TypeTag, move_resource::MoveStructType}; #[cfg(any(test, feature = "fuzzing"))] diff --git a/types/src/diem_id_identifier.rs b/types/src/diem_id_identifier.rs index e16efa6608e5c..c0277ecbd68f4 100644 --- a/types/src/diem_id_identifier.rs +++ b/types/src/diem_id_identifier.rs @@ -238,7 +238,7 @@ fn test_invalid_vasp_domain_identifier() { assert!(identifier.is_ok()); // Test using "-" character is invalid - let raw_identifier = "diem-domain"; + let raw_identifier = "aptos-domain"; let identifier = DiemIdVaspDomainIdentifier::new(raw_identifier); assert_eq!( identifier.unwrap_err(), diff --git a/types/src/epoch_change.rs b/types/src/epoch_change.rs index 4622a96fd27ea..8b0aa652e4d55 100644 --- a/types/src/epoch_change.rs +++ b/types/src/epoch_change.rs @@ -138,7 +138,7 @@ mod tests { #[test] fn verify_epoch_change_proof() { use crate::{ledger_info::LedgerInfo, validator_verifier::random_validator_verifier}; - use diem_crypto::hash::HashValue; + use aptos_crypto::hash::HashValue; use std::collections::BTreeMap; let all_epoch: Vec = (1..=10).collect(); diff --git a/types/src/ledger_info.rs b/types/src/ledger_info.rs index 894c69a22545b..0a68027a7b7d4 100644 --- a/types/src/ledger_info.rs +++ b/types/src/ledger_info.rs @@ -9,8 +9,8 @@ use crate::{ transaction::Version, validator_verifier::{ValidatorVerifier, VerifyError}, }; -use diem_crypto::{ed25519::Ed25519Signature, hash::HashValue}; -use diem_crypto_derive::{BCSCryptoHash, CryptoHasher}; +use aptos_crypto::{ed25519::Ed25519Signature, hash::HashValue}; +use aptos_crypto_derive::{BCSCryptoHash, CryptoHasher}; #[cfg(any(test, feature = "fuzzing"))] use proptest_derive::Arbitrary; use serde::{Deserialize, Serialize}; diff --git a/types/src/network_address/mod.rs b/types/src/network_address/mod.rs index 256321f68894b..c03bf1352c4e4 100644 --- a/types/src/network_address/mod.rs +++ b/types/src/network_address/mod.rs @@ -1,7 +1,7 @@ // Copyright (c) The Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -use diem_crypto::{ +use aptos_crypto::{ traits::{CryptoMaterialError, ValidCryptoMaterialStringExt}, x25519, }; @@ -88,7 +88,7 @@ const MAX_DNS_NAME_SIZE: usize = 255; /// // \ '-- uvarint number of protocols /// // '-- length of encoded network address /// -/// use diem_types::network_address::NetworkAddress; +/// use aptos_types::network_address::NetworkAddress; /// use bcs; /// use std::{str::FromStr, convert::TryFrom}; /// @@ -218,8 +218,8 @@ impl NetworkAddress { /// ### Example /// /// ```rust - /// use diem_crypto::{traits::ValidCryptoMaterialStringExt, x25519}; - /// use diem_types::network_address::NetworkAddress; + /// use aptos_crypto::{traits::ValidCryptoMaterialStringExt, x25519}; + /// use aptos_types::network_address::NetworkAddress; /// use std::str::FromStr; /// /// let pubkey_str = "080e287879c918794170e258bfaddd75acac5b3e350419044655e4983a487120"; @@ -260,7 +260,7 @@ impl NetworkAddress { /// ### Example /// /// ```rust - /// use diem_types::network_address::NetworkAddress; + /// use aptos_types::network_address::NetworkAddress; /// use std::str::FromStr; /// /// let addr_str = "/ip4/1.2.3.4/tcp/6180/ln-noise-ik/080e287879c918794170e258bfaddd75acac5b3e350419044655e4983a487120/ln-handshake/0"; diff --git a/types/src/nibble/mod.rs b/types/src/nibble/mod.rs index aee0635491ade..c34c830ee6475 100644 --- a/types/src/nibble/mod.rs +++ b/types/src/nibble/mod.rs @@ -7,7 +7,7 @@ pub mod nibble_path; -use diem_crypto::HashValue; +use aptos_crypto::HashValue; #[cfg(any(test, feature = "fuzzing"))] use proptest::prelude::*; use serde::{Deserialize, Serialize}; diff --git a/types/src/on_chain_config/mod.rs b/types/src/on_chain_config/mod.rs index 859ea3f815d32..69931b9612eab 100644 --- a/types/src/on_chain_config/mod.rs +++ b/types/src/on_chain_config/mod.rs @@ -127,7 +127,7 @@ pub trait ConfigStorage { /// Trait to be implemented by a Rust struct representation of an on-chain config /// that is stored in storage as a serialized byte array pub trait OnChainConfig: Send + Sync + DeserializeOwned { - // diem_root_address + // aptos_root_address const ADDRESS: &'static str = CONFIG_ADDRESS_STR; const IDENTIFIER: &'static str; const CONFIG_ID: ConfigID = ConfigID(Self::ADDRESS, Self::IDENTIFIER); @@ -247,7 +247,7 @@ impl Default for ConfigurationResource { Self { epoch: 0, last_reconfiguration_time: 0, - events: EventHandle::new_from_address(&crate::account_config::diem_root_address(), 16), + events: EventHandle::new_from_address(&crate::account_config::aptos_root_address(), 16), } } } diff --git a/types/src/on_chain_config/vm_publishing_option.rs b/types/src/on_chain_config/vm_publishing_option.rs index 2c266630f92a1..da5cbce2d1823 100644 --- a/types/src/on_chain_config/vm_publishing_option.rs +++ b/types/src/on_chain_config/vm_publishing_option.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 use crate::on_chain_config::OnChainConfig; -use diem_crypto::HashValue; +use aptos_crypto::HashValue; use serde::{Deserialize, Serialize}; /// Defines and holds the publishing policies for the VM. There are three possible configurations: diff --git a/types/src/proof/accumulator/accumulator_test.rs b/types/src/proof/accumulator/accumulator_test.rs index 0cf30bf0dc37d..1caf824264218 100644 --- a/types/src/proof/accumulator/accumulator_test.rs +++ b/types/src/proof/accumulator/accumulator_test.rs @@ -7,7 +7,7 @@ use crate::proof::{ position::{FrozenSubtreeSiblingIterator, Position}, TestAccumulatorInternalNode, }; -use diem_crypto::{ +use aptos_crypto::{ hash::{CryptoHash, TestOnlyHash, TestOnlyHasher, ACCUMULATOR_PLACEHOLDER_HASH}, HashValue, }; diff --git a/types/src/proof/accumulator/mock.rs b/types/src/proof/accumulator/mock.rs index be4dcc77e69b8..81cd4c2de8341 100644 --- a/types/src/proof/accumulator/mock.rs +++ b/types/src/proof/accumulator/mock.rs @@ -5,7 +5,7 @@ use crate::{ proof::{AccumulatorConsistencyProof, MerkleTreeInternalNode, TransactionAccumulatorSummary}, transaction::Version, }; -use diem_crypto::hash::{ +use aptos_crypto::hash::{ CryptoHash, HashValue, TransactionAccumulatorHasher, ACCUMULATOR_PLACEHOLDER_HASH, }; use std::{cell::RefCell, collections::HashMap}; diff --git a/types/src/proof/accumulator/mod.rs b/types/src/proof/accumulator/mod.rs index f75e6603fece2..dc3cbcc578d4e 100644 --- a/types/src/proof/accumulator/mod.rs +++ b/types/src/proof/accumulator/mod.rs @@ -19,7 +19,7 @@ pub mod mock; use super::MerkleTreeInternalNode; use crate::proof::definition::{LeafCount, MAX_ACCUMULATOR_LEAVES}; use anyhow::{ensure, format_err, Result}; -use diem_crypto::{ +use aptos_crypto::{ hash::{ CryptoHash, CryptoHasher, ACCUMULATOR_PLACEHOLDER_HASH, SPARSE_MERKLE_PLACEHOLDER_HASH, }, diff --git a/types/src/proof/definition.rs b/types/src/proof/definition.rs index bdeb4de87d1fe..ebbd6f5dac92a 100644 --- a/types/src/proof/definition.rs +++ b/types/src/proof/definition.rs @@ -14,8 +14,8 @@ use crate::{ }; use anyhow::{bail, ensure, format_err, Context, Result}; #[cfg(any(test, feature = "fuzzing"))] -use diem_crypto::hash::TestOnlyHasher; -use diem_crypto::{ +use aptos_crypto::hash::TestOnlyHasher; +use aptos_crypto::{ hash::{ CryptoHash, CryptoHasher, EventAccumulatorHasher, TransactionAccumulatorHasher, SPARSE_MERKLE_PLACEHOLDER_HASH, diff --git a/types/src/proof/mod.rs b/types/src/proof/mod.rs index efe5e8c6c1cdc..645b97a7b51b8 100644 --- a/types/src/proof/mod.rs +++ b/types/src/proof/mod.rs @@ -15,14 +15,14 @@ use crate::{ transaction::{TransactionInfo, Version}, }; use anyhow::{ensure, Result}; -use diem_crypto::{ +use aptos_crypto::{ hash::{ CryptoHash, CryptoHasher, EventAccumulatorHasher, SparseMerkleInternalHasher, TestOnlyHasher, TransactionAccumulatorHasher, }, HashValue, }; -use diem_crypto_derive::CryptoHasher; +use aptos_crypto_derive::CryptoHasher; #[cfg(any(test, feature = "fuzzing"))] use proptest_derive::Arbitrary; use serde::{Deserialize, Serialize}; diff --git a/types/src/proof/proptest_proof.rs b/types/src/proof/proptest_proof.rs index 35faa2b735f84..5e7fd80442290 100644 --- a/types/src/proof/proptest_proof.rs +++ b/types/src/proof/proptest_proof.rs @@ -9,7 +9,7 @@ use crate::proof::{ AccumulatorRangeProof, SparseMerkleLeafNode, SparseMerkleProof, SparseMerkleRangeProof, TransactionAccumulatorSummary, }; -use diem_crypto::{ +use aptos_crypto::{ hash::{ CryptoHash, CryptoHasher, ACCUMULATOR_PLACEHOLDER_HASH, SPARSE_MERKLE_PLACEHOLDER_HASH, }, diff --git a/types/src/proof/unit_tests/proof_test.rs b/types/src/proof/unit_tests/proof_test.rs index f766fdf8d9397..2227ba869c1f7 100644 --- a/types/src/proof/unit_tests/proof_test.rs +++ b/types/src/proof/unit_tests/proof_test.rs @@ -25,7 +25,7 @@ use crate::{ vm_status::KeptVMStatus, write_set::WriteSet, }; -use diem_crypto::{ +use aptos_crypto::{ ed25519::Ed25519PrivateKey, hash::{ CryptoHash, TestOnlyHash, TestOnlyHasher, ACCUMULATOR_PLACEHOLDER_HASH, GENESIS_BLOCK_ID, diff --git a/types/src/proptest_types.rs b/types/src/proptest_types.rs index 22da791e81270..3a32723cf05d1 100644 --- a/types/src/proptest_types.rs +++ b/types/src/proptest_types.rs @@ -29,7 +29,7 @@ use crate::{ vm_status::{KeptVMStatus, VMStatus}, write_set::{WriteOp, WriteSet, WriteSetMut}, }; -use diem_crypto::{ +use aptos_crypto::{ ed25519::{self, Ed25519PrivateKey, Ed25519PublicKey, Ed25519Signature}, test_utils::KeyPair, traits::*, diff --git a/types/src/test_helpers/transaction_test_helpers.rs b/types/src/test_helpers/transaction_test_helpers.rs index 19e064928241a..77fade3256b34 100644 --- a/types/src/test_helpers/transaction_test_helpers.rs +++ b/types/src/test_helpers/transaction_test_helpers.rs @@ -11,7 +11,7 @@ use crate::{ }, write_set::WriteSet, }; -use diem_crypto::{ed25519::*, traits::*}; +use aptos_crypto::{ed25519::*, traits::*}; const MAX_GAS_AMOUNT: u64 = 1_000_000; const TEST_GAS_PRICE: u64 = 0; diff --git a/types/src/transaction/authenticator.rs b/types/src/transaction/authenticator.rs index 3bedc82dae7d4..f07a59449e988 100644 --- a/types/src/transaction/authenticator.rs +++ b/types/src/transaction/authenticator.rs @@ -6,7 +6,7 @@ use crate::{ transaction::{RawTransaction, RawTransactionWithData}, }; use anyhow::{ensure, Error, Result}; -use diem_crypto::{ +use aptos_crypto::{ ed25519::{Ed25519PublicKey, Ed25519Signature}, hash::CryptoHash, multi_ed25519::{MultiEd25519PublicKey, MultiEd25519Signature}, @@ -14,7 +14,7 @@ use diem_crypto::{ validatable::Validatable, CryptoMaterialError, HashValue, ValidCryptoMaterial, ValidCryptoMaterialStringExt, }; -use diem_crypto_derive::{CryptoHasher, DeserializeKey, SerializeKey}; +use aptos_crypto_derive::{CryptoHasher, DeserializeKey, SerializeKey}; #[cfg(any(test, feature = "fuzzing"))] use proptest_derive::Arbitrary; use rand::{rngs::OsRng, Rng}; diff --git a/types/src/transaction/helpers.rs b/types/src/transaction/helpers.rs index a31357d74fb4e..0d0db49ffebf7 100644 --- a/types/src/transaction/helpers.rs +++ b/types/src/transaction/helpers.rs @@ -7,8 +7,8 @@ use crate::{ transaction::{RawTransaction, SignedTransaction, TransactionPayload}, }; use anyhow::Result; +use aptos_crypto::{ed25519::*, test_utils::KeyPair, traits::SigningKey}; use chrono::Utc; -use diem_crypto::{ed25519::*, test_utils::KeyPair, traits::SigningKey}; pub fn create_unsigned_txn( payload: TransactionPayload, diff --git a/types/src/transaction/mod.rs b/types/src/transaction/mod.rs index 68c6a86dd7149..74eb53de9228c 100644 --- a/types/src/transaction/mod.rs +++ b/types/src/transaction/mod.rs @@ -18,14 +18,14 @@ use crate::{ write_set::WriteSet, }; use anyhow::{ensure, format_err, Error, Result}; -use diem_crypto::{ +use aptos_crypto::{ ed25519::*, hash::{CryptoHash, EventAccumulatorHasher}, multi_ed25519::{MultiEd25519PublicKey, MultiEd25519Signature}, traits::{signing_message, SigningKey}, HashValue, }; -use diem_crypto_derive::{BCSCryptoHash, CryptoHasher}; +use aptos_crypto_derive::{BCSCryptoHash, CryptoHasher}; use move_core_types::transaction_argument::convert_txn_args; #[cfg(any(test, feature = "fuzzing"))] use proptest_derive::Arbitrary; diff --git a/types/src/trusted_state.rs b/types/src/trusted_state.rs index 067fc32aaf324..bff7ebd25e699 100644 --- a/types/src/trusted_state.rs +++ b/types/src/trusted_state.rs @@ -11,8 +11,8 @@ use crate::{ waypoint::Waypoint, }; use anyhow::{bail, ensure, format_err, Result}; -use diem_crypto::HashValue; -use diem_crypto_derive::{BCSCryptoHash, CryptoHasher}; +use aptos_crypto::HashValue; +use aptos_crypto_derive::{BCSCryptoHash, CryptoHasher}; #[cfg(any(test, feature = "fuzzing"))] use proptest_derive::Arbitrary; use serde::{Deserialize, Serialize}; diff --git a/types/src/unit_tests/transaction_test.rs b/types/src/unit_tests/transaction_test.rs index 82003eb43cc9d..10ee93faae6c9 100644 --- a/types/src/unit_tests/transaction_test.rs +++ b/types/src/unit_tests/transaction_test.rs @@ -11,11 +11,11 @@ use crate::{ TransactionWithProof, }, }; -use bcs::test_helpers::assert_canonical_encode_decode; -use diem_crypto::{ +use aptos_crypto::{ ed25519::{self, Ed25519PrivateKey, Ed25519Signature}, PrivateKey, Uniform, }; +use bcs::test_helpers::assert_canonical_encode_decode; use proptest::prelude::*; use std::convert::TryFrom; diff --git a/types/src/unit_tests/trusted_state_test.rs b/types/src/unit_tests/trusted_state_test.rs index 1520404848107..d43da61d02401 100644 --- a/types/src/unit_tests/trusted_state_test.rs +++ b/types/src/unit_tests/trusted_state_test.rs @@ -14,11 +14,11 @@ use crate::{ validator_verifier::{random_validator_verifier, ValidatorConsensusInfo, ValidatorVerifier}, waypoint::Waypoint, }; -use bcs::test_helpers::assert_canonical_encode_decode; -use diem_crypto::{ +use aptos_crypto::{ ed25519::Ed25519Signature, hash::{CryptoHash, CryptoHasher, HashValue}, }; +use bcs::test_helpers::assert_canonical_encode_decode; use proptest::{ collection::{size_range, vec, SizeRange}, prelude::*, diff --git a/types/src/validator_config.rs b/types/src/validator_config.rs index 26137da140c23..4b1f4b2cd9591 100644 --- a/types/src/validator_config.rs +++ b/types/src/validator_config.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 use crate::{account_address::AccountAddress, network_address::NetworkAddress}; -use diem_crypto::ed25519::Ed25519PublicKey; +use aptos_crypto::ed25519::Ed25519PublicKey; use move_core_types::{ ident_str, identifier::IdentStr, diff --git a/types/src/validator_info.rs b/types/src/validator_info.rs index 7278917e235a3..e6113dd132cf9 100644 --- a/types/src/validator_info.rs +++ b/types/src/validator_info.rs @@ -4,7 +4,7 @@ #[cfg(any(test, feature = "fuzzing"))] use crate::network_address::NetworkAddress; use crate::{account_address::AccountAddress, validator_config::ValidatorConfig}; -use diem_crypto::ed25519::Ed25519PublicKey; +use aptos_crypto::ed25519::Ed25519PublicKey; #[cfg(any(test, feature = "fuzzing"))] use proptest_derive::Arbitrary; use serde::{Deserialize, Serialize}; diff --git a/types/src/validator_signer.rs b/types/src/validator_signer.rs index cc23d82a949e4..984c44c36f2ef 100644 --- a/types/src/validator_signer.rs +++ b/types/src/validator_signer.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 use crate::account_address::AccountAddress; -use diem_crypto::{ +use aptos_crypto::{ ed25519::{Ed25519PrivateKey, Ed25519PublicKey, Ed25519Signature}, hash::CryptoHash, test_utils::TEST_SEED, @@ -78,7 +78,7 @@ impl ValidatorSigner { #[cfg(any(test, feature = "fuzzing"))] pub mod proptests { use super::*; - use diem_crypto::Genesis; + use aptos_crypto::Genesis; use proptest::{prelude::*, sample, strategy::LazyJust}; #[allow(clippy::redundant_closure)] diff --git a/types/src/validator_verifier.rs b/types/src/validator_verifier.rs index 27a8faa8fcc8a..04c3ff04b4991 100644 --- a/types/src/validator_verifier.rs +++ b/types/src/validator_verifier.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 use crate::{account_address::AccountAddress, on_chain_config::ValidatorSet}; -use diem_crypto::{ +use aptos_crypto::{ ed25519::{Ed25519PublicKey, Ed25519Signature}, hash::CryptoHash, Signature, VerifyingKey, @@ -379,7 +379,7 @@ pub fn random_validator_verifier( mod tests { use super::*; use crate::validator_signer::ValidatorSigner; - use diem_crypto::test_utils::{TestDiemCrypto, TEST_SEED}; + use aptos_crypto::test_utils::{TestDiemCrypto, TEST_SEED}; use std::collections::BTreeMap; #[test] diff --git a/types/src/waypoint.rs b/types/src/waypoint.rs index 1e4b799c8fbc9..9192d3a7ce8eb 100644 --- a/types/src/waypoint.rs +++ b/types/src/waypoint.rs @@ -8,8 +8,8 @@ use crate::{ transaction::Version, }; use anyhow::{ensure, format_err, Error, Result}; -use diem_crypto::hash::{CryptoHash, HashValue}; -use diem_crypto_derive::{BCSCryptoHash, CryptoHasher}; +use aptos_crypto::hash::{CryptoHash, HashValue}; +use aptos_crypto_derive::{BCSCryptoHash, CryptoHasher}; #[cfg(any(test, feature = "fuzzing"))] use proptest_derive::Arbitrary; use serde::{de::Error as _, Deserialize, Deserializer, Serialize, Serializer}; diff --git a/vm-validator/Cargo.toml b/vm-validator/Cargo.toml index 221211a32339a..84903d8bfd99b 100644 --- a/vm-validator/Cargo.toml +++ b/vm-validator/Cargo.toml @@ -13,10 +13,10 @@ edition = "2018" anyhow = "1.0.52" fail = "0.4.0" scratchpad = { path = "../storage/scratchpad" } -diem-state-view = { path = "../storage/state-view" } -diem-types = { path = "../types" } -diem-vm = { path = "../diem-move/diem-vm" } -diem-workspace-hack = { version = "0.1", path = "../crates/diem-workspace-hack" } +aptos-state-view = { path = "../storage/state-view" } +aptos-types = { path = "../types" } +aptos-vm = { path = "../aptos-move/aptos-vm" } +aptos-workspace-hack = { version = "0.1", path = "../crates/aptos-workspace-hack" } executor = { path = "../execution/executor" } storage-interface = { path = "../storage/storage-interface" } @@ -24,16 +24,16 @@ storage-interface = { path = "../storage/storage-interface" } rand = "0.8.3" executor-test-helpers = { path = "../execution/executor-test-helpers" } -diem-crypto = { path = "../crates/diem-crypto", features = ["fuzzing"] } -diem-temppath = { path = "../crates/diem-temppath" } -diem-transaction-builder = { path = "../sdk/transaction-builder" } -diem-types = { path = "../types", features = ["fuzzing"] } -diem-vm = { path = "../diem-move/diem-vm" } -diemdb = { path = "../storage/diemdb", features = ["fuzzing"] } -vm-genesis = { path = "../diem-move/vm-genesis" } +aptos-crypto = { path = "../crates/aptos-crypto", features = ["fuzzing"] } +aptos-temppath = { path = "../crates/aptos-temppath" } +aptos-transaction-builder = { path = "../sdk/transaction-builder" } +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/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" } [features] default = [] failpoints = ["fail/failpoints"] -fuzzing = ["diem-types/fuzzing", "diem-crypto/fuzzing", "diemdb/fuzzing"] +fuzzing = ["aptos-types/fuzzing", "aptos-crypto/fuzzing", "aptosdb/fuzzing"] diff --git a/vm-validator/src/mocks/mock_vm_validator.rs b/vm-validator/src/mocks/mock_vm_validator.rs index 0e25b06c98760..663d2e9a178ac 100644 --- a/vm-validator/src/mocks/mock_vm_validator.rs +++ b/vm-validator/src/mocks/mock_vm_validator.rs @@ -3,14 +3,14 @@ use crate::vm_validator::TransactionValidation; use anyhow::Result; -use diem_state_view::StateView; -use diem_types::{ +use aptos_state_view::StateView; +use aptos_types::{ account_address::AccountAddress, on_chain_config::OnChainConfigPayload, transaction::{SignedTransaction, VMValidatorResult}, vm_status::StatusCode, }; -use diem_vm::VMValidator; +use aptos_vm::VMValidator; pub const ACCOUNT_DNE_TEST_ADD: AccountAddress = AccountAddress::new([0_u8; AccountAddress::LENGTH]); diff --git a/vm-validator/src/unit_tests/vm_validator_test.rs b/vm-validator/src/unit_tests/vm_validator_test.rs index 6daa85d155421..b836090e06140 100644 --- a/vm-validator/src/unit_tests/vm_validator_test.rs +++ b/vm-validator/src/unit_tests/vm_validator_test.rs @@ -2,9 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 use crate::vm_validator::{TransactionValidation, VMValidator}; -use diem_crypto::{ed25519::Ed25519PrivateKey, PrivateKey, Uniform}; -use diem_transaction_builder::stdlib::encode_peer_to_peer_with_metadata_script; -use diem_types::{ +use aptos_crypto::{ed25519::Ed25519PrivateKey, PrivateKey, Uniform}; +use aptos_transaction_builder::stdlib::encode_peer_to_peer_with_metadata_script; +use aptos_types::{ account_address, account_config, account_config::{xus_tag, XUS_NAME}, chain_id::ChainId, @@ -12,8 +12,8 @@ use diem_types::{ transaction::{Module, Script, TransactionArgument, TransactionPayload}, vm_status::StatusCode, }; -use diem_vm::DiemVM; -use diemdb::DiemDB; +use aptos_vm::DiemVM; +use aptosdb::DiemDB; use move_core_types::gas_schedule::{GasAlgebra, GasConstants, MAX_TRANSACTION_SIZE_IN_BYTES}; use rand::SeedableRng; use std::u64; @@ -21,12 +21,12 @@ use storage_interface::DbReaderWriter; struct TestValidator { vm_validator: VMValidator, - _db_path: diem_temppath::TempPath, + _db_path: aptos_temppath::TempPath, } impl TestValidator { fn new() -> Self { - let _db_path = diem_temppath::TempPath::new(); + let _db_path = aptos_temppath::TempPath::new(); _db_path.create_as_dir().unwrap(); let (db, db_rw) = DbReaderWriter::wrap(DiemDB::new_for_test(_db_path.path())); executor_test_helpers::bootstrap_genesis::( @@ -77,7 +77,7 @@ impl std::ops::Deref for TestValidator { fn test_validate_transaction() { let vm_validator = TestValidator::new(); - let address = account_config::diem_root_address(); + let address = account_config::aptos_root_address(); let program = encode_peer_to_peer_with_metadata_script(xus_tag(), address, 100, vec![], vec![]); let transaction = transaction_test_helpers::get_test_signed_txn( address, @@ -98,7 +98,7 @@ fn test_validate_invalid_signature() { let other_private_key = Ed25519PrivateKey::generate(&mut rng); // Submit with an account using an different private/public keypair - let address = account_config::diem_root_address(); + let address = account_config::aptos_root_address(); let program = encode_peer_to_peer_with_metadata_script(xus_tag(), address, 100, vec![], vec![]); let transaction = transaction_test_helpers::get_test_unchecked_txn( address, @@ -115,7 +115,7 @@ fn test_validate_invalid_signature() { fn test_validate_known_script_too_large_args() { let vm_validator = TestValidator::new(); - let address = account_config::diem_root_address(); + let address = account_config::aptos_root_address(); let transaction = transaction_test_helpers::get_test_signed_transaction( address, 1, @@ -146,7 +146,7 @@ fn test_validate_known_script_too_large_args() { fn test_validate_max_gas_units_above_max() { let vm_validator = TestValidator::new(); - let address = account_config::diem_root_address(); + let address = account_config::aptos_root_address(); let transaction = transaction_test_helpers::get_test_signed_transaction( address, 1, @@ -169,7 +169,7 @@ fn test_validate_max_gas_units_above_max() { fn test_validate_max_gas_units_below_min() { let vm_validator = TestValidator::new(); - let address = account_config::diem_root_address(); + let address = account_config::aptos_root_address(); // Calculate a size for the transaction script that will ensure // that the minimum transaction gas is at least 1 after scaling to the // external gas units. @@ -202,7 +202,7 @@ fn test_validate_max_gas_units_below_min() { fn test_validate_max_gas_price_above_bounds() { let vm_validator = TestValidator::new(); - let address = account_config::diem_root_address(); + let address = account_config::aptos_root_address(); let transaction = transaction_test_helpers::get_test_signed_transaction( address, 1, @@ -228,7 +228,7 @@ fn test_validate_max_gas_price_above_bounds() { fn test_validate_max_gas_price_below_bounds() { let vm_validator = TestValidator::new(); - let address = account_config::diem_root_address(); + let address = account_config::aptos_root_address(); let program = encode_peer_to_peer_with_metadata_script(xus_tag(), address, 100, vec![], vec![]); let transaction = transaction_test_helpers::get_test_signed_transaction( address, @@ -276,7 +276,7 @@ fn test_validate_unknown_script() { fn test_validate_module_publishing() { let vm_validator = TestValidator::new(); - let address = account_config::diem_root_address(); + let address = account_config::aptos_root_address(); let transaction = transaction_test_helpers::get_test_signed_module_publishing_transaction( address, 1, @@ -313,7 +313,7 @@ fn test_validate_invalid_auth_key() { let other_private_key = Ed25519PrivateKey::generate(&mut rng); // Submit with an account using an different private/public keypair - let address = account_config::diem_root_address(); + let address = account_config::aptos_root_address(); let program = encode_peer_to_peer_with_metadata_script(xus_tag(), address, 100, vec![], vec![]); let transaction = transaction_test_helpers::get_test_signed_txn( address, @@ -330,7 +330,7 @@ fn test_validate_invalid_auth_key() { fn test_validate_account_doesnt_exist() { let vm_validator = TestValidator::new(); - let address = account_config::diem_root_address(); + let address = account_config::aptos_root_address(); let random_account_addr = account_address::AccountAddress::random(); let program = encode_peer_to_peer_with_metadata_script(xus_tag(), address, 100, vec![], vec![]); let transaction = transaction_test_helpers::get_test_signed_transaction( @@ -355,7 +355,7 @@ fn test_validate_account_doesnt_exist() { fn test_validate_sequence_number_too_new() { let vm_validator = TestValidator::new(); - let address = account_config::diem_root_address(); + let address = account_config::aptos_root_address(); let program = encode_peer_to_peer_with_metadata_script(xus_tag(), address, 100, vec![], vec![]); let transaction = transaction_test_helpers::get_test_signed_txn( address, @@ -372,7 +372,7 @@ fn test_validate_sequence_number_too_new() { fn test_validate_invalid_arguments() { let vm_validator = TestValidator::new(); - let address = account_config::diem_root_address(); + let address = account_config::aptos_root_address(); let (program_script, _, _) = encode_peer_to_peer_with_metadata_script(xus_tag(), address, 100, vec![], vec![]) .into_inner(); @@ -394,7 +394,7 @@ fn test_validate_non_genesis_write_set() { let vm_validator = TestValidator::new(); // Confirm that a correct transaction is validated successfully. - let address = account_config::diem_root_address(); + let address = account_config::aptos_root_address(); let transaction = transaction_test_helpers::get_write_set_txn( address, 1, @@ -423,7 +423,7 @@ fn test_validate_non_genesis_write_set() { fn test_validate_expiration_time() { let vm_validator = TestValidator::new(); - let address = account_config::diem_root_address(); + let address = account_config::aptos_root_address(); let transaction = transaction_test_helpers::get_test_signed_transaction( address, 1, /* sequence_number */ @@ -443,7 +443,7 @@ fn test_validate_expiration_time() { fn test_validate_chain_id() { let vm_validator = TestValidator::new(); - let address = account_config::diem_root_address(); + let address = account_config::aptos_root_address(); let transaction = transaction_test_helpers::get_test_txn_with_chain_id( address, 0, /* sequence_number */ @@ -460,7 +460,7 @@ fn test_validate_chain_id() { fn test_validate_gas_currency_with_bad_identifier() { let vm_validator = TestValidator::new(); - let address = account_config::diem_root_address(); + let address = account_config::aptos_root_address(); let transaction = transaction_test_helpers::get_test_signed_transaction( address, 1, /* sequence_number */ @@ -482,7 +482,7 @@ fn test_validate_gas_currency_with_bad_identifier() { fn test_validate_gas_currency_code() { let vm_validator = TestValidator::new(); - let address = account_config::diem_root_address(); + let address = account_config::aptos_root_address(); let transaction = transaction_test_helpers::get_test_signed_transaction( address, 1, /* sequence_number */ diff --git a/vm-validator/src/vm_validator.rs b/vm-validator/src/vm_validator.rs index ff609181f9285..a73ad67fcaf7d 100644 --- a/vm-validator/src/vm_validator.rs +++ b/vm-validator/src/vm_validator.rs @@ -2,15 +2,15 @@ // SPDX-License-Identifier: Apache-2.0 use anyhow::Result; -use diem_state_view::StateViewId; -use diem_types::{ +use aptos_state_view::StateViewId; +use aptos_types::{ account_address::AccountAddress, account_config::{AccountResource, AccountSequenceInfo}, account_state::AccountState, on_chain_config::{DiemVersion, OnChainConfigPayload, VMConfig, VMPublishingOption}, transaction::{SignedTransaction, VMValidatorResult}, }; -use diem_vm::DiemVM; +use aptos_vm::DiemVM; use executor::components::apply_chunk_output::IntoLedgerView; use fail::fail_point; use std::{convert::TryFrom, sync::Arc}; @@ -21,7 +21,7 @@ use storage_interface::{state_view::VerifiedStateView, DbReader}; mod vm_validator_test; pub trait TransactionValidation: Send + Sync + Clone { - type ValidationInstance: diem_vm::VMValidator; + type ValidationInstance: aptos_vm::VMValidator; /// Validate a txn from client fn validate_transaction(&self, _txn: SignedTransaction) -> Result; @@ -83,7 +83,7 @@ impl TransactionValidation for VMValidator { "Injected error in vm_validator::validate_transaction" )) }); - use diem_vm::VMValidator; + use aptos_vm::VMValidator; Ok(self.vm.validate_transaction(txn, &self.cached_state_view)) } diff --git a/x.toml b/x.toml index b1fdd3f873ee9..42cac1cf6b7b8 100644 --- a/x.toml +++ b/x.toml @@ -50,7 +50,7 @@ warn = [ [hakari] resolver = "2" -hakari-package = "diem-workspace-hack" +hakari-package = "aptos-workspace-hack" exact-versions = true platforms = [ "x86_64-unknown-linux-gnu", @@ -64,8 +64,8 @@ platforms = [ [hakari.traversal-excludes] workspace-members = [ # Don't consider the crypto packages as they do weird things with mutually exclusive features. - "diem-crypto", - "diem-crypto-derive", + "aptos-crypto", + "aptos-crypto-derive", # Also exclude the devtools packages since they get compiled with a different set of options. "x", @@ -101,7 +101,7 @@ target-features = "all" [summaries.default.omitted-packages] workspace-members = [ - "diem-workspace-hack", + "aptos-workspace-hack", ] [summaries.full] @@ -165,19 +165,19 @@ members = [ # Please keep this list in alphabetical order! "testcases", + "aptos-documentation-tool", + "aptos-e2e-tests-replay", "aptos-framework-releases", - "diem-documentation-tool", - "diem-e2e-tests-replay", + "aptos-fuzz", + "aptos-fuzzer", + "aptos-keygen", + "aptos-proptest-helpers", + "aptos-retrier", + "aptos-transactional-test-harness", + "aptos-transaction-benchmarks", + "aptos-wallet", + "aptos-writeset-generator", "diem-experimental-framework-releases", - "diem-fuzz", - "diem-fuzzer", - "diem-keygen", - "diem-proptest-helpers", - "diem-retrier", - "diem-transactional-test-harness", - "diem-transaction-benchmarks", - "diem-wallet", - "diem-writeset-generator", "executor-benchmark", "executor-test-helpers", "forge", @@ -197,7 +197,7 @@ members = [ # Please keep this list in alphabetical order! ] -[workspace.move-to-diem-deps] +[workspace.move-to-aptos-deps] # By default, all crates in the language directory are considered Move crates # and are forbidden from depending on any Diem crates. # @@ -207,7 +207,7 @@ members = [ # Note: if your crate is indeed a Move crate and you are getting the linter # yelling at you, you should redesign your crate and properly remove that # dependency, instead of adding the crate to this list and silencing the lint. -diem_crates_in_language = [ +aptos_crates_in_language = [ ] # A special set of diem crates Move crates are allowed to depend on. # @@ -218,7 +218,7 @@ diem_crates_in_language = [ # about Move crates depending on Diem ones. Again, you should instead fix # the design of your crate so it doesn't have to depend on Diem. exclude = [ - "diem-workspace-hack", + "aptos-workspace-hack", ] # Interesting subsets of the workspace, These are used for generating and @@ -241,9 +241,9 @@ root-members = [ root-members = [ "backup-cli", "db-bootstrapper", - "diem-genesis-tool", - "diem-node", - "diem-operational-tool", + "aptos-genesis-tool", + "aptos-node", + "aptos-operational-tool", "execution-correctness", "safety-rules", ] @@ -279,7 +279,7 @@ mark-changed = [] [[determinator.path-rule]] # Required by get_stdlib_script_abis in transaction-builder-generator. -globs = ["diem-move/diem-framework/DPN/releases/artifacts/current/**/*"] +globs = ["aptos-move/diem-framework/DPN/releases/artifacts/current/**/*"] mark-changed = ["transaction-builder-generator"] post-rule = "skip-rules"