diff --git a/.backportrc.json b/.backportrc.json
new file mode 100644
index 0000000000000..c790f84c9eb78
--- /dev/null
+++ b/.backportrc.json
@@ -0,0 +1,12 @@
+{
+ "repoOwner": "aptos-labs",
+ "repoName": "aptos-core",
+
+ "branchLabelMapping": {
+ "^v(\\d+).(\\d+)$": "aptos-release-v$1.$2"
+ },
+ "commitConflicts": true,
+ "prTitle": "[cp][{{targetBranch}}] {{sourcePullRequest.title}}",
+ "targetPRLabels": ["cherry-pick"],
+ "assignees": ["thepomeranian"]
+}
diff --git a/.dockerignore b/.dockerignore
index 34ec98bf8c62c..3a4bd7c40a38b 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -20,7 +20,7 @@
!**/*.errmap
!config/src/config/test_data
!aptos-move/aptos-gas-profiling/templates/
-!aptos-move/aptos-release-builder/data/release.yaml
+!aptos-move/aptos-release-builder/data/*.yaml
!aptos-move/aptos-release-builder/data/proposals/*
!aptos-move/framework/
!aptos-move/move-examples/hello_blockchain/
diff --git a/.github/actions/rust-check-merge-base/action.yaml b/.github/actions/rust-check-merge-base/action.yaml
new file mode 100644
index 0000000000000..32906536122b2
--- /dev/null
+++ b/.github/actions/rust-check-merge-base/action.yaml
@@ -0,0 +1,19 @@
+name: Rust Check Merge Base
+description: Runs the rust merge base freshness check
+inputs:
+ GIT_CREDENTIALS:
+ description: "Optional credentials to pass to git. Useful if you need to pull private repos for dependencies"
+ required: false
+
+runs:
+ using: composite
+ steps:
+ # The source code must be checked out by the workflow that invokes this action.
+ - uses: aptos-labs/aptos-core/.github/actions/rust-setup@main
+ with:
+ GIT_CREDENTIALS: ${{ inputs.GIT_CREDENTIALS }}
+
+ # Check the freshness of the merge base
+ - name: Check the freshness of the merge base
+ run: cargo x check-merge-base -vvv
+ shell: bash
diff --git a/.github/actions/rust-doc-tests/action.yaml b/.github/actions/rust-doc-tests/action.yaml
new file mode 100644
index 0000000000000..511a32565a1c6
--- /dev/null
+++ b/.github/actions/rust-doc-tests/action.yaml
@@ -0,0 +1,16 @@
+name: Rust Doc Tests
+description: Runs only the rust doc tests
+inputs:
+ GIT_CREDENTIALS:
+ description: "Optional credentials to pass to git. Useful if you need to pull private repos for dependencies"
+ required: false
+
+runs:
+ using: composite
+ steps:
+ # The source code must be checked out by the workflow that invokes this action.
+
+ # Run the rust doc tests
+ - name: Run rust doc tests
+ run: cargo test --profile ci --locked --doc --workspace --exclude aptos-node-checker
+ shell: bash
diff --git a/.github/workflows/backport-to-release-branches.yaml b/.github/workflows/backport-to-release-branches.yaml
new file mode 100644
index 0000000000000..e006d95b78d7e
--- /dev/null
+++ b/.github/workflows/backport-to-release-branches.yaml
@@ -0,0 +1,38 @@
+name: Backport to Release Branches
+
+on:
+ pull_request_target:
+ types: ["labeled", "closed"]
+
+permissions:
+ contents: write
+ pull-requests: write
+
+jobs:
+ permission-check:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Check repository permission for user which triggered workflow
+ uses: sushichop/action-repository-permission@13d208f5ae7a6a3fc0e5a7c2502c214983f0241c
+ with:
+ required-permission: write
+ comment-not-permitted: Sorry, you don't have permission to trigger this workflow.
+
+ backport:
+ name: Backport PR
+ needs: [permission-check]
+ runs-on: ubuntu-latest
+ steps:
+ - name: Backport Action
+ uses: sorenlouv/backport-github-action@ad888e978060bc1b2798690dd9d03c4036560947
+ with:
+ github_token: ${{ secrets.GITHUB_TOKEN }}
+ add_original_reviewers: true
+
+ - name: Info log
+ if: ${{ success() }}
+ run: cat ~/.backport/backport.info.log
+
+ - name: Debug log
+ if: ${{ failure() }}
+ run: cat ~/.backport/backport.debug.log
diff --git a/CODEOWNERS b/CODEOWNERS
index 73eb4fa743af3..e9f52c43400a2 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -38,6 +38,9 @@
# Owners for the `/consensus` directory and all its subdirectories.
/consensus/ @zekun000 @sasha8 @ibalajiarun
+# Owners for consensus observer
+/consensus/src/consensus-observer/ @joshlind @zekun000
+
# Owners for quorum store.
/consensus/src/quorum_store/ @bchocho @sasha8 @gelash
@@ -74,7 +77,7 @@
/crates/aptos-telemetry-service @ibalajiarun @geekflyer
# Owners for the inspection-service crate
-/crates/inspection-service/ @joshlind @brianolson
+/crates/inspection-service/ @joshlind
# Owners for the `/dashboards` directory and all its subdirectories.
/dashboards/ @aptos-labs/prod-eng
@@ -90,7 +93,7 @@
/mempool/ @bchocho
# Owners for the network and all its subdirectories.
-/network/ @joshlind @brianolson
+/network/ @joshlind @zekun000
# Owners for the scripts
/scripts/ @aptos-labs/prod-eng
diff --git a/Cargo.lock b/Cargo.lock
index 1f78250d973b3..0662d30fc71ae 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -108,6 +108,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
dependencies = [
"cfg-if",
+ "const-random",
"getrandom 0.2.11",
"once_cell",
"serde",
@@ -130,6 +131,27 @@ version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd"
+[[package]]
+name = "allocative"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "082af274fd02beef17b7f0725a49ecafe6c075ef56cac9d6363eb3916a9817ae"
+dependencies = [
+ "allocative_derive",
+ "ctor",
+]
+
+[[package]]
+name = "allocative_derive"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe233a377643e0fc1a56421d7c90acdec45c291b30345eb9f08e8d0ddce5a4ab"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
[[package]]
name = "allocator-api2"
version = "0.2.16"
@@ -240,7 +262,7 @@ dependencies = [
[[package]]
name = "aptos"
-version = "3.4.1"
+version = "4.2.0"
dependencies = [
"anyhow",
"aptos-api-types",
@@ -284,13 +306,14 @@ dependencies = [
"chrono",
"clap 4.4.14",
"clap_complete",
+ "colored",
"dashmap",
"diesel",
- "diesel-async 0.4.1 (git+https://github.com/weiznich/diesel_async.git?rev=d02798c67065d763154d7272dd0c09b39757d0f2)",
+ "diesel-async",
"dirs",
"futures",
"hex",
- "itertools 0.12.1",
+ "itertools 0.13.0",
"jemallocator",
"maplit",
"move-binary-format",
@@ -298,6 +321,7 @@ dependencies = [
"move-cli",
"move-command-line-common",
"move-compiler",
+ "move-compiler-v2",
"move-core-types",
"move-coverage",
"move-disassembler",
@@ -311,7 +335,8 @@ dependencies = [
"poem",
"processor",
"rand 0.7.3",
- "reqwest",
+ "regex",
+ "reqwest 0.11.23",
"self_update",
"serde",
"serde_json",
@@ -368,8 +393,8 @@ dependencies = [
"aptos-system-utils 0.1.0",
"aptos-types",
"bcs 0.1.4",
- "http",
- "hyper",
+ "http 0.2.11",
+ "hyper 0.14.28",
"sha256",
"tokio",
"url",
@@ -416,14 +441,12 @@ dependencies = [
"aptos-storage-interface",
"aptos-types",
"aptos-vm",
- "async-trait",
"bcs 0.1.4",
"bytes",
"fail",
"futures",
"hex",
- "hyper",
- "itertools 0.12.1",
+ "itertools 0.13.0",
"mime",
"mini-moka",
"move-core-types",
@@ -438,7 +461,7 @@ dependencies = [
"proptest",
"rand 0.7.3",
"regex",
- "reqwest",
+ "reqwest 0.11.23",
"serde",
"serde_json",
"tokio",
@@ -459,6 +482,7 @@ dependencies = [
"aptos-executor-types",
"aptos-framework",
"aptos-genesis",
+ "aptos-indexer-grpc-table-info",
"aptos-mempool",
"aptos-mempool-notifications",
"aptos-sdk",
@@ -471,7 +495,7 @@ dependencies = [
"bcs 0.1.4",
"bytes",
"goldenfile",
- "hyper",
+ "hyper 0.14.28",
"rand 0.7.3",
"regex",
"serde_json",
@@ -542,9 +566,11 @@ dependencies = [
"aptos-config",
"aptos-crypto",
"aptos-db",
+ "aptos-db-indexer-schemas",
"aptos-executor",
"aptos-executor-test-helpers",
"aptos-executor-types",
+ "aptos-indexer-grpc-table-info",
"aptos-infallible",
"aptos-jellyfish-merkle",
"aptos-logger",
@@ -561,7 +587,7 @@ dependencies = [
"clap 4.4.14",
"csv",
"futures",
- "itertools 0.12.1",
+ "itertools 0.13.0",
"move-binary-format",
"move-bytecode-verifier",
"num_cpus",
@@ -570,7 +596,7 @@ dependencies = [
"proptest",
"rand 0.7.3",
"regex",
- "reqwest",
+ "reqwest 0.11.23",
"serde",
"serde_json",
"serde_yaml 0.8.26",
@@ -597,9 +623,9 @@ dependencies = [
"aptos-types",
"bcs 0.1.4",
"bytes",
- "hyper",
+ "hyper 0.14.28",
"once_cell",
- "reqwest",
+ "reqwest 0.11.23",
"serde",
"tokio",
"tokio-stream",
@@ -650,7 +676,7 @@ dependencies = [
"dashmap",
"derivative",
"fail",
- "itertools 0.12.1",
+ "itertools 0.13.0",
"move-binary-format",
"move-core-types",
"move-vm-types",
@@ -677,7 +703,7 @@ dependencies = [
"clap 4.4.14",
"criterion",
"dashmap",
- "itertools 0.12.1",
+ "itertools 0.13.0",
"jemallocator",
"move-core-types",
"once_cell",
@@ -730,7 +756,7 @@ dependencies = [
"env_logger",
"guppy",
"log",
- "reqwest",
+ "reqwest 0.11.23",
"url",
]
@@ -773,7 +799,8 @@ dependencies = [
"bcs 0.1.4",
"clap 4.4.14",
"futures",
- "itertools 0.12.1",
+ "itertools 0.13.0",
+ "move-binary-format",
"move-compiler",
"move-core-types",
"move-model",
@@ -820,7 +847,6 @@ dependencies = [
"get_if_addrs",
"maplit",
"num_cpus",
- "number_range",
"poem-openapi",
"rand 0.7.3",
"serde",
@@ -861,6 +887,7 @@ dependencies = [
"aptos-logger",
"aptos-mempool",
"aptos-metrics-core",
+ "aptos-netcore",
"aptos-network",
"aptos-peer-monitoring-service-types",
"aptos-reliable-broadcast",
@@ -888,7 +915,7 @@ dependencies = [
"futures",
"futures-channel",
"hex",
- "itertools 0.12.1",
+ "itertools 0.13.0",
"lru 0.7.8",
"maplit",
"mini-moka",
@@ -900,6 +927,7 @@ dependencies = [
"once_cell",
"ordered-float 3.9.2",
"proptest",
+ "proptest-derive",
"rand 0.7.3",
"rayon",
"scopeguard",
@@ -946,9 +974,10 @@ dependencies = [
"aptos-short-hex-str",
"aptos-types",
"bcs 0.1.4",
+ "derivative",
"fail",
"futures",
- "itertools 0.12.1",
+ "itertools 0.13.0",
"mini-moka",
"mirai-annotations",
"once_cell",
@@ -1069,7 +1098,7 @@ dependencies = [
"claims",
"dashmap",
"futures",
- "itertools 0.12.1",
+ "itertools 0.13.0",
"maplit",
"mockall",
"ordered-float 3.9.2",
@@ -1143,7 +1172,7 @@ dependencies = [
"either",
"hex",
"indicatif 0.15.0",
- "itertools 0.12.1",
+ "itertools 0.13.0",
"lru 0.7.8",
"move-core-types",
"num-derive",
@@ -1184,6 +1213,7 @@ name = "aptos-db-indexer-schemas"
version = "0.1.0"
dependencies = [
"anyhow",
+ "aptos-crypto",
"aptos-proptest-helpers",
"aptos-schemadb",
"aptos-storage-interface",
@@ -1215,7 +1245,7 @@ dependencies = [
"aptos-vm",
"bcs 0.1.4",
"clap 4.4.14",
- "itertools 0.12.1",
+ "itertools 0.13.0",
"tokio",
]
@@ -1285,6 +1315,7 @@ dependencies = [
"aptos-network",
"aptos-reliable-broadcast",
"aptos-runtimes",
+ "aptos-safety-rules",
"aptos-time-service",
"aptos-types",
"aptos-validator-transaction-pool",
@@ -1380,6 +1411,7 @@ dependencies = [
"aptos-executor-types",
"aptos-experimental-runtimes",
"aptos-genesis",
+ "aptos-indexer-grpc-table-info",
"aptos-infallible",
"aptos-logger",
"aptos-metrics-core",
@@ -1395,7 +1427,7 @@ dependencies = [
"bytes",
"dashmap",
"fail",
- "itertools 0.12.1",
+ "itertools 0.13.0",
"move-core-types",
"once_cell",
"proptest",
@@ -1438,7 +1470,7 @@ dependencies = [
"clap 4.4.14",
"derivative",
"indicatif 0.15.0",
- "itertools 0.12.1",
+ "itertools 0.13.0",
"jemallocator",
"move-core-types",
"num_cpus",
@@ -1472,7 +1504,7 @@ dependencies = [
"crossbeam-channel",
"ctrlc",
"dashmap",
- "itertools 0.12.1",
+ "itertools 0.13.0",
"num_cpus",
"once_cell",
"rayon",
@@ -1514,23 +1546,45 @@ dependencies = [
"aptos-types",
"bcs 0.1.4",
"criterion",
- "itertools 0.12.1",
+ "itertools 0.13.0",
"once_cell",
"serde",
"thiserror",
]
+[[package]]
+name = "aptos-experimental-hexy"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "aptos-crypto",
+ "aptos-experimental-layered-map",
+ "aptos-infallible",
+ "aptos-metrics-core",
+ "criterion",
+ "itertools 0.13.0",
+ "jemallocator",
+ "once_cell",
+ "proptest",
+ "rand 0.7.3",
+]
+
[[package]]
name = "aptos-experimental-layered-map"
version = "0.1.0"
dependencies = [
+ "ahash 0.8.11",
"aptos-crypto",
"aptos-drop-helper",
"aptos-infallible",
"aptos-metrics-core",
"bitvec 1.0.1",
+ "criterion",
+ "itertools 0.13.0",
+ "jemallocator",
"once_cell",
"proptest",
+ "rand 0.7.3",
]
[[package]]
@@ -1610,7 +1664,7 @@ dependencies = [
"poem-openapi",
"rand 0.7.3",
"redis",
- "reqwest",
+ "reqwest 0.11.23",
"serde",
"serde_json",
"serde_yaml 0.8.26",
@@ -1654,7 +1708,7 @@ dependencies = [
"env_logger",
"futures",
"gcp-bigquery-client",
- "reqwest",
+ "reqwest 0.11.23",
"serde",
"serde_json",
"tokio",
@@ -1691,8 +1745,8 @@ dependencies = [
"either",
"futures",
"hex",
- "hyper",
- "itertools 0.12.1",
+ "hyper 0.14.28",
+ "itertools 0.13.0",
"json-patch",
"k8s-openapi",
"kube",
@@ -1701,7 +1755,7 @@ dependencies = [
"prometheus-http-query",
"rand 0.7.3",
"regex",
- "reqwest",
+ "reqwest 0.11.23",
"serde",
"serde_json",
"serde_yaml 0.8.26",
@@ -1733,7 +1787,7 @@ dependencies = [
"once_cell",
"rand 0.7.3",
"random_word",
- "reqwest",
+ "reqwest 0.11.23",
"serde_yaml 0.8.26",
"tokio",
"url",
@@ -1773,7 +1827,7 @@ dependencies = [
"either",
"flate2",
"hex",
- "itertools 0.12.1",
+ "itertools 0.13.0",
"libsecp256k1",
"log",
"lru 0.7.8",
@@ -1782,6 +1836,7 @@ dependencies = [
"move-cli",
"move-command-line-common",
"move-compiler",
+ "move-compiler-v2",
"move-core-types",
"move-docgen",
"move-model",
@@ -1996,7 +2051,7 @@ dependencies = [
"once_cell",
"prost 0.12.3",
"redis",
- "reqwest",
+ "reqwest 0.11.23",
"serde",
"tempfile",
"tokio",
@@ -2053,6 +2108,26 @@ dependencies = [
"tracing",
]
+[[package]]
+name = "aptos-indexer-grpc-file-store-backfiller"
+version = "1.0.0"
+dependencies = [
+ "anyhow",
+ "aptos-indexer-grpc-server-framework",
+ "aptos-indexer-grpc-utils",
+ "aptos-protos 1.3.1",
+ "async-trait",
+ "clap 4.4.14",
+ "futures",
+ "jemallocator",
+ "serde",
+ "serde_json",
+ "tokio",
+ "tonic 0.11.0",
+ "tracing",
+ "url",
+]
+
[[package]]
name = "aptos-indexer-grpc-fullnode"
version = "1.0.0"
@@ -2092,8 +2167,8 @@ dependencies = [
"futures",
"goldenfile",
"hex",
- "hyper",
- "itertools 0.12.1",
+ "hyper 0.14.28",
+ "itertools 0.13.0",
"move-binary-format",
"move-core-types",
"move-package",
@@ -2124,30 +2199,6 @@ dependencies = [
"tokio",
]
-[[package]]
-name = "aptos-indexer-grpc-integration-tests"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "aptos-config",
- "aptos-indexer-grpc-cache-worker",
- "aptos-indexer-grpc-file-store",
- "aptos-indexer-grpc-server-framework",
- "aptos-indexer-grpc-utils",
- "aptos-logger",
- "aptos-transaction-emitter-lib",
- "aptos-transaction-generator-lib",
- "aptos-types",
- "once_cell",
- "redis",
- "regex",
- "reqwest",
- "tempfile",
- "tokio",
- "tracing",
- "url",
-]
-
[[package]]
name = "aptos-indexer-grpc-server-framework"
version = "1.0.0"
@@ -2183,13 +2234,13 @@ dependencies = [
"aptos-logger",
"aptos-mempool",
"aptos-runtimes",
- "aptos-schemadb",
"aptos-storage-interface",
"aptos-types",
"flate2",
"futures",
"google-cloud-storage",
- "hyper",
+ "hyper 0.14.28",
+ "itertools 0.13.0",
"rocksdb",
"serde",
"serde_json",
@@ -2198,7 +2249,6 @@ dependencies = [
"tokio",
"tokio-stream",
"tokio-util 0.7.10",
- "tonic 0.11.0",
]
[[package]]
@@ -2215,7 +2265,7 @@ dependencies = [
"cloud-storage",
"dashmap",
"futures",
- "itertools 0.12.1",
+ "itertools 0.13.0",
"lz4",
"once_cell",
"prometheus",
@@ -2232,6 +2282,34 @@ dependencies = [
"url",
]
+[[package]]
+name = "aptos-indexer-test-transactions"
+version = "1.0.0"
+dependencies = [
+ "aptos-protos 1.3.1",
+ "serde_json",
+]
+
+[[package]]
+name = "aptos-indexer-transaction-generator"
+version = "1.0.0"
+dependencies = [
+ "anyhow",
+ "aptos-indexer-grpc-utils",
+ "aptos-protos 1.3.1",
+ "clap 4.4.14",
+ "futures",
+ "itertools 0.13.0",
+ "serde",
+ "serde_json",
+ "serde_yaml 0.8.26",
+ "tempfile",
+ "tokio",
+ "tokio-stream",
+ "tonic 0.11.0",
+ "url",
+]
+
[[package]]
name = "aptos-infallible"
version = "0.1.0"
@@ -2254,10 +2332,10 @@ dependencies = [
"aptos-time-service",
"assert_approx_eq",
"futures",
- "hyper",
+ "hyper 0.14.28",
"once_cell",
"prometheus",
- "reqwest",
+ "reqwest 0.11.23",
"rusty-fork",
"serde_json",
"tokio",
@@ -2280,7 +2358,7 @@ dependencies = [
"arr_macro",
"bcs 0.1.4",
"byteorder",
- "itertools 0.12.1",
+ "itertools 0.13.0",
"num-derive",
"num-traits",
"once_cell",
@@ -2312,6 +2390,7 @@ dependencies = [
"aptos-network",
"aptos-reliable-broadcast",
"aptos-runtimes",
+ "aptos-safety-rules",
"aptos-time-service",
"aptos-types",
"aptos-validator-transaction-pool",
@@ -2333,9 +2412,9 @@ version = "0.1.0"
dependencies = [
"anyhow",
"aptos-types",
- "http",
+ "http 0.2.11",
"move-core-types",
- "reqwest",
+ "reqwest 0.11.23",
"serde",
"serde_json",
"tokio",
@@ -2362,7 +2441,7 @@ dependencies = [
"ark-ff",
"base64 0.13.1",
"hex",
- "itertools 0.12.1",
+ "itertools 0.13.0",
"num-bigint 0.3.3",
"num-modular",
"num-traits",
@@ -2426,13 +2505,15 @@ name = "aptos-keyless-pepper-example-client-rust"
version = "0.1.0"
dependencies = [
"aptos-crypto",
+ "aptos-infallible",
"aptos-keyless-pepper-common",
"aptos-types",
"ark-bls12-381",
"ark-serialize",
"bcs 0.1.4",
+ "firestore",
"hex",
- "reqwest",
+ "reqwest 0.11.23",
"serde_json",
"tokio",
]
@@ -2444,6 +2525,7 @@ dependencies = [
"aes-gcm",
"anyhow",
"aptos-crypto",
+ "aptos-infallible",
"aptos-inspection-service",
"aptos-keyless-pepper-common",
"aptos-logger",
@@ -2455,14 +2537,15 @@ dependencies = [
"ark-serialize",
"bcs 0.1.4",
"dashmap",
+ "firestore",
"hex",
- "hyper",
+ "hyper 0.14.28",
"jsonwebtoken 8.3.0",
"jwt",
"once_cell",
"rand 0.7.3",
"regex",
- "reqwest",
+ "reqwest 0.11.23",
"serde",
"serde_json",
"sha3 0.9.1",
@@ -2495,6 +2578,7 @@ dependencies = [
"aptos-vm-types",
"bcs 0.1.4",
"bytes",
+ "claims",
"goldenfile",
"move-binary-format",
"move-command-line-common",
@@ -2601,7 +2685,7 @@ dependencies = [
"enum_dispatch",
"fail",
"futures",
- "itertools 0.12.1",
+ "itertools 0.13.0",
"maplit",
"num_cpus",
"once_cell",
@@ -2652,6 +2736,7 @@ name = "aptos-move-debugger"
version = "0.1.0"
dependencies = [
"anyhow",
+ "aptos-block-executor",
"aptos-consensus",
"aptos-crypto",
"aptos-gas-profiling",
@@ -2664,8 +2749,9 @@ dependencies = [
"aptos-vm-types",
"bcs 0.1.4",
"clap 4.4.14",
+ "itertools 0.13.0",
"regex",
- "reqwest",
+ "reqwest 0.11.23",
"tokio",
"url",
]
@@ -2730,7 +2816,7 @@ dependencies = [
[[package]]
name = "aptos-moving-average"
version = "0.1.0"
-source = "git+https://github.com/aptos-labs/aptos-indexer-processors.git?rev=5244b84fa5ed872e5280dc8df032d744d62ad29d#5244b84fa5ed872e5280dc8df032d744d62ad29d"
+source = "git+https://github.com/aptos-labs/aptos-indexer-processors.git?rev=fa1ce4947f4c2be57529f1c9732529e05a06cb7f#fa1ce4947f4c2be57529f1c9732529e05a06cb7f"
dependencies = [
"chrono",
]
@@ -2820,7 +2906,7 @@ dependencies = [
"futures",
"futures-util",
"hex",
- "itertools 0.12.1",
+ "itertools 0.13.0",
"maplit",
"once_cell",
"ordered-float 3.9.2",
@@ -2932,26 +3018,27 @@ dependencies = [
"aptos-indexer-grpc-server-framework",
"aptos-metrics-core",
"async-trait",
+ "axum 0.7.5",
"backoff",
"bytes",
"chrono",
"clap 4.4.14",
"diesel",
"diesel_migrations",
+ "enum_dispatch",
"field_count",
"futures",
"google-cloud-storage",
"image",
"once_cell",
"regex",
- "reqwest",
+ "reqwest 0.11.23",
"serde",
"serde_json",
"sha256",
"tokio",
"tracing",
"url",
- "warp",
]
[[package]]
@@ -2996,8 +3083,6 @@ dependencies = [
"aptos-peer-monitoring-service-server",
"aptos-peer-monitoring-service-types",
"aptos-runtimes",
- "aptos-safety-rules",
- "aptos-schemadb",
"aptos-state-sync-driver",
"aptos-storage-interface",
"aptos-storage-service-client",
@@ -3047,7 +3132,7 @@ dependencies = [
"poem",
"poem-openapi",
"prometheus-parse",
- "reqwest",
+ "reqwest 0.11.23",
"serde",
"serde_json",
"serde_yaml 0.8.26",
@@ -3094,7 +3179,6 @@ dependencies = [
name = "aptos-openapi"
version = "0.1.0"
dependencies = [
- "async-trait",
"percent-encoding",
"poem",
"poem-openapi",
@@ -3121,7 +3205,7 @@ version = "0.1.0"
dependencies = [
"anyhow",
"aptos-framework",
- "itertools 0.12.1",
+ "itertools 0.13.0",
"move-command-line-common",
"move-package",
"tempfile",
@@ -3235,8 +3319,7 @@ dependencies = [
[[package]]
name = "aptos-protos"
-version = "1.3.0"
-source = "git+https://github.com/aptos-labs/aptos-core.git?tag=aptos-node-v1.12.1#4b9a2593facaee92b28df2e99b2773a7e4f930f5"
+version = "1.3.1"
dependencies = [
"futures-core",
"pbjson",
@@ -3248,6 +3331,7 @@ dependencies = [
[[package]]
name = "aptos-protos"
version = "1.3.1"
+source = "git+https://github.com/aptos-labs/aptos-core.git?rev=5c48aee129b5a141be2792ffa3d9bd0a1a61c9cb#5c48aee129b5a141be2792ffa3d9bd0a1a61c9cb"
dependencies = [
"futures-core",
"pbjson",
@@ -3301,19 +3385,29 @@ dependencies = [
"aptos-genesis",
"aptos-infallible",
"aptos-keygen",
+ "aptos-language-e2e-tests",
+ "aptos-move-debugger",
"aptos-rest-client",
"aptos-temppath",
"aptos-types",
+ "aptos-vm",
+ "aptos-vm-logging",
+ "aptos-vm-types",
"bcs 0.1.4",
"clap 4.4.14",
"futures",
"git2 0.16.1",
"handlebars",
"hex",
+ "move-binary-format",
+ "move-bytecode-verifier",
"move-core-types",
"move-model",
+ "move-vm-runtime",
+ "move-vm-types",
"once_cell",
- "reqwest",
+ "parking_lot 0.12.1",
+ "reqwest 0.11.23",
"serde",
"serde_json",
"serde_yaml 0.8.26",
@@ -3322,6 +3416,7 @@ dependencies = [
"strum_macros 0.24.3",
"tokio",
"url",
+ "walkdir",
]
[[package]]
@@ -3373,7 +3468,7 @@ dependencies = [
"clap 4.4.14",
"hex",
"move-core-types",
- "reqwest",
+ "reqwest 0.11.23",
"serde",
"serde_json",
"thiserror",
@@ -3417,13 +3512,12 @@ dependencies = [
"clap 4.4.14",
"futures",
"hex",
- "itertools 0.12.1",
+ "itertools 0.13.0",
"move-core-types",
"once_cell",
- "reqwest",
+ "reqwest 0.11.23",
"serde",
"serde_json",
- "serde_yaml 0.8.26",
"tokio",
"url",
"warp",
@@ -3457,7 +3551,6 @@ dependencies = [
name = "aptos-safety-rules"
version = "0.1.0"
dependencies = [
- "anyhow",
"aptos-config",
"aptos-consensus-types",
"aptos-crypto",
@@ -3472,6 +3565,7 @@ dependencies = [
"aptos-vault-client",
"claims",
"criterion",
+ "hex",
"once_cell",
"proptest",
"rand 0.7.3",
@@ -3512,7 +3606,7 @@ dependencies = [
"aptos-types",
"bitvec 1.0.1",
"criterion",
- "itertools 0.12.1",
+ "itertools 0.13.0",
"jemallocator",
"once_cell",
"proptest",
@@ -3644,7 +3738,6 @@ dependencies = [
"aptos-data-client",
"aptos-data-streaming-service",
"aptos-db",
- "aptos-db-indexer-schemas",
"aptos-event-notifications",
"aptos-executor",
"aptos-executor-test-helpers",
@@ -3792,8 +3885,8 @@ dependencies = [
"anyhow",
"aptos-profiler 0.1.0",
"async-mutex",
- "http",
- "hyper",
+ "http 0.2.11",
+ "hyper 0.14.28",
"lazy_static",
"mime",
"pprof",
@@ -3812,8 +3905,8 @@ dependencies = [
"anyhow",
"aptos-profiler 0.1.0 (git+https://github.com/aptos-labs/aptos-core.git?rev=4541add3fd29826ec57f22658ca286d2d6134b93)",
"async-mutex",
- "http",
- "hyper",
+ "http 0.2.11",
+ "hyper 0.14.28",
"lazy_static",
"mime",
"pprof",
@@ -3868,7 +3961,7 @@ dependencies = [
"prometheus",
"rand 0.7.3",
"rand_core 0.5.1",
- "reqwest",
+ "reqwest 0.11.23",
"reqwest-middleware",
"reqwest-retry",
"serde",
@@ -3907,7 +4000,7 @@ dependencies = [
"prometheus",
"rand 0.7.3",
"rand_core 0.5.1",
- "reqwest",
+ "reqwest 0.11.23",
"reqwest-middleware",
"reqwest-retry",
"serde",
@@ -3952,9 +4045,9 @@ dependencies = [
"csv",
"futures",
"hex",
- "itertools 0.12.1",
+ "itertools 0.13.0",
"rand 0.7.3",
- "reqwest",
+ "reqwest 0.11.23",
"tokio",
"tokio-scoped",
]
@@ -3992,9 +4085,7 @@ dependencies = [
"criterion",
"criterion-cpu-time",
"num_cpus",
- "once_cell",
"proptest",
- "rayon",
]
[[package]]
@@ -4030,11 +4121,11 @@ dependencies = [
"async-trait",
"clap 4.4.14",
"futures",
- "itertools 0.12.1",
+ "itertools 0.13.0",
"once_cell",
"rand 0.7.3",
"rand_core 0.5.1",
- "reqwest",
+ "reqwest 0.11.23",
"serde",
"tokio",
"url",
@@ -4140,7 +4231,7 @@ dependencies = [
"fxhash",
"hashbrown 0.14.3",
"hex",
- "itertools 0.12.1",
+ "itertools 0.13.0",
"jsonwebtoken 8.3.0",
"move-binary-format",
"move-bytecode-verifier",
@@ -4164,7 +4255,7 @@ dependencies = [
"rand 0.7.3",
"rayon",
"regex",
- "reqwest",
+ "reqwest 0.11.23",
"ring 0.16.20",
"rsa 0.9.6",
"serde",
@@ -4314,6 +4405,7 @@ dependencies = [
"aptos-vm",
"bcs 0.1.4",
"bytes",
+ "claims",
"move-core-types",
"move-vm-runtime",
"move-vm-types",
@@ -4419,25 +4511,12 @@ dependencies = [
"aptos-config",
"aptos-logger",
"bcs 0.1.4",
- "hyper",
+ "hyper 0.14.28",
"serde",
"serde_json",
"warp",
]
-[[package]]
-name = "aptos-writeset-generator"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "aptos-crypto",
- "aptos-types",
- "aptos-vm",
- "move-core-types",
- "move-vm-runtime",
- "move-vm-types",
-]
-
[[package]]
name = "arbitrary"
version = "1.3.2"
@@ -4754,9 +4833,9 @@ dependencies = [
[[package]]
name = "async-compression"
-version = "0.4.5"
+version = "0.4.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc2d0cfb2a7388d34f590e76686704c494ed7aaceed62ee1ba35cbf363abc2a5"
+checksum = "cd066d0b4ef8ecb03a55319dc13aa6910616d0f44008a045bb1835af830abff5"
dependencies = [
"flate2",
"futures-core",
@@ -5020,102 +5099,102 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
[[package]]
name = "axum"
-version = "0.5.17"
+version = "0.6.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acee9fd5073ab6b045a275b3e709c163dd36c90685219cb21804a147b58dba43"
+checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf"
dependencies = [
"async-trait",
- "axum-core 0.2.9",
+ "axum-core 0.3.4",
"bitflags 1.3.2",
"bytes",
"futures-util",
- "http",
- "http-body",
- "hyper",
+ "http 0.2.11",
+ "http-body 0.4.6",
+ "hyper 0.14.28",
"itoa",
- "matchit 0.5.0",
+ "matchit",
"memchr",
"mime",
"percent-encoding",
"pin-project-lite",
+ "rustversion",
"serde",
- "serde_json",
- "serde_urlencoded",
- "sync_wrapper",
- "tokio",
+ "sync_wrapper 0.1.2",
"tower",
- "tower-http 0.3.5",
"tower-layer",
"tower-service",
]
[[package]]
name = "axum"
-version = "0.6.20"
+version = "0.7.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf"
+checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf"
dependencies = [
"async-trait",
- "axum-core 0.3.4",
- "bitflags 1.3.2",
+ "axum-core 0.4.3",
"bytes",
"futures-util",
- "http",
- "http-body",
- "hyper",
+ "http 1.1.0",
+ "http-body 1.0.0",
+ "http-body-util",
+ "hyper 1.4.1",
+ "hyper-util",
"itoa",
- "matchit 0.7.3",
+ "matchit",
"memchr",
"mime",
"percent-encoding",
"pin-project-lite",
"rustversion",
"serde",
- "sync_wrapper",
+ "serde_json",
+ "serde_path_to_error",
+ "serde_urlencoded",
+ "sync_wrapper 1.0.1",
+ "tokio",
"tower",
"tower-layer",
"tower-service",
+ "tracing",
]
[[package]]
name = "axum-core"
-version = "0.2.9"
+version = "0.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37e5939e02c56fecd5c017c37df4238c0a839fa76b7f97acdd7efb804fd181cc"
+checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c"
dependencies = [
"async-trait",
"bytes",
"futures-util",
- "http",
- "http-body",
+ "http 0.2.11",
+ "http-body 0.4.6",
"mime",
+ "rustversion",
"tower-layer",
"tower-service",
]
[[package]]
name = "axum-core"
-version = "0.3.4"
+version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c"
+checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3"
dependencies = [
"async-trait",
"bytes",
"futures-util",
- "http",
- "http-body",
+ "http 1.1.0",
+ "http-body 1.0.0",
+ "http-body-util",
"mime",
+ "pin-project-lite",
"rustversion",
+ "sync_wrapper 0.1.2",
"tower-layer",
"tower-service",
-]
-
-[[package]]
-name = "axum-test"
-version = "0.1.0"
-dependencies = [
- "axum 0.5.17",
- "tokio",
+ "tracing",
]
[[package]]
@@ -5314,7 +5393,7 @@ version = "0.69.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0"
dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
"cexpr",
"clang-sys",
"itertools 0.12.1",
@@ -5357,9 +5436,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
name = "bitflags"
-version = "2.4.1"
+version = "2.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
[[package]]
name = "bitmaps"
@@ -5537,8 +5616,8 @@ dependencies = [
"futures-core",
"futures-util",
"hex",
- "http",
- "hyper",
+ "http 0.2.11",
+ "hyper 0.14.28",
"hyperlocal",
"log",
"pin-project-lite",
@@ -5723,6 +5802,19 @@ dependencies = [
"serde",
]
+[[package]]
+name = "canonical_json"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f89083fd014d71c47a718d7f4ac050864dac8587668dbe90baf9e261064c5710"
+dependencies = [
+ "hex",
+ "regex",
+ "serde",
+ "serde_json",
+ "thiserror",
+]
+
[[package]]
name = "captcha"
version = "0.0.9"
@@ -5826,11 +5918,17 @@ version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+[[package]]
+name = "cfg_aliases"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
+
[[package]]
name = "chrono"
-version = "0.4.31"
+version = "0.4.38"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38"
+checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
dependencies = [
"android-tzdata",
"iana-time-zone",
@@ -5838,7 +5936,7 @@ dependencies = [
"num-traits",
"serde",
"wasm-bindgen",
- "windows-targets 0.48.5",
+ "windows-targets 0.52.0",
]
[[package]]
@@ -5988,6 +6086,7 @@ dependencies = [
"anstyle",
"clap_lex 0.6.0",
"strsim 0.10.0",
+ "terminal_size",
]
[[package]]
@@ -6065,7 +6164,7 @@ dependencies = [
"lazy_static",
"pem 0.8.3",
"percent-encoding",
- "reqwest",
+ "reqwest 0.11.23",
"ring 0.16.20",
"serde",
"serde_json",
@@ -6214,6 +6313,26 @@ version = "0.9.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
+[[package]]
+name = "const-random"
+version = "0.1.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359"
+dependencies = [
+ "const-random-macro",
+]
+
+[[package]]
+name = "const-random-macro"
+version = "0.1.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e"
+dependencies = [
+ "getrandom 0.2.11",
+ "once_cell",
+ "tiny-keccak",
+]
+
[[package]]
name = "const_fn"
version = "0.4.9"
@@ -6259,24 +6378,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
[[package]]
-name = "cookie"
-version = "0.16.2"
+name = "convert_case"
+version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb"
+checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca"
dependencies = [
- "percent-encoding",
+ "unicode-segmentation",
+]
+
+[[package]]
+name = "cookie"
+version = "0.16.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb"
+dependencies = [
+ "percent-encoding",
"time",
"version_check",
]
[[package]]
name = "cookie"
-version = "0.17.0"
+version = "0.18.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7efb37c3e1ccb1ff97164ad95ac1606e8ccd35b3fa0a7d99a304c7f4a428cc24"
+checksum = "4ddef33a339a91ea89fb53151bd0a4689cfce27055c291dfa69945475d22c747"
dependencies = [
"aes-gcm",
- "base64 0.21.6",
+ "base64 0.22.1",
"hkdf 0.12.4",
"hmac 0.12.1",
"percent-encoding",
@@ -6591,6 +6719,16 @@ dependencies = [
"memchr",
]
+[[package]]
+name = "ctor"
+version = "0.1.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096"
+dependencies = [
+ "quote",
+ "syn 1.0.109",
+]
+
[[package]]
name = "ctr"
version = "0.9.2"
@@ -6706,16 +6844,6 @@ dependencies = [
"darling_macro 0.13.4",
]
-[[package]]
-name = "darling"
-version = "0.14.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850"
-dependencies = [
- "darling_core 0.14.4",
- "darling_macro 0.14.4",
-]
-
[[package]]
name = "darling"
version = "0.20.9"
@@ -6740,20 +6868,6 @@ dependencies = [
"syn 1.0.109",
]
-[[package]]
-name = "darling_core"
-version = "0.14.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0"
-dependencies = [
- "fnv",
- "ident_case",
- "proc-macro2",
- "quote",
- "strsim 0.10.0",
- "syn 1.0.109",
-]
-
[[package]]
name = "darling_core"
version = "0.20.9"
@@ -6779,17 +6893,6 @@ dependencies = [
"syn 1.0.109",
]
-[[package]]
-name = "darling_macro"
-version = "0.14.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e"
-dependencies = [
- "darling_core 0.14.4",
- "quote",
- "syn 1.0.109",
-]
-
[[package]]
name = "darling_macro"
version = "0.20.9"
@@ -6978,7 +7081,7 @@ version = "0.99.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
dependencies = [
- "convert_case",
+ "convert_case 0.4.0",
"proc-macro2",
"quote",
"rustc_version",
@@ -7015,7 +7118,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "62c6fcf842f17f8c78ecf7c81d75c5ce84436b41ee07e03f490fbb5f5a8731d8"
dependencies = [
"bigdecimal",
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
"byteorder",
"chrono",
"diesel_derives",
@@ -7028,20 +7131,6 @@ dependencies = [
"serde_json",
]
-[[package]]
-name = "diesel-async"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acada1517534c92d3f382217b485db8a8638f111b0e3f2a2a8e26165050f77be"
-dependencies = [
- "async-trait",
- "diesel",
- "futures-util",
- "scoped-futures",
- "tokio",
- "tokio-postgres",
-]
-
[[package]]
name = "diesel-async"
version = "0.4.1"
@@ -7056,18 +7145,6 @@ dependencies = [
"tokio-postgres",
]
-[[package]]
-name = "diesel_async_migrations"
-version = "0.11.0"
-source = "git+https://github.com/niroco/diesel_async_migrations?rev=11f331b73c5cfcc894380074f748d8fda710ac12#11f331b73c5cfcc894380074f748d8fda710ac12"
-dependencies = [
- "diesel",
- "diesel-async 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "macros",
- "scoped-futures",
- "tracing",
-]
-
[[package]]
name = "diesel_derives"
version = "2.1.2"
@@ -7272,6 +7349,7 @@ dependencies = [
"aptos-gas-schedule",
"aptos-language-e2e-tests",
"aptos-package-builder",
+ "aptos-transaction-generator-lib",
"aptos-types",
"aptos-vm",
"aptos-vm-types",
@@ -7870,6 +7948,29 @@ version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8fcfdc7a0362c9f4444381a9e697c79d435fe65b52a37466fc2c1184cee9edc6"
+[[package]]
+name = "firestore"
+version = "0.43.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11f7f676812c6a51d8584aa52252e2d3a02417ee0b27966c7059fe4ef80945d5"
+dependencies = [
+ "async-trait",
+ "backoff",
+ "chrono",
+ "futures",
+ "gcloud-sdk",
+ "hex",
+ "hyper 1.4.1",
+ "rand 0.8.5",
+ "rsb_derive",
+ "rvstruct",
+ "serde",
+ "struct-path",
+ "tokio",
+ "tokio-stream",
+ "tracing",
+]
+
[[package]]
name = "fixed"
version = "1.25.1"
@@ -8205,42 +8306,27 @@ version = "0.3.55"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2"
-[[package]]
-name = "gcemeta"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47d460327b24cc34c86d53d60a90e9e6044817f7906ebd9baa5c3d0ee13e1ecf"
-dependencies = [
- "bytes",
- "hyper",
- "serde",
- "serde_json",
- "thiserror",
- "tokio",
- "tracing",
-]
-
[[package]]
name = "gcloud-sdk"
-version = "0.20.7"
+version = "0.25.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a24376e7850e7864bb326debc5765a1dda4fc47603c22e2bc0ebf30ff59141b"
+checksum = "898e349fb0fabc16892de7858e5650b70a8044edeee13469cb2f7649040bf3c2"
dependencies = [
"async-trait",
+ "bytes",
"chrono",
"futures",
- "gcemeta",
- "hyper",
- "jsonwebtoken 8.3.0",
+ "hyper 1.4.1",
+ "jsonwebtoken 9.3.0",
"once_cell",
- "prost 0.11.9",
- "prost-types 0.11.9",
- "reqwest",
+ "prost 0.13.1",
+ "prost-types 0.13.1",
+ "reqwest 0.12.5",
"secret-vault-value",
"serde",
"serde_json",
"tokio",
- "tonic 0.9.2",
+ "tonic 0.12.1",
"tower",
"tower-layer",
"tower-util",
@@ -8257,10 +8343,10 @@ dependencies = [
"async-stream",
"async-trait",
"dyn-clone",
- "hyper",
+ "hyper 0.14.28",
"hyper-rustls 0.24.2",
"log",
- "reqwest",
+ "reqwest 0.11.23",
"serde",
"serde_json",
"thiserror",
@@ -8480,7 +8566,7 @@ dependencies = [
"google-cloud-token",
"home",
"jsonwebtoken 8.3.0",
- "reqwest",
+ "reqwest 0.11.23",
"serde",
"serde_json",
"thiserror",
@@ -8497,7 +8583,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f8bdaaa4bc036e8318274d1b25f0f2265b3e95418b765fd1ea1c7ef938fd69bd"
dependencies = [
"google-cloud-token",
- "http",
+ "http 0.2.11",
"thiserror",
"tokio",
"tokio-retry",
@@ -8523,7 +8609,7 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "96e4ad0802d3f416f62e7ce01ac1460898ee0efc98f8b45cd4aab7611607012f"
dependencies = [
- "reqwest",
+ "reqwest 0.11.23",
"thiserror",
"tokio",
]
@@ -8564,7 +8650,7 @@ dependencies = [
"once_cell",
"percent-encoding",
"regex",
- "reqwest",
+ "reqwest 0.11.23",
"ring 0.16.20",
"rsa 0.6.1",
"serde",
@@ -8661,7 +8747,26 @@ dependencies = [
"futures-core",
"futures-sink",
"futures-util",
- "http",
+ "http 0.2.11",
+ "indexmap 2.2.5",
+ "slab",
+ "tokio",
+ "tokio-util 0.7.10",
+ "tracing",
+]
+
+[[package]]
+name = "h2"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab"
+dependencies = [
+ "atomic-waker",
+ "bytes",
+ "fnv",
+ "futures-core",
+ "futures-sink",
+ "http 1.1.0",
"indexmap 2.2.5",
"slab",
"tokio",
@@ -8682,6 +8787,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "02b4af3693f1b705df946e9fe5631932443781d0aabb423b62fcd4d73f6d2fd0"
dependencies = [
"crunchy",
+ "num-traits",
]
[[package]]
@@ -8762,8 +8868,23 @@ checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270"
dependencies = [
"base64 0.21.6",
"bytes",
- "headers-core",
- "http",
+ "headers-core 0.2.0",
+ "http 0.2.11",
+ "httpdate",
+ "mime",
+ "sha1",
+]
+
+[[package]]
+name = "headers"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "322106e6bd0cba2d5ead589ddb8150a13d7c4217cf80d7c4f682ca994ccc6aa9"
+dependencies = [
+ "base64 0.21.6",
+ "bytes",
+ "headers-core 0.3.0",
+ "http 1.1.0",
"httpdate",
"mime",
"sha1",
@@ -8775,7 +8896,16 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429"
dependencies = [
- "http",
+ "http 0.2.11",
+]
+
+[[package]]
+name = "headers-core"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "54b4a22553d4242c49fddb9ba998a99962b5cc6f22cb5a3482bec22522403ce4"
+dependencies = [
+ "http 1.1.0",
]
[[package]]
@@ -8937,6 +9067,17 @@ dependencies = [
"itoa",
]
+[[package]]
+name = "http"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
+dependencies = [
+ "bytes",
+ "fnv",
+ "itoa",
+]
+
[[package]]
name = "http-body"
version = "0.4.6"
@@ -8944,7 +9085,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
dependencies = [
"bytes",
- "http",
+ "http 0.2.11",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "http-body"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643"
+dependencies = [
+ "bytes",
+ "http 1.1.0",
+]
+
+[[package]]
+name = "http-body-util"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
+dependencies = [
+ "bytes",
+ "futures-util",
+ "http 1.1.0",
+ "http-body 1.0.0",
"pin-project-lite",
]
@@ -8980,7 +9144,7 @@ dependencies = [
"crossbeam-utils",
"form_urlencoded",
"futures-util",
- "hyper",
+ "hyper 0.14.28",
"isahc",
"lazy_static",
"levenshtein",
@@ -9019,9 +9183,9 @@ dependencies = [
"futures-channel",
"futures-core",
"futures-util",
- "h2",
- "http",
- "http-body",
+ "h2 0.3.26",
+ "http 0.2.11",
+ "http-body 0.4.6",
"httparse",
"httpdate",
"itoa",
@@ -9033,14 +9197,35 @@ dependencies = [
"want",
]
+[[package]]
+name = "hyper"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-util",
+ "h2 0.4.5",
+ "http 1.1.0",
+ "http-body 1.0.0",
+ "httparse",
+ "httpdate",
+ "itoa",
+ "pin-project-lite",
+ "smallvec",
+ "tokio",
+ "want",
+]
+
[[package]]
name = "hyper-rustls"
version = "0.23.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c"
dependencies = [
- "http",
- "hyper",
+ "http 0.2.11",
+ "hyper 0.14.28",
"log",
"rustls 0.20.9",
"rustls-native-certs 0.6.3",
@@ -9055,8 +9240,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590"
dependencies = [
"futures-util",
- "http",
- "hyper",
+ "http 0.2.11",
+ "hyper 0.14.28",
"log",
"rustls 0.21.10",
"rustls-native-certs 0.6.3",
@@ -9064,18 +9249,49 @@ dependencies = [
"tokio-rustls 0.24.1",
]
+[[package]]
+name = "hyper-rustls"
+version = "0.27.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155"
+dependencies = [
+ "futures-util",
+ "http 1.1.0",
+ "hyper 1.4.1",
+ "hyper-util",
+ "rustls 0.23.7",
+ "rustls-native-certs 0.7.0",
+ "rustls-pki-types",
+ "tokio",
+ "tokio-rustls 0.26.0",
+ "tower-service",
+]
+
[[package]]
name = "hyper-timeout"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1"
dependencies = [
- "hyper",
+ "hyper 0.14.28",
"pin-project-lite",
"tokio",
"tokio-io-timeout",
]
+[[package]]
+name = "hyper-timeout"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3203a961e5c83b6f5498933e78b6b263e208c197b63e9c6c53cc82ffd3f63793"
+dependencies = [
+ "hyper 1.4.1",
+ "hyper-util",
+ "pin-project-lite",
+ "tokio",
+ "tower-service",
+]
+
[[package]]
name = "hyper-tls"
version = "0.5.0"
@@ -9083,12 +9299,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
dependencies = [
"bytes",
- "hyper",
+ "hyper 0.14.28",
"native-tls",
"tokio",
"tokio-native-tls",
]
+[[package]]
+name = "hyper-util"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ab92f4f49ee4fb4f997c784b7a2e0fa70050211e0b6a287f898c3c9785ca956"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-util",
+ "http 1.1.0",
+ "http-body 1.0.0",
+ "hyper 1.4.1",
+ "pin-project-lite",
+ "socket2 0.5.5",
+ "tokio",
+ "tower",
+ "tower-service",
+ "tracing",
+]
+
[[package]]
name = "hyperlocal"
version = "0.8.0"
@@ -9097,7 +9333,7 @@ checksum = "0fafdf7b2b2de7c9784f76e02c0935e65a8117ec3b768644379983ab333ac98c"
dependencies = [
"futures-util",
"hex",
- "hyper",
+ "hyper 0.14.28",
"pin-project 1.1.3",
"tokio",
]
@@ -9388,6 +9624,12 @@ dependencies = [
"web-sys",
]
+[[package]]
+name = "integer-encoding"
+version = "3.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8bb03732005da905c88227371639bf1ad885cc712789c011c31c5fb3ab3ccf02"
+
[[package]]
name = "internment"
version = "0.5.6"
@@ -9467,7 +9709,7 @@ dependencies = [
"encoding_rs",
"event-listener 2.5.3",
"futures-lite 1.13.0",
- "http",
+ "http 0.2.11",
"log",
"mime",
"once_cell",
@@ -9507,6 +9749,15 @@ dependencies = [
"either",
]
+[[package]]
+name = "itertools"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
+dependencies = [
+ "either",
+]
+
[[package]]
name = "itoa"
version = "1.0.10"
@@ -9610,6 +9861,21 @@ dependencies = [
"simple_asn1 0.6.2",
]
+[[package]]
+name = "jsonwebtoken"
+version = "9.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9ae10193d25051e74945f1ea2d0b42e03cc3b890f7e4cc5faa44997d808193f"
+dependencies = [
+ "base64 0.21.6",
+ "js-sys",
+ "pem 3.0.4",
+ "ring 0.17.7",
+ "serde",
+ "serde_json",
+ "simple_asn1 0.6.2",
+]
+
[[package]]
name = "jwt"
version = "0.16.0"
@@ -9682,11 +9948,11 @@ dependencies = [
"dirs-next",
"either",
"futures",
- "http",
- "http-body",
- "hyper",
+ "http 0.2.11",
+ "http-body 0.4.6",
+ "hyper 0.14.28",
"hyper-rustls 0.23.2",
- "hyper-timeout",
+ "hyper-timeout 0.4.1",
"jsonpath_lib",
"k8s-openapi",
"kube-core",
@@ -9701,7 +9967,7 @@ dependencies = [
"tokio",
"tokio-util 0.6.10",
"tower",
- "tower-http 0.2.5",
+ "tower-http",
"tracing",
]
@@ -9713,7 +9979,7 @@ checksum = "c52b6ab05d160691083430f6f431707a4e05b64903f2ffa0095ee5efde759117"
dependencies = [
"chrono",
"form_urlencoded",
- "http",
+ "http 0.2.11",
"json-patch",
"k8s-openapi",
"once_cell",
@@ -9863,9 +10129,9 @@ checksum = "db13adb97ab515a3691f56e4dbab09283d0b86cb45abd991d8634a9d6f501760"
[[package]]
name = "libc"
-version = "0.2.152"
+version = "0.2.155"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7"
+checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
[[package]]
name = "libfuzzer-sys"
@@ -9924,7 +10190,7 @@ version = "0.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8"
dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
"libc",
"redox_syscall 0.4.1",
]
@@ -10054,15 +10320,6 @@ version = "0.4.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456"
-[[package]]
-name = "listener"
-version = "0.1.0"
-dependencies = [
- "bytes",
- "clap 4.4.14",
- "tokio",
-]
-
[[package]]
name = "lock_api"
version = "0.4.11"
@@ -10135,12 +10392,12 @@ dependencies = [
]
[[package]]
-name = "macros"
-version = "0.1.0"
-source = "git+https://github.com/niroco/diesel_async_migrations?rev=11f331b73c5cfcc894380074f748d8fda710ac12#11f331b73c5cfcc894380074f748d8fda710ac12"
+name = "lz4_flex"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75761162ae2b0e580d7e7c390558127e5f01b4194debd6221fd8c207fc80e3f5"
dependencies = [
- "proc-macro2",
- "quote",
+ "twox-hash",
]
[[package]]
@@ -10170,12 +10427,6 @@ version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5"
-[[package]]
-name = "matchit"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73cbba799671b762df5a175adf59ce145165747bb891505c43d09aefbbf38beb"
-
[[package]]
name = "matchit"
version = "0.7.3"
@@ -10411,7 +10662,7 @@ dependencies = [
"better_any",
"bytes",
"datatest-stable",
- "itertools 0.12.1",
+ "itertools 0.13.0",
"move-binary-format",
"move-command-line-common",
"move-compiler",
@@ -10578,6 +10829,7 @@ dependencies = [
"move-stdlib",
"move-symbol-pool",
"once_cell",
+ "pathdiff",
"petgraph 0.5.1",
"regex",
"sha3 0.9.1",
@@ -10605,9 +10857,10 @@ dependencies = [
"ethnum",
"flexi_logger",
"im",
- "itertools 0.12.1",
+ "itertools 0.13.0",
"log",
"move-binary-format",
+ "move-borrow-graph",
"move-bytecode-source-map",
"move-bytecode-verifier",
"move-command-line-common",
@@ -10623,6 +10876,8 @@ dependencies = [
"num 0.4.1",
"once_cell",
"petgraph 0.5.1",
+ "strum 0.24.1",
+ "strum_macros 0.24.3",
"walkdir",
]
@@ -10630,9 +10885,8 @@ dependencies = [
name = "move-compiler-v2-transactional-tests"
version = "0.1.0"
dependencies = [
- "aptos-vm",
"datatest-stable",
- "itertools 0.12.1",
+ "itertools 0.13.0",
"move-command-line-common",
"move-compiler-v2",
"move-model",
@@ -10710,7 +10964,7 @@ dependencies = [
"codespan",
"codespan-reporting",
"datatest-stable",
- "itertools 0.12.1",
+ "itertools 0.13.0",
"log",
"move-compiler",
"move-core-types",
@@ -10837,7 +11091,7 @@ dependencies = [
"codespan-reporting",
"datatest-stable",
"internment",
- "itertools 0.12.1",
+ "itertools 0.13.0",
"log",
"move-binary-format",
"move-bytecode-source-map",
@@ -10865,7 +11119,7 @@ dependencies = [
"datatest-stable",
"evm-exec-utils",
"hex",
- "itertools 0.12.1",
+ "itertools 0.13.0",
"move-abigen",
"move-binary-format",
"move-bytecode-source-map",
@@ -10902,7 +11156,7 @@ dependencies = [
"clap 4.4.14",
"codespan-reporting",
"datatest-stable",
- "itertools 0.12.1",
+ "itertools 0.13.0",
"log",
"move-abigen",
"move-command-line-common",
@@ -10933,7 +11187,7 @@ dependencies = [
"codespan",
"codespan-reporting",
"futures",
- "itertools 0.12.1",
+ "itertools 0.13.0",
"log",
"move-binary-format",
"move-command-line-common",
@@ -10960,7 +11214,7 @@ dependencies = [
"anyhow",
"codespan-reporting",
"datatest-stable",
- "itertools 0.12.1",
+ "itertools 0.13.0",
"log",
"move-binary-format",
"move-core-types",
@@ -11005,7 +11259,7 @@ dependencies = [
"datatest-stable",
"ethnum",
"im",
- "itertools 0.12.1",
+ "itertools 0.13.0",
"log",
"move-binary-format",
"move-core-types",
@@ -11100,7 +11354,7 @@ dependencies = [
"ethnum",
"evm",
"evm-exec-utils",
- "itertools 0.12.1",
+ "itertools 0.13.0",
"maplit",
"move-command-line-common",
"move-compiler",
@@ -11163,7 +11417,7 @@ dependencies = [
"difference",
"evm",
"evm-exec-utils",
- "itertools 0.12.1",
+ "itertools 0.13.0",
"move-binary-format",
"move-bytecode-utils",
"move-command-line-common",
@@ -11177,6 +11431,7 @@ dependencies = [
"move-to-yul",
"move-vm-runtime",
"move-vm-test-utils",
+ "move-vm-types",
"once_cell",
"primitive-types 0.10.1",
"rayon",
@@ -11267,9 +11522,10 @@ name = "move-vm-types"
version = "0.1.0"
dependencies = [
"bcs 0.1.4",
+ "bytes",
"claims",
"derivative",
- "itertools 0.12.1",
+ "itertools 0.13.0",
"move-binary-format",
"move-core-types",
"proptest",
@@ -11289,12 +11545,29 @@ dependencies = [
"bytes",
"encoding_rs",
"futures-util",
- "http",
+ "http 0.2.11",
"httparse",
"log",
"memchr",
"mime",
"spin 0.9.8",
+ "version_check",
+]
+
+[[package]]
+name = "multer"
+version = "3.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83e87776546dc87511aa5ee218730c92b666d7264ab6ed41f9d215af9cd5224b"
+dependencies = [
+ "bytes",
+ "encoding_rs",
+ "futures-util",
+ "http 1.1.0",
+ "httparse",
+ "memchr",
+ "mime",
+ "spin 0.9.8",
"tokio",
"version_check",
]
@@ -11406,8 +11679,20 @@ version = "0.27.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
+ "cfg-if",
+ "libc",
+]
+
+[[package]]
+name = "nix"
+version = "0.28.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4"
+dependencies = [
+ "bitflags 2.6.0",
"cfg-if",
+ "cfg_aliases",
"libc",
]
@@ -11715,17 +12000,6 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
-[[package]]
-name = "number_range"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60080faccd4ca50ad0b801b2be686136376b13f691f6eac84817e40973b2e1bb"
-dependencies = [
- "anyhow",
- "itertools 0.10.5",
- "num 0.4.1",
-]
-
[[package]]
name = "object"
version = "0.32.2"
@@ -11765,7 +12039,7 @@ version = "0.10.62"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8cde4d2d9200ad5909f8dac647e29482e07c3a35de8a13fce7c9c7747ad9f671"
dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
"cfg-if",
"foreign-types 0.3.2",
"libc",
@@ -11944,7 +12218,7 @@ version = "3.6.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "be30eaf4b0a9fba5336683b38de57bb86d179a35862ba6bfcf57625d006bde5b"
dependencies = [
- "proc-macro-crate 2.0.1",
+ "proc-macro-crate 2.0.0",
"proc-macro2",
"quote",
"syn 1.0.109",
@@ -12004,6 +12278,40 @@ dependencies = [
"windows-targets 0.48.5",
]
+[[package]]
+name = "parquet"
+version = "52.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f22ba0d95db56dde8685e3fadcb915cdaadda31ab8abbe3ff7f0ad1ef333267"
+dependencies = [
+ "ahash 0.8.11",
+ "bytes",
+ "chrono",
+ "futures",
+ "half 2.2.1",
+ "hashbrown 0.14.3",
+ "lz4_flex",
+ "num 0.4.1",
+ "num-bigint 0.4.4",
+ "paste",
+ "seq-macro",
+ "thrift",
+ "tokio",
+ "twox-hash",
+]
+
+[[package]]
+name = "parquet_derive"
+version = "52.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cbfe02f8b63a15a78398db242f9b1d2dcc201319075ea6222c7108ffd48b23c0"
+dependencies = [
+ "parquet",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
[[package]]
name = "parse-zoneinfo"
version = "0.3.0"
@@ -12052,7 +12360,7 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "499cff8432e71c5f8784d9645aac0f9fca604d67f59b68a606170b5e229c6538"
dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
"ciborium",
"coset",
"data-encoding",
@@ -12146,6 +12454,16 @@ dependencies = [
"base64 0.13.1",
]
+[[package]]
+name = "pem"
+version = "3.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e459365e590736a54c3fa561947c84837534b8e9af6fc5bf781307e82658fae"
+dependencies = [
+ "base64 0.22.1",
+ "serde",
+]
+
[[package]]
name = "pem-rfc7468"
version = "0.3.1"
@@ -12443,39 +12761,41 @@ dependencies = [
[[package]]
name = "poem"
-version = "1.3.59"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "504774c97b0744c1ee108a37e5a65a9745a4725c4c06277521dabc28eb53a904"
+version = "3.0.1"
+source = "git+https://github.com/poem-web/poem.git?rev=809b2816d3504beeba140fef3fdfe9432d654c5b#809b2816d3504beeba140fef3fdfe9432d654c5b"
dependencies = [
"anyhow",
- "async-trait",
"bytes",
"chrono",
- "cookie 0.17.0",
+ "cookie 0.18.1",
"futures-util",
- "headers",
- "http",
- "hyper",
+ "headers 0.4.0",
+ "http 1.1.0",
+ "http-body-util",
+ "hyper 1.4.1",
+ "hyper-util",
"mime",
- "multer",
- "nix 0.27.1",
+ "multer 3.1.0",
+ "nix 0.28.0",
"parking_lot 0.12.1",
"percent-encoding",
"pin-project-lite",
"poem-derive",
- "quick-xml 0.30.0",
+ "quick-xml 0.32.0",
"regex",
"rfc7239",
- "rustls-pemfile 1.0.4",
+ "rustls-pemfile 2.1.1",
"serde",
"serde_json",
"serde_urlencoded",
+ "serde_yaml 0.9.30",
"smallvec",
+ "sync_wrapper 1.0.1",
"tempfile",
"thiserror",
"time",
"tokio",
- "tokio-rustls 0.24.1",
+ "tokio-rustls 0.25.0",
"tokio-stream",
"tokio-util 0.7.10",
"tracing",
@@ -12484,11 +12804,10 @@ dependencies = [
[[package]]
name = "poem-derive"
-version = "1.3.59"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42ddcf4680d8d867e1e375116203846acb088483fa2070244f90589f458bbb31"
+version = "3.0.0"
+source = "git+https://github.com/poem-web/poem.git?rev=809b2816d3504beeba140fef3fdfe9432d654c5b#809b2816d3504beeba140fef3fdfe9432d654c5b"
dependencies = [
- "proc-macro-crate 2.0.1",
+ "proc-macro-crate 3.1.0",
"proc-macro2",
"quote",
"syn 2.0.48",
@@ -12496,19 +12815,19 @@ dependencies = [
[[package]]
name = "poem-openapi"
-version = "2.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e69c569eb0671cc85e65cfb6bd960d0168d24732ff58825227b4d2a10167ba91"
+version = "5.0.2"
+source = "git+https://github.com/poem-web/poem.git?rev=809b2816d3504beeba140fef3fdfe9432d654c5b#809b2816d3504beeba140fef3fdfe9432d654c5b"
dependencies = [
- "base64 0.13.1",
+ "base64 0.22.1",
"bytes",
"derive_more",
"futures-util",
+ "indexmap 2.2.5",
"mime",
"num-traits",
"poem",
"poem-openapi-derive",
- "quick-xml 0.23.1",
+ "quick-xml 0.32.0",
"regex",
"serde",
"serde_json",
@@ -12521,19 +12840,18 @@ dependencies = [
[[package]]
name = "poem-openapi-derive"
-version = "2.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "274cf13f710999977a3c1e396c2a5000d104075a7127ce6470fbdae4706be621"
+version = "5.0.2"
+source = "git+https://github.com/poem-web/poem.git?rev=809b2816d3504beeba140fef3fdfe9432d654c5b#809b2816d3504beeba140fef3fdfe9432d654c5b"
dependencies = [
- "darling 0.14.4",
- "http",
- "indexmap 1.9.3",
+ "darling 0.20.9",
+ "http 1.1.0",
+ "indexmap 2.2.5",
"mime",
- "proc-macro-crate 1.3.1",
+ "proc-macro-crate 3.1.0",
"proc-macro2",
"quote",
"regex",
- "syn 1.0.109",
+ "syn 2.0.48",
"thiserror",
]
@@ -12831,14 +13149,22 @@ dependencies = [
[[package]]
name = "proc-macro-crate"
-version = "2.0.1"
+version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97dc5fea232fc28d2f597b37c4876b348a40e33f3b02cc975c8d006d78d94b1a"
+checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8"
dependencies = [
- "toml_datetime",
"toml_edit 0.20.2",
]
+[[package]]
+name = "proc-macro-crate"
+version = "3.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
+dependencies = [
+ "toml_edit 0.21.1",
+]
+
[[package]]
name = "proc-macro-error"
version = "1.0.4"
@@ -12887,40 +13213,46 @@ dependencies = [
[[package]]
name = "processor"
version = "1.0.0"
-source = "git+https://github.com/aptos-labs/aptos-indexer-processors.git?rev=5244b84fa5ed872e5280dc8df032d744d62ad29d#5244b84fa5ed872e5280dc8df032d744d62ad29d"
+source = "git+https://github.com/aptos-labs/aptos-indexer-processors.git?rev=fa1ce4947f4c2be57529f1c9732529e05a06cb7f#fa1ce4947f4c2be57529f1c9732529e05a06cb7f"
dependencies = [
"ahash 0.8.11",
+ "allocative",
+ "allocative_derive",
"anyhow",
- "aptos-moving-average 0.1.0 (git+https://github.com/aptos-labs/aptos-indexer-processors.git?rev=5244b84fa5ed872e5280dc8df032d744d62ad29d)",
- "aptos-protos 1.3.0",
+ "aptos-moving-average 0.1.0 (git+https://github.com/aptos-labs/aptos-indexer-processors.git?rev=fa1ce4947f4c2be57529f1c9732529e05a06cb7f)",
+ "aptos-protos 1.3.1 (git+https://github.com/aptos-labs/aptos-core.git?rev=5c48aee129b5a141be2792ffa3d9bd0a1a61c9cb)",
"async-trait",
- "base64 0.13.1",
"bcs 0.1.4",
"bigdecimal",
+ "bitflags 2.6.0",
+ "canonical_json",
"chrono",
"clap 4.4.14",
"diesel",
- "diesel-async 0.4.1 (git+https://github.com/weiznich/diesel_async.git?rev=d02798c67065d763154d7272dd0c09b39757d0f2)",
- "diesel_async_migrations",
+ "diesel-async",
"diesel_migrations",
"enum_dispatch",
"field_count",
"futures",
"futures-util",
- "gcloud-sdk",
"google-cloud-googleapis",
"google-cloud-pubsub",
+ "google-cloud-storage",
"hex",
+ "hyper 0.14.28",
"itertools 0.12.1",
"jemallocator",
"kanal",
+ "lazy_static",
"native-tls",
+ "num 0.4.1",
"num_cpus",
"once_cell",
+ "parquet",
+ "parquet_derive",
"postgres-native-tls",
"prometheus",
"prost 0.12.3",
- "prost-types 0.12.3",
"regex",
"serde",
"serde_json",
@@ -12928,6 +13260,7 @@ dependencies = [
"sha2 0.9.9",
"sha3 0.9.1",
"strum 0.24.1",
+ "tiny-keccak",
"tokio",
"tokio-postgres",
"tonic 0.11.0",
@@ -12977,7 +13310,7 @@ version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7ae2f6a3f14ff35c16b51ac796d1dc73c15ad6472c48836c6c467f6d52266648"
dependencies = [
- "reqwest",
+ "reqwest 0.11.23",
"serde",
"serde_json",
"time",
@@ -13004,7 +13337,7 @@ checksum = "31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf"
dependencies = [
"bit-set",
"bit-vec",
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
"lazy_static",
"num-traits",
"rand 0.8.5",
@@ -13047,27 +13380,50 @@ dependencies = [
"prost-derive 0.12.3",
]
+[[package]]
+name = "prost"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e13db3d3fde688c61e2446b4d843bc27a7e8af269a69440c0308021dc92333cc"
+dependencies = [
+ "bytes",
+ "prost-derive 0.13.1",
+]
+
[[package]]
name = "prost-derive"
version = "0.11.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4"
+checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4"
+dependencies = [
+ "anyhow",
+ "itertools 0.10.5",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "prost-derive"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "efb6c9a1dd1def8e2124d17e83a20af56f1570d6c2d2bd9e266ccb768df3840e"
dependencies = [
"anyhow",
- "itertools 0.10.5",
+ "itertools 0.11.0",
"proc-macro2",
"quote",
- "syn 1.0.109",
+ "syn 2.0.48",
]
[[package]]
name = "prost-derive"
-version = "0.12.3"
+version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efb6c9a1dd1def8e2124d17e83a20af56f1570d6c2d2bd9e266ccb768df3840e"
+checksum = "18bec9b0adc4eba778b33684b7ba3e7137789434769ee3ce3930463ef904cfca"
dependencies = [
"anyhow",
- "itertools 0.11.0",
+ "itertools 0.13.0",
"proc-macro2",
"quote",
"syn 2.0.48",
@@ -13091,6 +13447,15 @@ dependencies = [
"prost 0.12.3",
]
+[[package]]
+name = "prost-types"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cee5168b05f49d4b0ca581206eb14a7b22fafd963efe729ac48eb03266e25cc2"
+dependencies = [
+ "prost 0.13.1",
+]
+
[[package]]
name = "protobuf"
version = "2.28.0"
@@ -13124,9 +13489,10 @@ dependencies = [
"chrono",
"clap 4.4.14",
"codespan-reporting",
- "itertools 0.12.1",
+ "itertools 0.13.0",
"log",
"move-compiler",
+ "move-compiler-v2",
"move-model",
"move-prover",
"move-prover-boogie-backend",
@@ -13199,7 +13565,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "11bafc859c6815fbaffbbbf4229ecb767ac913fecb27f9ad4343662e9ef099ea"
dependencies = [
"memchr",
- "serde",
]
[[package]]
@@ -13213,9 +13578,9 @@ dependencies = [
[[package]]
name = "quick-xml"
-version = "0.30.0"
+version = "0.32.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956"
+checksum = "1d3a6e5838b60e0e8fa7a43f22ade549a37d61f8bdbe636d0d7816191de969c2"
dependencies = [
"memchr",
"serde",
@@ -13233,6 +13598,52 @@ dependencies = [
"parking_lot 0.12.1",
]
+[[package]]
+name = "quinn"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4ceeeeabace7857413798eb1ffa1e9c905a9946a57d81fb69b4b71c4d8eb3ad"
+dependencies = [
+ "bytes",
+ "pin-project-lite",
+ "quinn-proto",
+ "quinn-udp",
+ "rustc-hash",
+ "rustls 0.23.7",
+ "thiserror",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "quinn-proto"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ddf517c03a109db8100448a4be38d498df8a210a99fe0e1b9eaf39e78c640efe"
+dependencies = [
+ "bytes",
+ "rand 0.8.5",
+ "ring 0.17.7",
+ "rustc-hash",
+ "rustls 0.23.7",
+ "slab",
+ "thiserror",
+ "tinyvec",
+ "tracing",
+]
+
+[[package]]
+name = "quinn-udp"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8bffec3605b73c6f1754535084a85229fa8a30f86014e6c81aeec4abb68b0285"
+dependencies = [
+ "libc",
+ "once_cell",
+ "socket2 0.5.5",
+ "windows-sys 0.52.0",
+]
+
[[package]]
name = "quote"
version = "1.0.35"
@@ -13531,7 +13942,6 @@ version = "0.11.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41"
dependencies = [
- "async-compression",
"base64 0.21.6",
"bytes",
"cookie 0.16.2",
@@ -13539,10 +13949,10 @@ dependencies = [
"encoding_rs",
"futures-core",
"futures-util",
- "h2",
- "http",
- "http-body",
- "hyper",
+ "h2 0.3.26",
+ "http 0.2.11",
+ "http-body 0.4.6",
+ "hyper 0.14.28",
"hyper-rustls 0.24.2",
"hyper-tls",
"ipnet",
@@ -13568,10 +13978,56 @@ dependencies = [
"url",
"wasm-bindgen",
"wasm-bindgen-futures",
- "wasm-streams",
+ "wasm-streams 0.3.0",
"web-sys",
"webpki-roots 0.25.3",
- "winreg",
+ "winreg 0.50.0",
+]
+
+[[package]]
+name = "reqwest"
+version = "0.12.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37"
+dependencies = [
+ "async-compression",
+ "base64 0.22.1",
+ "bytes",
+ "futures-core",
+ "futures-util",
+ "http 1.1.0",
+ "http-body 1.0.0",
+ "http-body-util",
+ "hyper 1.4.1",
+ "hyper-rustls 0.27.2",
+ "hyper-util",
+ "ipnet",
+ "js-sys",
+ "log",
+ "mime",
+ "mime_guess",
+ "once_cell",
+ "percent-encoding",
+ "pin-project-lite",
+ "quinn",
+ "rustls 0.23.7",
+ "rustls-native-certs 0.7.0",
+ "rustls-pemfile 2.1.1",
+ "rustls-pki-types",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "sync_wrapper 1.0.1",
+ "tokio",
+ "tokio-rustls 0.26.0",
+ "tokio-util 0.7.10",
+ "tower-service",
+ "url",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "wasm-streams 0.4.0",
+ "web-sys",
+ "winreg 0.52.0",
]
[[package]]
@@ -13582,8 +14038,8 @@ checksum = "88a3e86aa6053e59030e7ce2d2a3b258dd08fc2d337d52f73f6cb480f5858690"
dependencies = [
"anyhow",
"async-trait",
- "http",
- "reqwest",
+ "http 0.2.11",
+ "reqwest 0.11.23",
"serde",
"task-local-extensions",
"thiserror",
@@ -13600,10 +14056,10 @@ dependencies = [
"chrono",
"futures",
"getrandom 0.2.11",
- "http",
- "hyper",
+ "http 0.2.11",
+ "hyper 0.14.28",
"parking_lot 0.11.2",
- "reqwest",
+ "reqwest 0.11.23",
"reqwest-middleware",
"retry-policies",
"task-local-extensions",
@@ -13767,6 +14223,17 @@ dependencies = [
"zeroize",
]
+[[package]]
+name = "rsb_derive"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2c53e42fccdc5f1172e099785fe78f89bc0c1e657d0c2ef591efbfac427e9a4"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
[[package]]
name = "rstack"
version = "0.3.3"
@@ -13881,7 +14348,7 @@ version = "0.38.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316"
dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
"errno",
"libc",
"linux-raw-sys 0.4.12",
@@ -14049,6 +14516,26 @@ dependencies = [
"wait-timeout",
]
+[[package]]
+name = "rvs_derive"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e1fa12378eb54f3d4f2db8dcdbe33af610b7e7d001961c1055858282ecef2a5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "rvstruct"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5107860ec34506b64cf3680458074eac5c2c564f7ccc140918bbcd1714fd8d5d"
+dependencies = [
+ "rvs_derive",
+]
+
[[package]]
name = "ryu"
version = "1.0.16"
@@ -14221,12 +14708,12 @@ name = "self_update"
version = "0.39.0"
source = "git+https://github.com/banool/self_update.git?rev=8306158ad0fd5b9d4766a3c6bf967e7ef0ea5c4b#8306158ad0fd5b9d4766a3c6bf967e7ef0ea5c4b"
dependencies = [
- "hyper",
+ "hyper 0.14.28",
"indicatif 0.17.7",
"log",
"quick-xml 0.23.1",
"regex",
- "reqwest",
+ "reqwest 0.11.23",
"self-replace",
"semver",
"serde_json",
@@ -14246,14 +14733,10 @@ dependencies = [
]
[[package]]
-name = "sender"
-version = "0.1.0"
-dependencies = [
- "bytes",
- "clap 4.4.14",
- "event-listener 2.5.3",
- "tokio",
-]
+name = "seq-macro"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4"
[[package]]
name = "serde"
@@ -14374,6 +14857,16 @@ dependencies = [
"thiserror",
]
+[[package]]
+name = "serde_path_to_error"
+version = "0.1.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6"
+dependencies = [
+ "itoa",
+ "serde",
+]
+
[[package]]
name = "serde_regex"
version = "1.1.0"
@@ -14493,14 +14986,13 @@ dependencies = [
[[package]]
name = "server-framework"
version = "1.0.0"
-source = "git+https://github.com/aptos-labs/aptos-indexer-processors.git?rev=5244b84fa5ed872e5280dc8df032d744d62ad29d#5244b84fa5ed872e5280dc8df032d744d62ad29d"
+source = "git+https://github.com/aptos-labs/aptos-indexer-processors.git?rev=fa1ce4947f4c2be57529f1c9732529e05a06cb7f#fa1ce4947f4c2be57529f1c9732529e05a06cb7f"
dependencies = [
"anyhow",
"aptos-system-utils 0.1.0 (git+https://github.com/aptos-labs/aptos-core.git?rev=4541add3fd29826ec57f22658ca286d2d6134b93)",
"async-trait",
"backtrace",
"clap 4.4.14",
- "futures",
"prometheus",
"serde",
"serde_yaml 0.8.26",
@@ -14846,6 +15338,7 @@ dependencies = [
"aptos-consensus",
"aptos-crypto",
"aptos-db",
+ "aptos-db-indexer",
"aptos-db-indexer-schemas",
"aptos-debugger",
"aptos-dkg",
@@ -14881,13 +15374,13 @@ dependencies = [
"digest 0.9.0",
"futures",
"hex",
- "hyper",
+ "hyper 0.14.28",
"move-core-types",
"num_cpus",
"once_cell",
"rand 0.7.3",
"regex",
- "reqwest",
+ "reqwest 0.11.23",
"serde",
"serde_json",
"serde_yaml 0.8.26",
@@ -15056,6 +15549,15 @@ version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+[[package]]
+name = "struct-path"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "899edf28cf7320503eda593b4bbce1bc5e9533501a11d45537e2c5be90128fc7"
+dependencies = [
+ "convert_case 0.6.0",
+]
+
[[package]]
name = "structopt"
version = "0.3.26"
@@ -15162,7 +15664,7 @@ dependencies = [
"anyhow",
"aptos-types",
"async-trait",
- "reqwest",
+ "reqwest 0.11.23",
]
[[package]]
@@ -15216,6 +15718,15 @@ version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
+[[package]]
+name = "sync_wrapper"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"
+dependencies = [
+ "futures-core",
+]
+
[[package]]
name = "sysinfo"
version = "0.28.4"
@@ -15358,6 +15869,16 @@ dependencies = [
"winapi-util",
]
+[[package]]
+name = "terminal_size"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7"
+dependencies = [
+ "rustix 0.38.28",
+ "windows-sys 0.48.0",
+]
+
[[package]]
name = "termtree"
version = "0.4.1"
@@ -15405,7 +15926,7 @@ dependencies = [
"crossbeam-channel",
"getrandom 0.2.11",
"hex",
- "itertools 0.12.1",
+ "itertools 0.13.0",
"module-generation",
"move-binary-format",
"move-bytecode-verifier",
@@ -15416,7 +15937,6 @@ dependencies = [
"move-vm-test-utils",
"move-vm-types",
"num_cpus",
- "once_cell",
"rand 0.8.5",
"tracing",
"tracing-subscriber 0.3.18",
@@ -15508,6 +16028,17 @@ dependencies = [
"num_cpus",
]
+[[package]]
+name = "thrift"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e54bc85fc7faa8bc175c4bab5b92ba8d9a3ce893d0e9f42cc455c8ab16a9e09"
+dependencies = [
+ "byteorder",
+ "integer-encoding",
+ "ordered-float 2.10.1",
+]
+
[[package]]
name = "tiff"
version = "0.9.0"
@@ -15712,6 +16243,17 @@ dependencies = [
"tokio",
]
+[[package]]
+name = "tokio-rustls"
+version = "0.25.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f"
+dependencies = [
+ "rustls 0.22.4",
+ "rustls-pki-types",
+ "tokio",
+]
+
[[package]]
name = "tokio-rustls"
version = "0.26.0"
@@ -15822,9 +16364,9 @@ dependencies = [
[[package]]
name = "toml_datetime"
-version = "0.6.3"
+version = "0.6.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"
+checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf"
dependencies = [
"serde",
]
@@ -15853,6 +16395,17 @@ dependencies = [
"winnow",
]
+[[package]]
+name = "toml_edit"
+version = "0.21.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
+dependencies = [
+ "indexmap 2.2.5",
+ "toml_datetime",
+ "winnow",
+]
+
[[package]]
name = "tonic"
version = "0.9.2"
@@ -15867,15 +16420,14 @@ dependencies = [
"flate2",
"futures-core",
"futures-util",
- "h2",
- "http",
- "http-body",
- "hyper",
- "hyper-timeout",
+ "h2 0.3.26",
+ "http 0.2.11",
+ "http-body 0.4.6",
+ "hyper 0.14.28",
+ "hyper-timeout 0.4.1",
"percent-encoding",
"pin-project 1.1.3",
"prost 0.11.9",
- "rustls-native-certs 0.6.3",
"rustls-pemfile 1.0.4",
"tokio",
"tokio-rustls 0.24.1",
@@ -15898,11 +16450,11 @@ dependencies = [
"base64 0.22.1",
"bytes",
"flate2",
- "h2",
- "http",
- "http-body",
- "hyper",
- "hyper-timeout",
+ "h2 0.3.26",
+ "http 0.2.11",
+ "http-body 0.4.6",
+ "hyper 0.14.28",
+ "hyper-timeout 0.4.1",
"percent-encoding",
"pin-project 1.1.3",
"prost 0.12.3",
@@ -15920,6 +16472,39 @@ dependencies = [
"zstd",
]
+[[package]]
+name = "tonic"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38659f4a91aba8598d27821589f5db7dddd94601e7a01b1e485a50e5484c7401"
+dependencies = [
+ "async-stream",
+ "async-trait",
+ "axum 0.7.5",
+ "base64 0.22.1",
+ "bytes",
+ "h2 0.4.5",
+ "http 1.1.0",
+ "http-body 1.0.0",
+ "http-body-util",
+ "hyper 1.4.1",
+ "hyper-timeout 0.5.1",
+ "hyper-util",
+ "percent-encoding",
+ "pin-project 1.1.3",
+ "prost 0.13.1",
+ "rustls-native-certs 0.7.0",
+ "rustls-pemfile 2.1.1",
+ "socket2 0.5.5",
+ "tokio",
+ "tokio-rustls 0.26.0",
+ "tokio-stream",
+ "tower",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
[[package]]
name = "tonic-reflection"
version = "0.11.0"
@@ -15964,8 +16549,8 @@ dependencies = [
"bytes",
"futures-core",
"futures-util",
- "http",
- "http-body",
+ "http 0.2.11",
+ "http-body 0.4.6",
"http-range-header",
"pin-project-lite",
"tower-layer",
@@ -15973,25 +16558,6 @@ dependencies = [
"tracing",
]
-[[package]]
-name = "tower-http"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858"
-dependencies = [
- "bitflags 1.3.2",
- "bytes",
- "futures-core",
- "futures-util",
- "http",
- "http-body",
- "http-range-header",
- "pin-project-lite",
- "tower",
- "tower-layer",
- "tower-service",
-]
-
[[package]]
name = "tower-layer"
version = "0.3.2"
@@ -16193,7 +16759,7 @@ dependencies = [
"byteorder",
"bytes",
"data-encoding",
- "http",
+ "http 0.2.11",
"httparse",
"log",
"rand 0.8.5",
@@ -16203,6 +16769,16 @@ dependencies = [
"utf-8",
]
+[[package]]
+name = "twox-hash"
+version = "1.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675"
+dependencies = [
+ "cfg-if",
+ "static_assertions",
+]
+
[[package]]
name = "typed-arena"
version = "2.0.2"
@@ -16504,9 +17080,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
[[package]]
name = "uuid"
-version = "1.6.1"
+version = "1.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560"
+checksum = "5de17fd2f7da591098415cff336e12965a28061ddace43b59cb3c430179c9439"
dependencies = [
"getrandom 0.2.11",
"serde",
@@ -16601,13 +17177,13 @@ dependencies = [
"bytes",
"futures-channel",
"futures-util",
- "headers",
- "http",
- "hyper",
+ "headers 0.3.9",
+ "http 0.2.11",
+ "hyper 0.14.28",
"log",
"mime",
"mime_guess",
- "multer",
+ "multer 2.1.0",
"percent-encoding",
"pin-project 1.1.3",
"rustls-pemfile 1.0.4",
@@ -16630,9 +17206,9 @@ version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "948552bbb7a5fb4ba3169fd09b6c1ab53c1b2fdd82603295df550f7a1ec644c0"
dependencies = [
- "hyper",
+ "hyper 0.14.28",
"once_cell",
- "reqwest",
+ "reqwest 0.11.23",
"thiserror",
"unicase",
"warp",
@@ -16735,6 +17311,19 @@ dependencies = [
"web-sys",
]
+[[package]]
+name = "wasm-streams"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129"
+dependencies = [
+ "futures-util",
+ "js-sys",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+]
+
[[package]]
name = "wasm-timer"
version = "0.2.5"
@@ -17099,6 +17688,16 @@ dependencies = [
"windows-sys 0.48.0",
]
+[[package]]
+name = "winreg"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5"
+dependencies = [
+ "cfg-if",
+ "windows-sys 0.48.0",
+]
+
[[package]]
name = "wyz"
version = "0.2.0"
@@ -17166,8 +17765,8 @@ dependencies = [
"async-trait",
"base64 0.21.6",
"futures",
- "http",
- "hyper",
+ "http 0.2.11",
+ "hyper 0.14.28",
"hyper-rustls 0.24.2",
"itertools 0.12.1",
"log",
diff --git a/Cargo.toml b/Cargo.toml
index 1372c1480ae57..3e01cd584eeda 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -41,7 +41,6 @@ members = [
"aptos-move/mvhashmap",
"aptos-move/package-builder",
"aptos-move/vm-genesis",
- "aptos-move/writeset-transaction-generator",
"aptos-node",
"aptos-utils",
"config",
@@ -118,12 +117,14 @@ members = [
"ecosystem/indexer-grpc/indexer-grpc-cache-worker",
"ecosystem/indexer-grpc/indexer-grpc-data-service",
"ecosystem/indexer-grpc/indexer-grpc-file-store",
+ "ecosystem/indexer-grpc/indexer-grpc-file-store-backfiller",
"ecosystem/indexer-grpc/indexer-grpc-fullnode",
"ecosystem/indexer-grpc/indexer-grpc-in-memory-cache-benchmark",
- "ecosystem/indexer-grpc/indexer-grpc-integration-tests",
"ecosystem/indexer-grpc/indexer-grpc-server-framework",
"ecosystem/indexer-grpc/indexer-grpc-table-info",
"ecosystem/indexer-grpc/indexer-grpc-utils",
+ "ecosystem/indexer-grpc/indexer-test-transactions",
+ "ecosystem/indexer-grpc/indexer-transaction-generator",
"ecosystem/indexer-grpc/transaction-filter",
"ecosystem/nft-metadata-crawler-parser",
"ecosystem/node-checker",
@@ -136,6 +137,7 @@ members = [
"execution/executor-types",
"experimental/execution/ptx-executor",
"experimental/runtimes",
+ "experimental/storage/hexy",
"experimental/storage/layered-map",
"keyless/circuit",
"keyless/common",
@@ -180,9 +182,6 @@ members = [
"storage/schemadb",
"storage/scratchpad",
"storage/storage-interface",
- "testsuite/dos/http_test",
- "testsuite/dos/listener",
- "testsuite/dos/sender",
"testsuite/forge",
"testsuite/forge-cli",
"testsuite/fuzzer",
@@ -334,6 +333,7 @@ aptos-enum-conversion-derive = { path = "crates/aptos-enum-conversion-derive" }
aptos-executor-service = { path = "execution/executor-service" }
aptos-executor-test-helpers = { path = "execution/executor-test-helpers" }
aptos-executor-types = { path = "execution/executor-types" }
+aptos-experimental-hexy = { path = "experimental/storage/hexy" }
aptos-experimental-layered-map = { path = "experimental/storage/layered-map" }
aptos-experimental-ptx-executor = { path = "experimental/execution/ptx-executor" }
aptos-experimental-runtimes = { path = "experimental/runtimes" }
@@ -360,11 +360,14 @@ aptos-indexer = { path = "crates/indexer" }
aptos-indexer-grpc-cache-worker = { path = "ecosystem/indexer-grpc/indexer-grpc-cache-worker" }
aptos-indexer-grpc-data-service = { path = "ecosystem/indexer-grpc/indexer-grpc-data-service" }
aptos-indexer-grpc-file-store = { path = "ecosystem/indexer-grpc/indexer-grpc-file-store" }
+aptos-indexer-grpc-file-store-backfiller = { path = "ecosystem/indexer-grpc/indexer-grpc-file-store-backfiller" }
aptos-indexer-grpc-fullnode = { path = "ecosystem/indexer-grpc/indexer-grpc-fullnode" }
aptos-indexer-grpc-in-memory-cache-benchmark = { path = "ecosystem/indexer-grpc/indexer-grpc-in-memory-cache-benchmark" }
aptos-indexer-grpc-table-info = { path = "ecosystem/indexer-grpc/indexer-grpc-table-info" }
+aptos-indexer-test-transactions = { path = "ecosystem/indexer-grpc/indexer-test-transactions" }
aptos-indexer-grpc-utils = { path = "ecosystem/indexer-grpc/indexer-grpc-utils" }
aptos-indexer-grpc-server-framework = { path = "ecosystem/indexer-grpc/indexer-grpc-server-framework" }
+aptos-indexer-transaction-generator = { path = "ecosystem/indexer-grpc/indexer-transaction-generator" }
aptos-infallible = { path = "crates/aptos-infallible" }
aptos-inspection-service = { path = "crates/aptos-inspection-service" }
aptos-jellyfish-merkle = { path = "storage/jellyfish-merkle" }
@@ -457,7 +460,6 @@ aptos-vm-genesis = { path = "aptos-move/vm-genesis" }
aptos-vm-types = { path = "aptos-move/aptos-vm-types" }
aptos-vm-validator = { path = "vm-validator" }
aptos-warp-webserver = { path = "crates/aptos-warp-webserver" }
-aptos-writeset-generator = { path = "aptos-move/writeset-transaction-generator" }
aptos-cargo-cli = { path = "devtools/aptos-cargo-cli" }
# External crate dependencies.
@@ -488,7 +490,7 @@ async-mutex = "1.4.0"
async-recursion = "1.0.5"
async-stream = "0.3"
async-trait = "0.1.53"
-axum = "0.5.16"
+axum = "0.7.5"
base64 = "0.13.0"
base64-url = "2.0.1"
backoff = { version = "0.4.0", features = ["tokio"] }
@@ -514,7 +516,7 @@ cfg_block = "0.1.1"
cfg-if = "1.0.0"
ciborium = "0.2"
claims = "0.7"
-clap = { version = "4.3.9", features = ["derive", "env", "unstable-styles"] }
+clap = { version = "4.3.9", features = ["derive", "env", "unstable-styles", "wrap_help"] }
clap-verbosity-flag = "2.1.1"
clap_complete = "4.4.1"
cloud-storage = { version = "0.11.1", features = [
@@ -576,6 +578,7 @@ fail = "0.5.0"
ff = { version = "0.13", features = ["derive"] }
field_count = "0.1.1"
file_diff = "1.0.0"
+firestore = "0.43.0"
fixed = "1.25.1"
flate2 = "1.0.24"
flexi_logger = "0.27.4"
@@ -613,7 +616,7 @@ indoc = "1.0.6"
inferno = "0.11.14"
internment = { version = "0.5.0", features = ["arc"] }
ipnet = "2.5.0"
-itertools = "0.12"
+itertools = "0.13"
jemallocator = { version = "0.5.0", features = [
"profiling",
"unprefixed_malloc_on_supported_platforms",
@@ -647,7 +650,6 @@ num_cpus = "1.13.1"
num-derive = "0.3.3"
num-integer = "0.1.42"
num-traits = "0.2.15"
-number_range = "0.3.2"
once_cell = "1.10.0"
ordered-float = "3.9.1"
ouroboros = "0.15.6"
@@ -669,9 +671,10 @@ percent-encoding = "2.1.0"
petgraph = "0.5.1"
pin-project = "1.0.10"
plotters = { version = "0.3.5", default-features = false }
-poem = { version = "=1.3.59", features = ["anyhow", "rustls"] }
-poem-openapi = { version = "=2.0.11", features = ["swagger-ui", "url"] }
-poem-openapi-derive = "=2.0.11"
+# We're using git deps until https://github.com/poem-web/poem/pull/829 gets formally released.
+poem = { git = "https://github.com/poem-web/poem.git", rev = "809b2816d3504beeba140fef3fdfe9432d654c5b", features = ["anyhow", "rustls"] }
+poem-openapi = { git = "https://github.com/poem-web/poem.git", rev = "809b2816d3504beeba140fef3fdfe9432d654c5b", features = ["swagger-ui", "url"] }
+poem-openapi-derive = { git = "https://github.com/poem-web/poem.git", rev = "809b2816d3504beeba140fef3fdfe9432d654c5b" }
poseidon-ark = { git = "https://github.com/arnaucube/poseidon-ark.git", rev = "6d2487aa1308d9d3860a2b724c485d73095c1c68" }
pprof = { version = "0.11", features = ["flamegraph", "protobuf-codec"] }
pretty = "0.10.0"
@@ -705,6 +708,7 @@ reqwest = { version = "0.11.11", features = [
"blocking",
"cookies",
"json",
+ "multipart",
"stream",
] }
reqwest-middleware = "0.2.0"
diff --git a/api/Cargo.toml b/api/Cargo.toml
index c037526d47d02..fcc5efdca74ec 100644
--- a/api/Cargo.toml
+++ b/api/Cargo.toml
@@ -28,13 +28,11 @@ aptos-runtimes = { workspace = true }
aptos-storage-interface = { workspace = true }
aptos-types = { workspace = true }
aptos-vm = { workspace = true }
-async-trait = { workspace = true }
bcs = { workspace = true }
bytes = { workspace = true }
fail = { workspace = true }
futures = { workspace = true }
hex = { workspace = true }
-hyper = { workspace = true }
itertools = { workspace = true }
mime = { workspace = true }
mini-moka = { workspace = true }
diff --git a/api/doc/CHANGELOG.md b/api/doc/CHANGELOG.md
index 440c4161df200..53e0caca35421 100644
--- a/api/doc/CHANGELOG.md
+++ b/api/doc/CHANGELOG.md
@@ -5,7 +5,7 @@ All notable changes to the Supra Node API will be captured in this file. This ch
**Note**: The Supra Node API does not follow semantic version while we are in active development. Instead, breaking changes will be announced with each devnet cut. Once we launch our mainnet, the API will follow semantic versioning closely.
## Unreleased
-N/A
+- OpenAPI layout changed slightly in some enum cases, see [#13929](https://github.com/aptos-labs/aptos-core/pull/13929) for more information.
## 1.2.0 (2022-09-29)
- **[Breaking Changes]** Following the deprecation notice from the previous release, the following breaking changes have landed in this release. Please see the notes from last release for information on the new endpoints you must migrate to:
diff --git a/api/doc/spec.html b/api/doc/spec.html
index 99f0632e278ee..6a07046200dd6 100644
--- a/api/doc/spec.html
+++ b/api/doc/spec.html
@@ -4,7 +4,7 @@
- Aptos REST API
+ Aptos Node API
diff --git a/api/doc/spec.json b/api/doc/spec.json
index d36e4a6a0100d..bf944fc8e7000 100644
--- a/api/doc/spec.json
+++ b/api/doc/spec.json
@@ -13968,6 +13968,9 @@
},
{
"$ref": "#/components/schemas/AccountSignature_MultiKeySignature"
+ },
+ {
+ "$ref": "#/components/schemas/AccountSignature_NoAccountSignature"
}
],
"discriminator": {
@@ -13976,7 +13979,8 @@
"ed25519_signature": "#/components/schemas/AccountSignature_Ed25519Signature",
"multi_ed25519_signature": "#/components/schemas/AccountSignature_MultiEd25519Signature",
"single_key_signature": "#/components/schemas/AccountSignature_SingleKeySignature",
- "multi_key_signature": "#/components/schemas/AccountSignature_MultiKeySignature"
+ "multi_key_signature": "#/components/schemas/AccountSignature_MultiKeySignature",
+ "no_account_signature": "#/components/schemas/AccountSignature_NoAccountSignature"
}
}
},
@@ -13990,6 +13994,9 @@
"properties": {
"type": {
"type": "string",
+ "enum": [
+ "ed25519_signature"
+ ],
"example": "ed25519_signature"
}
}
@@ -14009,6 +14016,9 @@
"properties": {
"type": {
"type": "string",
+ "enum": [
+ "multi_ed25519_signature"
+ ],
"example": "multi_ed25519_signature"
}
}
@@ -14028,6 +14038,9 @@
"properties": {
"type": {
"type": "string",
+ "enum": [
+ "multi_key_signature"
+ ],
"example": "multi_key_signature"
}
}
@@ -14037,6 +14050,28 @@
}
]
},
+ "AccountSignature_NoAccountSignature": {
+ "allOf": [
+ {
+ "type": "object",
+ "required": [
+ "type"
+ ],
+ "properties": {
+ "type": {
+ "type": "string",
+ "enum": [
+ "no_account_signature"
+ ],
+ "example": "no_account_signature"
+ }
+ }
+ },
+ {
+ "$ref": "#/components/schemas/NoAccountSignature"
+ }
+ ]
+ },
"AccountSignature_SingleKeySignature": {
"allOf": [
{
@@ -14047,6 +14082,9 @@
"properties": {
"type": {
"type": "string",
+ "enum": [
+ "single_key_signature"
+ ],
"example": "single_key_signature"
}
}
@@ -14743,6 +14781,17 @@
}
}
},
+ "FederatedKeyless": {
+ "type": "object",
+ "required": [
+ "value"
+ ],
+ "properties": {
+ "value": {
+ "$ref": "#/components/schemas/HexEncodedBytes"
+ }
+ }
+ },
"FeePayerSignature": {
"type": "object",
"description": "Fee payer signature for fee payer transactions\n\nThis allows you to have transactions across multiple accounts and with a fee payer",
@@ -14842,6 +14891,9 @@
"properties": {
"type": {
"type": "string",
+ "enum": [
+ "write_set_payload"
+ ],
"example": "write_set_payload"
}
}
@@ -15267,6 +15319,7 @@
"required": [
"name",
"is_native",
+ "is_event",
"abilities",
"generic_type_params",
"fields"
@@ -15279,6 +15332,10 @@
"type": "boolean",
"description": "Whether the struct is a native struct of Move"
},
+ "is_event": {
+ "type": "boolean",
+ "description": "Whether the struct is marked with the #[event] annotation"
+ },
"abilities": {
"type": "array",
"description": "Abilities associated with the struct",
@@ -15539,6 +15596,9 @@
"properties": {
"type": {
"type": "string",
+ "enum": [
+ "entry_function_payload"
+ ],
"example": "entry_function_payload"
}
}
@@ -15548,6 +15608,10 @@
}
]
},
+ "NoAccountSignature": {
+ "type": "object",
+ "description": "A placeholder to represent the absence of account signature"
+ },
"PendingTransaction": {
"type": "object",
"description": "A transaction waiting in mempool",
@@ -15601,6 +15665,9 @@
},
{
"$ref": "#/components/schemas/PublicKey_Keyless"
+ },
+ {
+ "$ref": "#/components/schemas/PublicKey_FederatedKeyless"
}
],
"discriminator": {
@@ -15609,7 +15676,8 @@
"ed25519": "#/components/schemas/PublicKey_Ed25519",
"secp256k1_ecdsa": "#/components/schemas/PublicKey_Secp256k1Ecdsa",
"secp256r1_ecdsa": "#/components/schemas/PublicKey_Secp256r1Ecdsa",
- "keyless": "#/components/schemas/PublicKey_Keyless"
+ "keyless": "#/components/schemas/PublicKey_Keyless",
+ "federated_keyless": "#/components/schemas/PublicKey_FederatedKeyless"
}
}
},
@@ -15623,6 +15691,9 @@
"properties": {
"type": {
"type": "string",
+ "enum": [
+ "ed25519"
+ ],
"example": "ed25519"
}
}
@@ -15632,6 +15703,28 @@
}
]
},
+ "PublicKey_FederatedKeyless": {
+ "allOf": [
+ {
+ "type": "object",
+ "required": [
+ "type"
+ ],
+ "properties": {
+ "type": {
+ "type": "string",
+ "enum": [
+ "federated_keyless"
+ ],
+ "example": "federated_keyless"
+ }
+ }
+ },
+ {
+ "$ref": "#/components/schemas/FederatedKeyless"
+ }
+ ]
+ },
"PublicKey_Keyless": {
"allOf": [
{
@@ -15642,6 +15735,9 @@
"properties": {
"type": {
"type": "string",
+ "enum": [
+ "keyless"
+ ],
"example": "keyless"
}
}
@@ -15661,6 +15757,9 @@
"properties": {
"type": {
"type": "string",
+ "enum": [
+ "secp256k1_ecdsa"
+ ],
"example": "secp256k1_ecdsa"
}
}
@@ -15680,6 +15779,9 @@
"properties": {
"type": {
"type": "string",
+ "enum": [
+ "secp256r1_ecdsa"
+ ],
"example": "secp256r1_ecdsa"
}
}
@@ -15835,6 +15937,9 @@
"properties": {
"type": {
"type": "string",
+ "enum": [
+ "ed25519"
+ ],
"example": "ed25519"
}
}
@@ -15854,6 +15959,9 @@
"properties": {
"type": {
"type": "string",
+ "enum": [
+ "keyless"
+ ],
"example": "keyless"
}
}
@@ -15873,6 +15981,9 @@
"properties": {
"type": {
"type": "string",
+ "enum": [
+ "secp256k1_ecdsa"
+ ],
"example": "secp256k1_ecdsa"
}
}
@@ -15892,6 +16003,9 @@
"properties": {
"type": {
"type": "string",
+ "enum": [
+ "web_authn"
+ ],
"example": "web_authn"
}
}
@@ -16111,6 +16225,9 @@
"properties": {
"type": {
"type": "string",
+ "enum": [
+ "module_bundle_payload"
+ ],
"example": "module_bundle_payload"
}
}
@@ -16130,6 +16247,9 @@
"properties": {
"type": {
"type": "string",
+ "enum": [
+ "entry_function_payload"
+ ],
"example": "entry_function_payload"
}
}
@@ -16149,6 +16269,9 @@
"properties": {
"type": {
"type": "string",
+ "enum": [
+ "multisig_payload"
+ ],
"example": "multisig_payload"
}
}
@@ -16168,6 +16291,9 @@
"properties": {
"type": {
"type": "string",
+ "enum": [
+ "script_payload"
+ ],
"example": "script_payload"
}
}
@@ -16218,6 +16344,9 @@
"properties": {
"type": {
"type": "string",
+ "enum": [
+ "single_sender"
+ ],
"example": "single_sender"
}
}
@@ -16237,6 +16366,9 @@
"properties": {
"type": {
"type": "string",
+ "enum": [
+ "ed25519_signature"
+ ],
"example": "ed25519_signature"
}
}
@@ -16256,6 +16388,9 @@
"properties": {
"type": {
"type": "string",
+ "enum": [
+ "fee_payer_signature"
+ ],
"example": "fee_payer_signature"
}
}
@@ -16275,6 +16410,9 @@
"properties": {
"type": {
"type": "string",
+ "enum": [
+ "multi_agent_signature"
+ ],
"example": "multi_agent_signature"
}
}
@@ -16294,6 +16432,9 @@
"properties": {
"type": {
"type": "string",
+ "enum": [
+ "multi_ed25519_signature"
+ ],
"example": "multi_ed25519_signature"
}
}
@@ -16313,6 +16454,9 @@
"properties": {
"type": {
"type": "string",
+ "enum": [
+ "block_epilogue_transaction"
+ ],
"example": "block_epilogue_transaction"
}
}
@@ -16332,6 +16476,9 @@
"properties": {
"type": {
"type": "string",
+ "enum": [
+ "block_metadata_transaction"
+ ],
"example": "block_metadata_transaction"
}
}
@@ -16351,6 +16498,9 @@
"properties": {
"type": {
"type": "string",
+ "enum": [
+ "genesis_transaction"
+ ],
"example": "genesis_transaction"
}
}
@@ -16370,6 +16520,9 @@
"properties": {
"type": {
"type": "string",
+ "enum": [
+ "pending_transaction"
+ ],
"example": "pending_transaction"
}
}
@@ -16389,6 +16542,9 @@
"properties": {
"type": {
"type": "string",
+ "enum": [
+ "state_checkpoint_transaction"
+ ],
"example": "state_checkpoint_transaction"
}
}
@@ -16408,6 +16564,9 @@
"properties": {
"type": {
"type": "string",
+ "enum": [
+ "user_transaction"
+ ],
"example": "user_transaction"
}
}
@@ -16427,6 +16586,9 @@
"properties": {
"type": {
"type": "string",
+ "enum": [
+ "validator_transaction"
+ ],
"example": "validator_transaction"
}
}
@@ -16632,6 +16794,9 @@
"properties": {
"validator_transaction_type": {
"type": "string",
+ "enum": [
+ "dkg_result"
+ ],
"example": "dkg_result"
}
}
@@ -16651,6 +16816,9 @@
"properties": {
"validator_transaction_type": {
"type": "string",
+ "enum": [
+ "observed_jwk_update"
+ ],
"example": "observed_jwk_update"
}
}
@@ -16831,6 +16999,9 @@
"properties": {
"type": {
"type": "string",
+ "enum": [
+ "delete_module"
+ ],
"example": "delete_module"
}
}
@@ -16850,6 +17021,9 @@
"properties": {
"type": {
"type": "string",
+ "enum": [
+ "delete_resource"
+ ],
"example": "delete_resource"
}
}
@@ -16869,6 +17043,9 @@
"properties": {
"type": {
"type": "string",
+ "enum": [
+ "delete_table_item"
+ ],
"example": "delete_table_item"
}
}
@@ -16888,6 +17065,9 @@
"properties": {
"type": {
"type": "string",
+ "enum": [
+ "write_module"
+ ],
"example": "write_module"
}
}
@@ -16907,6 +17087,9 @@
"properties": {
"type": {
"type": "string",
+ "enum": [
+ "write_resource"
+ ],
"example": "write_resource"
}
}
@@ -16926,6 +17109,9 @@
"properties": {
"type": {
"type": "string",
+ "enum": [
+ "write_table_item"
+ ],
"example": "write_table_item"
}
}
@@ -16957,6 +17143,9 @@
"properties": {
"type": {
"type": "string",
+ "enum": [
+ "direct_write_set"
+ ],
"example": "direct_write_set"
}
}
@@ -16976,6 +17165,9 @@
"properties": {
"type": {
"type": "string",
+ "enum": [
+ "script_write_set"
+ ],
"example": "script_write_set"
}
}
diff --git a/api/doc/spec.yaml b/api/doc/spec.yaml
index 9e22e463b078d..a515d33940b19 100644
--- a/api/doc/spec.yaml
+++ b/api/doc/spec.yaml
@@ -10453,6 +10453,7 @@ components:
- $ref: '#/components/schemas/AccountSignature_MultiEd25519Signature'
- $ref: '#/components/schemas/AccountSignature_SingleKeySignature'
- $ref: '#/components/schemas/AccountSignature_MultiKeySignature'
+ - $ref: '#/components/schemas/AccountSignature_NoAccountSignature'
discriminator:
propertyName: type
mapping:
@@ -10460,6 +10461,7 @@ components:
multi_ed25519_signature: '#/components/schemas/AccountSignature_MultiEd25519Signature'
single_key_signature: '#/components/schemas/AccountSignature_SingleKeySignature'
multi_key_signature: '#/components/schemas/AccountSignature_MultiKeySignature'
+ no_account_signature: '#/components/schemas/AccountSignature_NoAccountSignature'
AccountSignature_Ed25519Signature:
allOf:
- type: object
@@ -10468,6 +10470,8 @@ components:
properties:
type:
type: string
+ enum:
+ - ed25519_signature
example: ed25519_signature
- $ref: '#/components/schemas/Ed25519Signature'
AccountSignature_MultiEd25519Signature:
@@ -10478,6 +10482,8 @@ components:
properties:
type:
type: string
+ enum:
+ - multi_ed25519_signature
example: multi_ed25519_signature
- $ref: '#/components/schemas/MultiEd25519Signature'
AccountSignature_MultiKeySignature:
@@ -10488,8 +10494,22 @@ components:
properties:
type:
type: string
+ enum:
+ - multi_key_signature
example: multi_key_signature
- $ref: '#/components/schemas/MultiKeySignature'
+ AccountSignature_NoAccountSignature:
+ allOf:
+ - type: object
+ required:
+ - type
+ properties:
+ type:
+ type: string
+ enum:
+ - no_account_signature
+ example: no_account_signature
+ - $ref: '#/components/schemas/NoAccountSignature'
AccountSignature_SingleKeySignature:
allOf:
- type: object
@@ -10498,6 +10518,8 @@ components:
properties:
type:
type: string
+ enum:
+ - single_key_signature
example: single_key_signature
- $ref: '#/components/schemas/SingleKeySignature'
Address:
@@ -11022,6 +11044,13 @@ components:
$ref: '#/components/schemas/ExportedProviderJWKs'
multi_sig:
$ref: '#/components/schemas/ExportedAggregateSignature'
+ FederatedKeyless:
+ type: object
+ required:
+ - value
+ properties:
+ value:
+ $ref: '#/components/schemas/HexEncodedBytes'
FeePayerSignature:
type: object
description: |-
@@ -11090,6 +11119,8 @@ components:
properties:
type:
type: string
+ enum:
+ - write_set_payload
example: write_set_payload
- $ref: '#/components/schemas/WriteSetPayload'
GenesisTransaction:
@@ -11409,6 +11440,7 @@ components:
required:
- name
- is_native
+ - is_event
- abilities
- generic_type_params
- fields
@@ -11418,6 +11450,9 @@ components:
is_native:
type: boolean
description: Whether the struct is a native struct of Move
+ is_event:
+ type: boolean
+ description: 'Whether the struct is marked with the #[event] annotation'
abilities:
type: array
description: Abilities associated with the struct
@@ -11677,8 +11712,13 @@ components:
properties:
type:
type: string
+ enum:
+ - entry_function_payload
example: entry_function_payload
- $ref: '#/components/schemas/EntryFunctionPayload'
+ NoAccountSignature:
+ type: object
+ description: A placeholder to represent the absence of account signature
PendingTransaction:
type: object
description: A transaction waiting in mempool
@@ -11714,6 +11754,7 @@ components:
- $ref: '#/components/schemas/PublicKey_Secp256k1Ecdsa'
- $ref: '#/components/schemas/PublicKey_Secp256r1Ecdsa'
- $ref: '#/components/schemas/PublicKey_Keyless'
+ - $ref: '#/components/schemas/PublicKey_FederatedKeyless'
discriminator:
propertyName: type
mapping:
@@ -11721,6 +11762,7 @@ components:
secp256k1_ecdsa: '#/components/schemas/PublicKey_Secp256k1Ecdsa'
secp256r1_ecdsa: '#/components/schemas/PublicKey_Secp256r1Ecdsa'
keyless: '#/components/schemas/PublicKey_Keyless'
+ federated_keyless: '#/components/schemas/PublicKey_FederatedKeyless'
PublicKey_Ed25519:
allOf:
- type: object
@@ -11729,8 +11771,22 @@ components:
properties:
type:
type: string
+ enum:
+ - ed25519
example: ed25519
- $ref: '#/components/schemas/Ed25519'
+ PublicKey_FederatedKeyless:
+ allOf:
+ - type: object
+ required:
+ - type
+ properties:
+ type:
+ type: string
+ enum:
+ - federated_keyless
+ example: federated_keyless
+ - $ref: '#/components/schemas/FederatedKeyless'
PublicKey_Keyless:
allOf:
- type: object
@@ -11739,6 +11795,8 @@ components:
properties:
type:
type: string
+ enum:
+ - keyless
example: keyless
- $ref: '#/components/schemas/Keyless'
PublicKey_Secp256k1Ecdsa:
@@ -11749,6 +11807,8 @@ components:
properties:
type:
type: string
+ enum:
+ - secp256k1_ecdsa
example: secp256k1_ecdsa
- $ref: '#/components/schemas/Secp256k1Ecdsa'
PublicKey_Secp256r1Ecdsa:
@@ -11759,6 +11819,8 @@ components:
properties:
type:
type: string
+ enum:
+ - secp256r1_ecdsa
example: secp256r1_ecdsa
- $ref: '#/components/schemas/Secp256r1Ecdsa'
RSA_JWK:
@@ -11861,6 +11923,8 @@ components:
properties:
type:
type: string
+ enum:
+ - ed25519
example: ed25519
- $ref: '#/components/schemas/Ed25519'
Signature_Keyless:
@@ -11871,6 +11935,8 @@ components:
properties:
type:
type: string
+ enum:
+ - keyless
example: keyless
- $ref: '#/components/schemas/Keyless'
Signature_Secp256k1Ecdsa:
@@ -11881,6 +11947,8 @@ components:
properties:
type:
type: string
+ enum:
+ - secp256k1_ecdsa
example: secp256k1_ecdsa
- $ref: '#/components/schemas/Secp256k1Ecdsa'
Signature_WebAuthn:
@@ -11891,6 +11959,8 @@ components:
properties:
type:
type: string
+ enum:
+ - web_authn
example: web_authn
- $ref: '#/components/schemas/WebAuthn'
SingleKeySignature:
@@ -12038,6 +12108,8 @@ components:
properties:
type:
type: string
+ enum:
+ - module_bundle_payload
example: module_bundle_payload
- $ref: '#/components/schemas/DeprecatedModuleBundlePayload'
TransactionPayload_EntryFunctionPayload:
@@ -12048,6 +12120,8 @@ components:
properties:
type:
type: string
+ enum:
+ - entry_function_payload
example: entry_function_payload
- $ref: '#/components/schemas/EntryFunctionPayload'
TransactionPayload_MultisigPayload:
@@ -12058,6 +12132,8 @@ components:
properties:
type:
type: string
+ enum:
+ - multisig_payload
example: multisig_payload
- $ref: '#/components/schemas/MultisigPayload'
TransactionPayload_ScriptPayload:
@@ -12068,6 +12144,8 @@ components:
properties:
type:
type: string
+ enum:
+ - script_payload
example: script_payload
- $ref: '#/components/schemas/ScriptPayload'
TransactionSignature:
@@ -12095,6 +12173,8 @@ components:
properties:
type:
type: string
+ enum:
+ - single_sender
example: single_sender
- $ref: '#/components/schemas/AccountSignature'
TransactionSignature_Ed25519Signature:
@@ -12105,6 +12185,8 @@ components:
properties:
type:
type: string
+ enum:
+ - ed25519_signature
example: ed25519_signature
- $ref: '#/components/schemas/Ed25519Signature'
TransactionSignature_FeePayerSignature:
@@ -12115,6 +12197,8 @@ components:
properties:
type:
type: string
+ enum:
+ - fee_payer_signature
example: fee_payer_signature
- $ref: '#/components/schemas/FeePayerSignature'
TransactionSignature_MultiAgentSignature:
@@ -12125,6 +12209,8 @@ components:
properties:
type:
type: string
+ enum:
+ - multi_agent_signature
example: multi_agent_signature
- $ref: '#/components/schemas/MultiAgentSignature'
TransactionSignature_MultiEd25519Signature:
@@ -12135,6 +12221,8 @@ components:
properties:
type:
type: string
+ enum:
+ - multi_ed25519_signature
example: multi_ed25519_signature
- $ref: '#/components/schemas/MultiEd25519Signature'
Transaction_BlockEpilogueTransaction:
@@ -12145,6 +12233,8 @@ components:
properties:
type:
type: string
+ enum:
+ - block_epilogue_transaction
example: block_epilogue_transaction
- $ref: '#/components/schemas/BlockEpilogueTransaction'
Transaction_BlockMetadataTransaction:
@@ -12155,6 +12245,8 @@ components:
properties:
type:
type: string
+ enum:
+ - block_metadata_transaction
example: block_metadata_transaction
- $ref: '#/components/schemas/BlockMetadataTransaction'
Transaction_GenesisTransaction:
@@ -12165,6 +12257,8 @@ components:
properties:
type:
type: string
+ enum:
+ - genesis_transaction
example: genesis_transaction
- $ref: '#/components/schemas/GenesisTransaction'
Transaction_PendingTransaction:
@@ -12175,6 +12269,8 @@ components:
properties:
type:
type: string
+ enum:
+ - pending_transaction
example: pending_transaction
- $ref: '#/components/schemas/PendingTransaction'
Transaction_StateCheckpointTransaction:
@@ -12185,6 +12281,8 @@ components:
properties:
type:
type: string
+ enum:
+ - state_checkpoint_transaction
example: state_checkpoint_transaction
- $ref: '#/components/schemas/StateCheckpointTransaction'
Transaction_UserTransaction:
@@ -12195,6 +12293,8 @@ components:
properties:
type:
type: string
+ enum:
+ - user_transaction
example: user_transaction
- $ref: '#/components/schemas/UserTransaction'
Transaction_ValidatorTransaction:
@@ -12205,6 +12305,8 @@ components:
properties:
type:
type: string
+ enum:
+ - validator_transaction
example: validator_transaction
- $ref: '#/components/schemas/ValidatorTransaction'
TransactionsBatchSingleSubmissionFailure:
@@ -12366,6 +12468,8 @@ components:
properties:
validator_transaction_type:
type: string
+ enum:
+ - dkg_result
example: dkg_result
- $ref: '#/components/schemas/DKGResultTransaction'
ValidatorTransaction_JWKUpdateTransaction:
@@ -12376,6 +12480,8 @@ components:
properties:
validator_transaction_type:
type: string
+ enum:
+ - observed_jwk_update
example: observed_jwk_update
- $ref: '#/components/schemas/JWKUpdateTransaction'
VersionedEvent:
@@ -12492,6 +12598,8 @@ components:
properties:
type:
type: string
+ enum:
+ - delete_module
example: delete_module
- $ref: '#/components/schemas/DeleteModule'
WriteSetChange_DeleteResource:
@@ -12502,6 +12610,8 @@ components:
properties:
type:
type: string
+ enum:
+ - delete_resource
example: delete_resource
- $ref: '#/components/schemas/DeleteResource'
WriteSetChange_DeleteTableItem:
@@ -12512,6 +12622,8 @@ components:
properties:
type:
type: string
+ enum:
+ - delete_table_item
example: delete_table_item
- $ref: '#/components/schemas/DeleteTableItem'
WriteSetChange_WriteModule:
@@ -12522,6 +12634,8 @@ components:
properties:
type:
type: string
+ enum:
+ - write_module
example: write_module
- $ref: '#/components/schemas/WriteModule'
WriteSetChange_WriteResource:
@@ -12532,6 +12646,8 @@ components:
properties:
type:
type: string
+ enum:
+ - write_resource
example: write_resource
- $ref: '#/components/schemas/WriteResource'
WriteSetChange_WriteTableItem:
@@ -12542,6 +12658,8 @@ components:
properties:
type:
type: string
+ enum:
+ - write_table_item
example: write_table_item
- $ref: '#/components/schemas/WriteTableItem'
WriteSetPayload:
@@ -12560,6 +12678,8 @@ components:
properties:
type:
type: string
+ enum:
+ - direct_write_set
example: direct_write_set
- $ref: '#/components/schemas/DirectWriteSet'
WriteSet_ScriptWriteSet:
@@ -12570,6 +12690,8 @@ components:
properties:
type:
type: string
+ enum:
+ - script_write_set
example: script_write_set
- $ref: '#/components/schemas/ScriptWriteSet'
WriteTableItem:
diff --git a/api/goldens/aptos_api__tests__state_test__test_get_account_module.json b/api/goldens/aptos_api__tests__state_test__test_get_account_module.json
index d830872f6c3f2..37c8ff52436ac 100644
--- a/api/goldens/aptos_api__tests__state_test__test_get_account_module.json
+++ b/api/goldens/aptos_api__tests__state_test__test_get_account_module.json
@@ -120,6 +120,7 @@
{
"name": "GUID",
"is_native": false,
+ "is_event": false,
"abilities": [
"drop",
"store"
@@ -135,6 +136,7 @@
{
"name": "ID",
"is_native": false,
+ "is_event": false,
"abilities": [
"copy",
"drop",
diff --git a/api/goldens/aptos_api__tests__view_function__test_simple_view_invalid.json b/api/goldens/aptos_api__tests__view_function__test_simple_view_invalid.json
index 0c0dbfce4633d..7d32adc125baa 100644
--- a/api/goldens/aptos_api__tests__view_function__test_simple_view_invalid.json
+++ b/api/goldens/aptos_api__tests__view_function__test_simple_view_invalid.json
@@ -1 +1 @@
-{"message":"PartialVMError with status INVALID_MAIN_FUNCTION_SIGNATURE and message function not marked as view function","error_code":"invalid_input","vm_error_code":null}
\ No newline at end of file
+{"message":"PartialVMError with status INVALID_MAIN_FUNCTION_SIGNATURE and message 'function not marked as view function'","error_code":"invalid_input","vm_error_code":null}
\ No newline at end of file
diff --git a/api/openapi-spec-generator/src/main.rs b/api/openapi-spec-generator/src/main.rs
index bfad65df7d813..cc608e6edce62 100644
--- a/api/openapi-spec-generator/src/main.rs
+++ b/api/openapi-spec-generator/src/main.rs
@@ -4,7 +4,7 @@
mod fake_context;
use anyhow::Result;
-use aptos_api::get_api_service;
+use aptos_api::{get_api_service, spec::get_spec};
use clap::{Parser, ValueEnum};
use fake_context::get_fake_context;
use std::{path::PathBuf, sync::Arc};
@@ -49,9 +49,10 @@ pub fn main() -> Result<()> {
let api_service = get_api_service(Arc::new(get_fake_context()));
let spec = match args.output_args.format {
- OutputFormat::Json => api_service.spec(),
- OutputFormat::Yaml => api_service.spec_yaml(),
+ OutputFormat::Json => get_spec(&api_service, false),
+ OutputFormat::Yaml => get_spec(&api_service, true),
};
+
args.output_args.write(&spec)
}
diff --git a/api/src/accept_type.rs b/api/src/accept_type.rs
index e4ca0eb085100..1a0d900988405 100644
--- a/api/src/accept_type.rs
+++ b/api/src/accept_type.rs
@@ -17,7 +17,6 @@ pub enum AcceptType {
/// This impl allows us to get the data straight from the arguments to the
/// endpoint handler.
-#[async_trait::async_trait]
impl<'a> FromRequest<'a> for AcceptType {
async fn from_request(request: &'a Request, _body: &mut RequestBody) -> Result {
let accept = Accept::from_request_without_body(request).await?;
diff --git a/api/src/accounts.rs b/api/src/accounts.rs
index 1f597ce8552e1..d94454f6b34e3 100644
--- a/api/src/accounts.rs
+++ b/api/src/accounts.rs
@@ -183,7 +183,7 @@ pub struct Account {
/// Address of account
address: Address,
/// Lookup ledger version
- ledger_version: u64,
+ pub ledger_version: u64,
/// Where to start for pagination
start: Option,
/// Max number of items to retrieve
@@ -193,8 +193,6 @@ pub struct Account {
}
impl Account {
- /// Creates a new account struct and determines the current ledger info, and determines the
- /// ledger version to query
pub fn new(
context: Arc,
address: Address,
@@ -202,8 +200,7 @@ impl Account {
start: Option,
limit: Option,
) -> Result {
- // Use the latest ledger version, or the requested associated version
- let (latest_ledger_info, requested_ledger_version) = context
+ let (latest_ledger_info, requested_version) = context
.get_latest_ledger_info_and_verify_lookup_version(
requested_ledger_version.map(|inner| inner.0),
)?;
@@ -211,7 +208,7 @@ impl Account {
Ok(Self {
context,
address,
- ledger_version: requested_ledger_version,
+ ledger_version: requested_version,
start,
limit,
latest_ledger_info,
@@ -471,7 +468,7 @@ impl Account {
})?;
// Find the resource and retrieve the struct field
- let resource = self.find_resource(&struct_tag)?;
+ let (_, resource) = self.find_resource(&struct_tag)?;
let (_id, value) = resource
.into_iter()
.find(|(id, _)| id == &field_name)
@@ -511,12 +508,19 @@ impl Account {
Ok(*event_handle.key())
}
- /// Find a resource associated with an account
+ /// Find a resource associated with an account. If the resource is an enum variant,
+ /// returns the variant name in the option.
fn find_resource(
&self,
resource_type: &StructTag,
- ) -> Result, BasicErrorWith404> {
- let (ledger_info, ledger_version, state_view) =
+ ) -> Result<
+ (
+ Option,
+ Vec<(Identifier, move_core_types::value::MoveValue)>,
+ ),
+ BasicErrorWith404,
+ > {
+ let (ledger_info, requested_ledger_version, state_view) =
self.context.state_view(Some(self.ledger_version))?;
let bytes = state_view
@@ -534,7 +538,12 @@ impl Account {
)
})?
.ok_or_else(|| {
- resource_not_found(self.address, resource_type, ledger_version, &ledger_info)
+ resource_not_found(
+ self.address,
+ resource_type,
+ requested_ledger_version,
+ &ledger_info,
+ )
})?;
state_view
diff --git a/api/src/basic.rs b/api/src/basic.rs
index 0dc9ff170243d..d6fed2dd70e3f 100644
--- a/api/src/basic.rs
+++ b/api/src/basic.rs
@@ -87,12 +87,10 @@ impl BasicApi {
let ledger_info = api_spawn_blocking(move || context.get_latest_ledger_info()).await?;
// If we have a duration, check that it's close to the current time, otherwise it's ok
- if let Some(duration) = duration_secs.0 {
- let timestamp = ledger_info.timestamp();
-
- let timestamp = Duration::from_micros(timestamp);
- let expectation = SystemTime::now()
- .sub(Duration::from_secs(duration as u64))
+ if let Some(max_skew) = duration_secs.0 {
+ let ledger_timestamp = Duration::from_micros(ledger_info.timestamp());
+ let skew_threshold = SystemTime::now()
+ .sub(Duration::from_secs(max_skew as u64))
.duration_since(UNIX_EPOCH)
.context("Failed to determine absolute unix time based on given duration")
.map_err(|err| {
@@ -103,9 +101,9 @@ impl BasicApi {
)
})?;
- if timestamp < expectation {
+ if ledger_timestamp < skew_threshold {
return Err(HealthCheckError::service_unavailable_with_code(
- "The latest ledger info timestamp is less than the expected timestamp",
+ format!("The latest ledger info timestamp is {:?}, which is beyond the allowed skew ({}s).", ledger_timestamp, max_skew),
AptosErrorCode::HealthCheckFailed,
&ledger_info,
));
diff --git a/api/src/bcs_payload.rs b/api/src/bcs_payload.rs
index 52ad783690bba..422037d817781 100644
--- a/api/src/bcs_payload.rs
+++ b/api/src/bcs_payload.rs
@@ -49,12 +49,11 @@ impl Payload for Bcs {
}
}
-#[poem::async_trait]
impl ParsePayload for Bcs {
const IS_REQUIRED: bool = true;
async fn from_request(request: &Request, body: &mut RequestBody) -> Result {
- let data: Vec = FromRequest::from_request(request, body).await?;
+ let data = Vec::::from_request(request, body).await?;
Ok(Self(data))
}
}
diff --git a/api/src/check_size.rs b/api/src/check_size.rs
index 9b3de83b8c145..4f6f1d35e0d19 100644
--- a/api/src/check_size.rs
+++ b/api/src/check_size.rs
@@ -1,9 +1,9 @@
// Copyright © Aptos Foundation
// SPDX-License-Identifier: Apache-2.0
-use hyper::Method;
use poem::{
error::SizedLimitError,
+ http::Method,
web::headers::{self, HeaderMapExt},
Endpoint, Middleware, Request, Result,
};
@@ -37,7 +37,6 @@ pub struct PostSizeLimitEndpoint {
max_size: u64,
}
-#[async_trait::async_trait]
impl Endpoint for PostSizeLimitEndpoint {
type Output = E::Output;
diff --git a/api/src/context.rs b/api/src/context.rs
index a077845cb0b63..4cea588b9906a 100644
--- a/api/src/context.rs
+++ b/api/src/context.rs
@@ -16,20 +16,19 @@ use aptos_api_types::{
AptosErrorCode, AsConverter, BcsBlock, GasEstimation, LedgerInfo, ResourceGroup,
TransactionOnChainData,
};
-use aptos_config::config::{NodeConfig, RoleType};
+use aptos_config::config::{GasEstimationConfig, NodeConfig, RoleType};
use aptos_crypto::HashValue;
use aptos_gas_schedule::{AptosGasParameters, FromOnChainGasSchedule};
use aptos_logger::{error, info, Schema};
use aptos_mempool::{MempoolClientRequest, MempoolClientSender, SubmissionStatus};
use aptos_storage_interface::{
state_view::{DbStateView, DbStateViewAtVersion, LatestDbStateCheckpointView},
- DbReader, Order, MAX_REQUEST_LIMIT,
+ AptosDbError, DbReader, Order, MAX_REQUEST_LIMIT,
};
use aptos_types::{
access_path::{AccessPath, Path},
account_address::AccountAddress,
account_config::{AccountResource, NewBlockEvent},
- block_executor::config::BlockExecutorConfigFromOnchain,
chain_id::ChainId,
contract_event::EventWithVersion,
event::EventKey,
@@ -42,7 +41,9 @@ use aptos_types::{
TStateView,
},
transaction::{
- block_epilogue::BlockEndInfo, SignedTransaction, Transaction, TransactionWithProof, Version,
+ block_epilogue::BlockEndInfo,
+ use_case::{UseCaseAwareTransaction, UseCaseKey},
+ SignedTransaction, Transaction, TransactionWithProof, Version,
},
};
use futures::{channel::oneshot, SinkExt};
@@ -124,8 +125,7 @@ impl Context {
})),
gas_limit_cache: Arc::new(RwLock::new(GasLimitCache {
last_updated_epoch: None,
- block_executor_onchain_config: OnChainExecutionConfig::default_if_missing()
- .block_executor_onchain_config(),
+ execution_onchain_config: OnChainExecutionConfig::default_if_missing(),
})),
view_function_stats,
simulate_txn_stats,
@@ -221,20 +221,26 @@ impl Context {
.map_err(|e| e.into())
}
- pub fn get_latest_ledger_info(&self) -> Result {
+ pub fn get_oldest_version_and_block_height(
+ &self,
+ ) -> Result<(Version, u64), E> {
+ self.db
+ .get_first_viable_block()
+ .context("Failed to retrieve oldest block information")
+ .map_err(|e| E::service_unavailable_with_code_no_info(e, AptosErrorCode::InternalError))
+ }
+
+ pub fn get_latest_storage_ledger_info(
+ &self,
+ ) -> Result {
let ledger_info = self
.get_latest_ledger_info_with_signatures()
.context("Failed to retrieve latest ledger info")
.map_err(|e| {
E::service_unavailable_with_code_no_info(e, AptosErrorCode::InternalError)
})?;
- let (oldest_version, oldest_block_height) = self
- .db
- .get_first_viable_block()
- .context("Failed to retrieve oldest block information")
- .map_err(|e| {
- E::service_unavailable_with_code_no_info(e, AptosErrorCode::InternalError)
- })?;
+
+ let (oldest_version, oldest_block_height) = self.get_oldest_version_and_block_height()?;
let (_, _, newest_block_event) = self
.db
.get_block_info_by_version(ledger_info.ledger_info().version())
@@ -252,6 +258,15 @@ impl Context {
))
}
+ pub fn get_latest_ledger_info(&self) -> Result {
+ if let Some(indexer_reader) = self.indexer_reader.as_ref() {
+ if indexer_reader.is_internal_indexer_enabled() {
+ return self.get_latest_internal_indexer_ledger_info();
+ }
+ }
+ self.get_latest_storage_ledger_info()
+ }
+
pub fn get_latest_ledger_info_and_verify_lookup_version(
&self,
requested_ledger_version: Option,
@@ -277,6 +292,45 @@ impl Context {
Ok((latest_ledger_info, requested_ledger_version))
}
+ pub fn get_latest_internal_indexer_ledger_info(
+ &self,
+ ) -> Result {
+ if let Some(indexer_reader) = self.indexer_reader.as_ref() {
+ if let Some(latest_version) = indexer_reader
+ .get_latest_internal_indexer_ledger_version()
+ .map_err(|err| {
+ E::service_unavailable_with_code_no_info(err, AptosErrorCode::InternalError)
+ })?
+ {
+ let (_, _, new_block_event) = self
+ .db
+ .get_block_info_by_version(latest_version)
+ .map_err(|_| {
+ E::service_unavailable_with_code_no_info(
+ "Failed to get block",
+ AptosErrorCode::InternalError,
+ )
+ })?;
+ let (oldest_version, oldest_block_height) =
+ self.get_oldest_version_and_block_height()?;
+ return Ok(LedgerInfo::new_ledger_info(
+ &self.chain_id(),
+ new_block_event.epoch(),
+ latest_version,
+ oldest_version,
+ oldest_block_height,
+ new_block_event.height(),
+ new_block_event.proposed_time(),
+ ));
+ }
+ }
+
+ Err(E::service_unavailable_with_code_no_info(
+ "Indexer reader doesn't exist, or doesn't have data.",
+ AptosErrorCode::InternalError,
+ ))
+ }
+
pub fn get_latest_ledger_info_with_signatures(&self) -> Result {
Ok(self.db.get_latest_ledger_info()?)
}
@@ -350,19 +404,26 @@ impl Context {
address: AccountAddress,
version: u64,
) -> Result> {
- let mut iter = self.db.get_prefixed_state_value_iterator(
- &StateKeyPrefix::from(address),
- None,
- version,
- )?;
+ let mut iter = if !db_sharding_enabled(&self.node_config) {
+ Box::new(
+ self.db
+ .get_prefixed_state_value_iterator(
+ &StateKeyPrefix::from(address),
+ None,
+ version,
+ )?
+ .map(|item| item.map_err(|err| anyhow!(err.to_string()))),
+ )
+ } else {
+ self.indexer_reader
+ .as_ref()
+ .ok_or_else(|| format_err!("Indexer reader doesn't exist"))?
+ .get_prefixed_state_value_iterator(&StateKeyPrefix::from(address), None, version)?
+ };
let kvs = iter
.by_ref()
.take(MAX_REQUEST_LIMIT as usize)
- .map(|res| match res {
- Ok((k, v)) => Ok((k, v)),
- Err(res) => Err(anyhow::Error::from(res)),
- })
.collect::>()?;
if iter.next().transpose()?.is_some() {
bail!("Too many state items under account ({:?}).", address);
@@ -377,11 +438,26 @@ impl Context {
version: u64,
limit: u64,
) -> Result<(Vec<(StructTag, Vec)>, Option)> {
- let account_iter = self.db.get_prefixed_state_value_iterator(
- &StateKeyPrefix::from(address),
- prev_state_key,
- version,
- )?;
+ let account_iter = if !db_sharding_enabled(&self.node_config) {
+ Box::new(
+ self.db
+ .get_prefixed_state_value_iterator(
+ &StateKeyPrefix::from(address),
+ prev_state_key,
+ version,
+ )?
+ .map(|item| item.map_err(|err| anyhow!(err.to_string()))),
+ )
+ } else {
+ self.indexer_reader
+ .as_ref()
+ .ok_or_else(|| format_err!("Indexer reader doesn't exist"))?
+ .get_prefixed_state_value_iterator(
+ &StateKeyPrefix::from(address),
+ prev_state_key,
+ version,
+ )?
+ };
// TODO: Consider rewriting this to consider resource groups:
// * If a resource group is found, expand
// * Return Option)>>
@@ -408,7 +484,7 @@ impl Context {
Some(Err(format_err!( "storage prefix scan return inconsistent key ({:?})", k )))
}
},
- Err(e) => Some(Err(e.into())),
+ Err(e) => Some(Err(e)),
})
.take(limit as usize + 1);
let kvs = resource_iter
@@ -453,11 +529,26 @@ impl Context {
version: u64,
limit: u64,
) -> Result<(Vec<(ModuleId, Vec)>, Option)> {
- let account_iter = self.db.get_prefixed_state_value_iterator(
- &StateKeyPrefix::from(address),
- prev_state_key,
- version,
- )?;
+ let account_iter = if !db_sharding_enabled(&self.node_config) {
+ Box::new(
+ self.db
+ .get_prefixed_state_value_iterator(
+ &StateKeyPrefix::from(address),
+ prev_state_key,
+ version,
+ )?
+ .map(|item| item.map_err(|err| anyhow!(err.to_string()))),
+ )
+ } else {
+ self.indexer_reader
+ .as_ref()
+ .ok_or_else(|| format_err!("Indexer reader doesn't exist"))?
+ .get_prefixed_state_value_iterator(
+ &StateKeyPrefix::from(address),
+ prev_state_key,
+ version,
+ )?
+ };
let mut module_iter = account_iter
.filter_map(|res| match res {
Ok((k, v)) => match k.inner() {
@@ -473,7 +564,7 @@ impl Context {
Some(Err(format_err!( "storage prefix scan return inconsistent key ({:?})", k )))
}
},
- Err(e) => Some(Err(e.into())),
+ Err(e) => Some(Err(e)),
})
.take(limit as usize + 1);
let kvs = module_iter
@@ -730,15 +821,31 @@ impl Context {
.saturating_sub(limit as u64)
};
- let txns = self
- .db
- .get_account_transactions(
+ let txns_res = if !db_sharding_enabled(&self.node_config) {
+ self.db.get_account_transactions(
address,
start_seq_number,
limit as u64,
true,
ledger_version,
)
+ } else {
+ self.indexer_reader
+ .as_ref()
+ .ok_or(anyhow!("Indexer reader is None"))
+ .map_err(|err| {
+ E::internal_with_code(err, AptosErrorCode::InternalError, ledger_info)
+ })?
+ .get_account_transactions(
+ address,
+ start_seq_number,
+ limit as u64,
+ true,
+ ledger_version,
+ )
+ .map_err(|e| AptosDbError::Other(e.to_string()))
+ };
+ let txns = txns_res
.context("Failed to retrieve account transactions")
.map_err(|err| {
E::internal_with_code(err, AptosErrorCode::InternalError, ledger_info)
@@ -813,28 +920,25 @@ impl Context {
limit: u16,
ledger_version: u64,
) -> Result> {
- if let Some(start) = start {
- Ok(self.db.get_events(
- event_key,
- start,
- Order::Ascending,
- limit as u64,
- ledger_version,
- )?)
+ let (start, order) = if let Some(start) = start {
+ (start, Order::Ascending)
} else {
- Ok(self
- .db
- .get_events(
- event_key,
- u64::MAX,
- Order::Descending,
- limit as u64,
- ledger_version,
- )
- .map(|mut result| {
- result.reverse();
- result
- })?)
+ (u64::MAX, Order::Descending)
+ };
+ let mut res = if !db_sharding_enabled(&self.node_config) {
+ self.db
+ .get_events(event_key, start, order, limit as u64, ledger_version)?
+ } else {
+ self.indexer_reader
+ .as_ref()
+ .ok_or(anyhow!("Internal indexer reader doesn't exist"))?
+ .get_events(event_key, start, order, limit as u64, ledger_version)?
+ };
+ if order == Order::Descending {
+ res.reverse();
+ Ok(res)
+ } else {
+ Ok(res)
}
}
@@ -894,9 +998,10 @@ impl Context {
start_version: Version,
limit: u64,
ledger_version: Version,
- ) -> Result<(Vec<(u64, u64)>, Vec)> {
+ count_majority_use_case: bool,
+ ) -> Result<(Vec<(u64, u64)>, Vec, Option)> {
if start_version > ledger_version || limit == 0 {
- return Ok((vec![], vec![]));
+ return Ok((vec![], vec![], None));
}
// This is just an estimation, so we can just skip over errors
@@ -908,11 +1013,16 @@ impl Context {
let mut gas_prices = Vec::new();
let mut block_end_infos = Vec::new();
+ let mut count_by_use_case = HashMap::new();
for (txn, info) in txns.zip(infos) {
match txn.as_ref() {
Ok(Transaction::UserTransaction(txn)) => {
if let Ok(info) = info.as_ref() {
gas_prices.push((txn.gas_unit_price(), info.gas_used()));
+ if count_majority_use_case {
+ let use_case_key = txn.parse_use_case();
+ *count_by_use_case.entry(use_case_key).or_insert(0) += 1;
+ }
}
},
Ok(Transaction::BlockEpilogue(txn)) => {
@@ -924,7 +1034,80 @@ impl Context {
}
}
- Ok((gas_prices, block_end_infos))
+ let majority_use_case_fraction = if count_majority_use_case {
+ count_by_use_case.iter().max_by_key(|(_, v)| *v).and_then(
+ |(max_use_case, max_value)| {
+ if let UseCaseKey::ContractAddress(_) = max_use_case {
+ Some(*max_value as f32 / count_by_use_case.values().sum::() as f32)
+ } else {
+ None
+ }
+ },
+ )
+ } else {
+ None
+ };
+ Ok((gas_prices, block_end_infos, majority_use_case_fraction))
+ }
+
+ fn block_min_inclusion_price(
+ &self,
+ ledger_info: &LedgerInfo,
+ first: Version,
+ last: Version,
+ gas_estimation_config: &GasEstimationConfig,
+ execution_config: &OnChainExecutionConfig,
+ ) -> Option {
+ let user_use_case_spread_factor = if gas_estimation_config.incorporate_reordering_effects {
+ execution_config
+ .transaction_shuffler_type()
+ .user_use_case_spread_factor()
+ } else {
+ None
+ };
+
+ match self.get_gas_prices_and_used(
+ first,
+ last - first,
+ ledger_info.ledger_version.0,
+ user_use_case_spread_factor.is_some(),
+ ) {
+ Ok((prices_and_used, block_end_infos, majority_use_case_fraction)) => {
+ let is_full_block =
+ if majority_use_case_fraction.map_or(false, |fraction| fraction > 0.5) {
+ // If majority use case is above half of transactions, UseCaseAware block reordering
+ // will allow other transactions to get in the block (AIP-68)
+ false
+ } else if prices_and_used.len() >= gas_estimation_config.full_block_txns {
+ true
+ } else if !block_end_infos.is_empty() {
+ assert_eq!(1, block_end_infos.len());
+ block_end_infos.first().unwrap().limit_reached()
+ } else if let Some(block_gas_limit) =
+ execution_config.block_gas_limit_type().block_gas_limit()
+ {
+ let gas_used = prices_and_used.iter().map(|(_, used)| *used).sum::();
+ gas_used >= block_gas_limit
+ } else {
+ false
+ };
+
+ if is_full_block {
+ Some(
+ self.next_bucket(
+ prices_and_used
+ .iter()
+ .map(|(price, _)| *price)
+ .min()
+ .unwrap(),
+ ),
+ )
+ } else {
+ None
+ }
+ },
+ Err(_) => None,
+ }
}
pub fn estimate_gas_price(
@@ -933,7 +1116,7 @@ impl Context {
) -> Result {
let config = &self.node_config.api.gas_estimation;
let min_gas_unit_price = self.min_gas_unit_price(ledger_info)?;
- let block_config = self.block_executor_onchain_config(ledger_info)?;
+ let execution_config = self.execution_onchain_config(ledger_info)?;
if !config.enabled {
return Ok(self.default_gas_estimation(min_gas_unit_price));
}
@@ -1014,40 +1197,9 @@ impl Context {
let mut min_inclusion_prices = vec![];
// TODO: if multiple calls to db is a perf issue, combine into a single call and then split
for (first, last) in blocks {
- let min_inclusion_price = match self.get_gas_prices_and_used(
- first,
- last - first,
- ledger_info.ledger_version.0,
- ) {
- Ok((prices_and_used, block_end_infos)) => {
- let is_full_block = if prices_and_used.len() >= config.full_block_txns {
- true
- } else if !block_end_infos.is_empty() {
- assert_eq!(1, block_end_infos.len());
- block_end_infos.first().unwrap().limit_reached()
- } else if let Some(block_gas_limit) =
- block_config.block_gas_limit_type.block_gas_limit()
- {
- let gas_used = prices_and_used.iter().map(|(_, used)| *used).sum::();
- gas_used >= block_gas_limit
- } else {
- false
- };
-
- if is_full_block {
- self.next_bucket(
- prices_and_used
- .iter()
- .map(|(price, _)| *price)
- .min()
- .unwrap(),
- )
- } else {
- min_gas_unit_price
- }
- },
- Err(_) => min_gas_unit_price,
- };
+ let min_inclusion_price = self
+ .block_min_inclusion_price(ledger_info, first, last, config, &execution_config)
+ .unwrap_or(min_gas_unit_price);
min_inclusion_prices.push(min_inclusion_price);
cache
.min_inclusion_prices
@@ -1215,16 +1367,16 @@ impl Context {
}
}
- pub fn block_executor_onchain_config(
+ pub fn execution_onchain_config(
&self,
ledger_info: &LedgerInfo,
- ) -> Result {
+ ) -> Result {
// If it's the same epoch, use the cached results
{
let cache = self.gas_limit_cache.read().unwrap();
if let Some(ref last_updated_epoch) = cache.last_updated_epoch {
if *last_updated_epoch == ledger_info.epoch.0 {
- return Ok(cache.block_executor_onchain_config.clone());
+ return Ok(cache.execution_onchain_config.clone());
}
}
}
@@ -1235,7 +1387,7 @@ impl Context {
// If a different thread updated the cache, we can exit early
if let Some(ref last_updated_epoch) = cache.last_updated_epoch {
if *last_updated_epoch == ledger_info.epoch.0 {
- return Ok(cache.block_executor_onchain_config.clone());
+ return Ok(cache.execution_onchain_config.clone());
}
}
@@ -1247,14 +1399,13 @@ impl Context {
E::internal_with_code(e, AptosErrorCode::InternalError, ledger_info)
})?;
- let block_executor_onchain_config = OnChainExecutionConfig::fetch_config(&state_view)
- .unwrap_or_else(OnChainExecutionConfig::default_if_missing)
- .block_executor_onchain_config();
+ let execution_onchain_config = OnChainExecutionConfig::fetch_config(&state_view)
+ .unwrap_or_else(OnChainExecutionConfig::default_if_missing);
// Update the cache
- cache.block_executor_onchain_config = block_executor_onchain_config.clone();
+ cache.execution_onchain_config = execution_onchain_config.clone();
cache.last_updated_epoch = Some(ledger_info.epoch.0);
- Ok(block_executor_onchain_config)
+ Ok(execution_onchain_config)
}
}
@@ -1314,7 +1465,7 @@ pub struct GasEstimationCache {
pub struct GasLimitCache {
last_updated_epoch: Option,
- block_executor_onchain_config: BlockExecutorConfigFromOnchain,
+ execution_onchain_config: OnChainExecutionConfig,
}
/// This function just calls tokio::task::spawn_blocking with the given closure and in
@@ -1444,3 +1595,7 @@ impl FunctionStats {
}
}
}
+
+fn db_sharding_enabled(node_config: &NodeConfig) -> bool {
+ node_config.storage.rocksdb_configs.enable_storage_sharding
+}
diff --git a/api/src/index.rs b/api/src/index.rs
index 94b5289636413..ba91cbb34c342 100644
--- a/api/src/index.rs
+++ b/api/src/index.rs
@@ -33,7 +33,6 @@ impl IndexApi {
self.context
.check_api_output_enabled("Get ledger info", &accept_type)?;
let ledger_info = self.context.get_latest_ledger_info()?;
-
let node_role = self.context.node_role();
api_spawn_blocking(move || match accept_type {
diff --git a/api/src/lib.rs b/api/src/lib.rs
index 838394268d667..fa72f894e47e4 100644
--- a/api/src/lib.rs
+++ b/api/src/lib.rs
@@ -21,6 +21,7 @@ mod page;
mod response;
mod runtime;
mod set_failpoints;
+pub mod spec;
mod state;
#[cfg(test)]
pub mod tests;
diff --git a/api/src/log.rs b/api/src/log.rs
index f305815176d00..b9ee7a2ab4d52 100644
--- a/api/src/log.rs
+++ b/api/src/log.rs
@@ -9,9 +9,11 @@ use aptos_logger::{
prelude::{sample, SampleRate},
warn, Schema,
};
-use hyper::Method;
use once_cell::sync::Lazy;
-use poem::{http::header, Endpoint, Request, Response, Result};
+use poem::{
+ http::{header, Method},
+ Endpoint, Request, Response, Result,
+};
use poem_openapi::OperationId;
use regex::Regex;
use std::time::Duration;
diff --git a/api/src/runtime.rs b/api/src/runtime.rs
index cf666d1f959df..219036a90b5d7 100644
--- a/api/src/runtime.rs
+++ b/api/src/runtime.rs
@@ -3,9 +3,19 @@
// SPDX-License-Identifier: Apache-2.0
use crate::{
- accounts::AccountsApi, basic::BasicApi, blocks::BlocksApi, check_size::PostSizeLimit,
- context::Context, error_converter::convert_error, events::EventsApi, index::IndexApi,
- log::middleware_log, set_failpoints, state::StateApi, transactions::TransactionsApi,
+ accounts::AccountsApi,
+ basic::BasicApi,
+ blocks::BlocksApi,
+ check_size::PostSizeLimit,
+ context::Context,
+ error_converter::convert_error,
+ events::EventsApi,
+ index::IndexApi,
+ log::middleware_log,
+ set_failpoints,
+ spec::{spec_endpoint_json, spec_endpoint_yaml},
+ state::StateApi,
+ transactions::TransactionsApi,
view_function::ViewFunctionApi,
};
use anyhow::Context as AnyhowContext;
@@ -164,8 +174,8 @@ pub fn attach_poem_to_runtime(
let api_service = get_api_service(context.clone());
- let spec_json = api_service.spec_endpoint();
- let spec_yaml = api_service.spec_endpoint_yaml();
+ let spec_json = spec_endpoint_json(&api_service);
+ let spec_yaml = spec_endpoint_yaml(&api_service);
let mut address = config.api.address;
diff --git a/api/src/spec.rs b/api/src/spec.rs
new file mode 100644
index 0000000000000..10293cb71e097
--- /dev/null
+++ b/api/src/spec.rs
@@ -0,0 +1,58 @@
+// Copyright (c) Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use poem::{
+ endpoint::{make_sync, Endpoint},
+ Response,
+};
+use poem_openapi::{OpenApi, OpenApiService, Webhook};
+
+/// Get the spec as JSON. We implement our own function because poem-openapi versions
+/// greater than 2.0.11 add this charset thing to the content type. This causes issues
+/// with our current Accept logic and messes up some code generators and our spec page,
+/// so we remove it.
+pub fn get_spec(service: &OpenApiService, yaml: bool) -> String
+where
+ T: OpenApi,
+ W: Webhook,
+{
+ let spec = if yaml {
+ service.spec_yaml()
+ } else {
+ service.spec()
+ };
+ spec.replace("; charset=utf-8", "")
+}
+
+/// Create an endpoint to serve the OpenAPI specification as json. We define this
+/// ourselves because we need to use our custom `get_spec` function that changes the
+/// spec to remove charset from the content type.
+pub fn spec_endpoint_json(service: &OpenApiService) -> impl Endpoint
+where
+ T: OpenApi,
+ W: Webhook,
+{
+ let spec = get_spec(service, false);
+ make_sync(move |_| {
+ Response::builder()
+ .content_type("application/json")
+ .body(spec.clone())
+ })
+}
+
+/// Create an endpoint to serve the OpenAPI specification as yaml. We define this
+/// ourselves because we need to use our custom `get_spec` function that changes the
+/// spec to remove charset from the content type.
+pub fn spec_endpoint_yaml(service: &OpenApiService) -> impl Endpoint
+where
+ T: OpenApi,
+ W: Webhook,
+{
+ let spec = get_spec(service, true);
+ make_sync(move |_| {
+ Response::builder()
+ .content_type("application/x-yaml")
+ .header("Content-Disposition", "inline; filename=\"spec.yaml\"")
+ .body(spec.clone())
+ })
+}
diff --git a/api/src/tests/accounts_test.rs b/api/src/tests/accounts_test.rs
index da00aeff218e7..a5199cf61c452 100644
--- a/api/src/tests/accounts_test.rs
+++ b/api/src/tests/accounts_test.rs
@@ -3,7 +3,8 @@
// SPDX-License-Identifier: Apache-2.0
use super::new_test_context;
-use aptos_api_test_context::{current_function_name, find_value};
+use crate::tests::new_test_context_with_db_sharding_and_internal_indexer;
+use aptos_api_test_context::{current_function_name, find_value, TestContext};
use aptos_api_types::{MoveModuleBytecode, MoveResource, MoveStructTag, StateKeyWrapper};
use aptos_cached_packages::aptos_stdlib;
use serde_json::json;
@@ -36,9 +37,21 @@ async fn test_get_account_resources_by_address_0x0() {
async fn test_get_account_resources_by_valid_account_address() {
let context = new_test_context(current_function_name!());
let addresses = vec!["0x1", "0x00000000000000000000000000000001"];
+ let mut res = vec![];
for address in &addresses {
- context.get(&account_resources(address)).await;
+ let resp = context.get(&account_resources(address)).await;
+ res.push(resp);
}
+
+ let shard_context =
+ new_test_context_with_db_sharding_and_internal_indexer(current_function_name!());
+ let mut shard_res = vec![];
+ for address in &addresses {
+ let resp = shard_context.get(&account_resources(address)).await;
+ shard_res.push(resp);
+ }
+
+ assert_eq!(res, shard_res);
}
// Unstable due to framework changes
@@ -96,13 +109,15 @@ async fn test_account_modules_structs() {
context.check_golden_output(resp);
}
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn test_get_account_resources_by_ledger_version() {
- let mut context = new_test_context(current_function_name!());
+async fn test_account_resources_by_ledger_version_with_context(mut context: TestContext) {
let account = context.gen_account();
let txn = context.create_user_account(&account).await;
context.commit_block(&vec![txn.clone()]).await;
+ if let Some(indexer_reader) = context.context.indexer_reader.as_ref() {
+ indexer_reader.wait_for_internal_indexer(2).unwrap();
+ }
+
let ledger_version_1_resources = context
.get(&account_resources(
&context.root_account().await.address().to_hex_literal(),
@@ -125,13 +140,23 @@ async fn test_get_account_resources_by_ledger_version() {
assert_eq!(root_account["data"]["sequence_number"], "0");
}
+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+async fn test_get_account_resources_by_ledger_version() {
+ let context = new_test_context(current_function_name!());
+ test_account_resources_by_ledger_version_with_context(context).await;
+ let shard_context =
+ new_test_context_with_db_sharding_and_internal_indexer(current_function_name!());
+ test_account_resources_by_ledger_version_with_context(shard_context).await;
+}
+
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
async fn test_get_account_resources_by_too_large_ledger_version() {
let mut context = new_test_context(current_function_name!());
+ let account = context.root_account().await;
let resp = context
.expect_status_code(404)
.get(&account_resources_with_ledger_version(
- &context.root_account().await.address().to_hex_literal(),
+ &account.address().to_hex_literal(),
1000000000000000000,
))
.await;
@@ -151,9 +176,7 @@ async fn test_get_account_resources_by_invalid_ledger_version() {
context.check_golden_output(resp);
}
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn test_get_account_modules_by_ledger_version() {
- let mut context = new_test_context(current_function_name!());
+async fn test_get_account_modules_by_ledger_version_with_context(mut context: TestContext) {
let payload =
aptos_stdlib::publish_module_source("test_module", "module 0xa550c18::test_module {}");
@@ -162,6 +185,10 @@ async fn test_get_account_modules_by_ledger_version() {
root_account.sign_with_transaction_builder(context.transaction_factory().payload(payload));
context.commit_block(&vec![txn.clone()]).await;
+ if let Some(indexer_reader) = context.context.indexer_reader.as_ref() {
+ indexer_reader.wait_for_internal_indexer(2).unwrap();
+ }
+
let modules = context
.get(&account_modules(
&context.root_account().await.address().to_hex_literal(),
@@ -178,6 +205,15 @@ async fn test_get_account_modules_by_ledger_version() {
assert_eq!(modules, json!([]));
}
+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+async fn test_get_account_modules_by_ledger_version() {
+ let context = new_test_context(current_function_name!());
+ test_get_account_modules_by_ledger_version_with_context(context).await;
+ let shard_context =
+ new_test_context_with_db_sharding_and_internal_indexer(current_function_name!());
+ test_get_account_modules_by_ledger_version_with_context(shard_context).await;
+}
+
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
async fn test_get_core_account_data() {
let mut context = new_test_context(current_function_name!());
diff --git a/api/src/tests/events_test.rs b/api/src/tests/events_test.rs
index acf517b61a04c..1c1f69830cc06 100644
--- a/api/src/tests/events_test.rs
+++ b/api/src/tests/events_test.rs
@@ -3,6 +3,7 @@
// SPDX-License-Identifier: Apache-2.0
use super::new_test_context;
+use crate::tests::new_test_context_with_db_sharding_and_internal_indexer;
use aptos_api_test_context::{current_function_name, TestContext};
use percent_encoding::{utf8_percent_encode, NON_ALPHANUMERIC};
use serde_json::json;
@@ -35,7 +36,21 @@ async fn test_get_events_filter_by_start_sequence_number() {
.as_str(),
)
.await;
- context.check_golden_output(resp);
+ context.check_golden_output(resp.clone());
+
+ // assert the same resp after db sharding migration with internal indexer turned on
+ let shard_context =
+ new_test_context_with_db_sharding_and_internal_indexer(current_function_name!());
+ let new_resp = shard_context
+ .get(
+ format!(
+ "/accounts/{}/events/{}?start=1",
+ ACCOUNT_ADDRESS, CREATION_NUMBER
+ )
+ .as_str(),
+ )
+ .await;
+ assert_eq!(resp, new_resp);
}
// turn it back until we have multiple events in genesis
@@ -84,7 +99,14 @@ async fn test_get_events_by_account_event_handle() {
let resp = context
.get("/accounts/0x1/events/0x1::reconfiguration::Configuration/events")
.await;
- context.check_golden_output(resp);
+ context.check_golden_output(resp.clone());
+
+ let shard_context =
+ new_test_context_with_db_sharding_and_internal_indexer(current_function_name!());
+ let new_resp = shard_context
+ .get("/accounts/0x1/events/0x1::reconfiguration::Configuration/events")
+ .await;
+ assert_eq!(resp, new_resp);
}
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
diff --git a/api/src/tests/mod.rs b/api/src/tests/mod.rs
index e581acdbad02a..e7978f66a126e 100644
--- a/api/src/tests/mod.rs
+++ b/api/src/tests/mod.rs
@@ -22,7 +22,7 @@ mod view_function;
mod webauthn_secp256r1_ecdsa;
use aptos_api_test_context::{new_test_context as super_new_test_context, TestContext};
-use aptos_config::config::NodeConfig;
+use aptos_config::config::{internal_indexer_db_config::InternalIndexerDBConfig, NodeConfig};
fn new_test_context(test_name: String) -> TestContext {
new_test_context_with_config(test_name, NodeConfig::default())
@@ -31,3 +31,10 @@ fn new_test_context(test_name: String) -> TestContext {
fn new_test_context_with_config(test_name: String, node_config: NodeConfig) -> TestContext {
super_new_test_context(test_name, node_config, false)
}
+
+fn new_test_context_with_db_sharding_and_internal_indexer(test_name: String) -> TestContext {
+ let mut node_config = NodeConfig::default();
+ node_config.storage.rocksdb_configs.enable_storage_sharding = true;
+ node_config.indexer_db_config = InternalIndexerDBConfig::new(true, true, true, 10_000);
+ super_new_test_context(test_name, node_config, true)
+}
diff --git a/api/src/tests/modules.rs b/api/src/tests/modules.rs
index e451ff9718585..66131a72f0de9 100644
--- a/api/src/tests/modules.rs
+++ b/api/src/tests/modules.rs
@@ -64,4 +64,23 @@ async fn test_abi() {
assert_eq!(function["is_view"], false);
}
+
+ // Confirm that MyEvent is considered an event.
+ let structs = modules.as_array().unwrap()[0]["abi"]["structs"]
+ .as_array()
+ .unwrap();
+ let my_event = structs
+ .iter()
+ .find(|s| s["name"].as_str().unwrap() == "MyEvent")
+ .unwrap();
+
+ assert_eq!(my_event["is_event"], true);
+
+ // Confirm that State is not considered an event.
+ let my_struct = structs
+ .iter()
+ .find(|s| s["name"].as_str().unwrap() == "State")
+ .unwrap();
+
+ assert_eq!(my_struct["is_event"], false);
}
diff --git a/api/src/tests/move/pack_abi/sources/test.move b/api/src/tests/move/pack_abi/sources/test.move
index 83b95de8f87bc..5bf35cbe4b2bb 100644
--- a/api/src/tests/move/pack_abi/sources/test.move
+++ b/api/src/tests/move/pack_abi/sources/test.move
@@ -4,6 +4,11 @@ module abi::test {
value: u64
}
+ #[event]
+ struct MyEvent has store {
+ value: u64
+ }
+
public fun public_function(s: &signer, state: State) {
move_to(s, state)
}
@@ -11,6 +16,7 @@ module abi::test {
public entry fun public_entry_function(s1: &signer, s2: &signer, value: u64) {
move_to(s1, State { value });
move_to(s2, State { value });
+
}
entry fun private_entry_function(s: &signer, value: u64) {
diff --git a/api/src/tests/multisig_transactions_test.rs b/api/src/tests/multisig_transactions_test.rs
index a01ccf1c9f547..b4f4cdddb6886 100644
--- a/api/src/tests/multisig_transactions_test.rs
+++ b/api/src/tests/multisig_transactions_test.rs
@@ -415,6 +415,54 @@ async fn test_multisig_transaction_with_mismatching_payload() {
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
async fn test_multisig_transaction_simulation() {
+ let mut context = new_test_context(current_function_name!());
+ let owner_account_1 = &mut context.create_account().await;
+ let owner_account_2 = &mut context.create_account().await;
+ let owner_account_3 = &mut context.create_account().await;
+ let multisig_account = context
+ .create_multisig_account(
+ owner_account_1,
+ vec![owner_account_2.address(), owner_account_3.address()],
+ 1, /* 1-of-3 */
+ 1000, /* initial balance */
+ )
+ .await;
+
+ let multisig_payload = construct_multisig_txn_transfer_payload(owner_account_1.address(), 1000);
+ context
+ .create_multisig_transaction(owner_account_1, multisig_account, multisig_payload.clone())
+ .await;
+
+ // Simulate the multisig tx
+ let simulation_resp = context
+ .simulate_multisig_transaction(
+ owner_account_1,
+ multisig_account,
+ "0x1::aptos_account::transfer",
+ &[],
+ &[&owner_account_1.address().to_hex_literal(), "1000"],
+ 200,
+ )
+ .await;
+ // Validate that the simulation did successfully execute a transfer of 1000 coins from the
+ // multisig account.
+ let simulation_resp = &simulation_resp.as_array().unwrap()[0];
+ assert!(simulation_resp["success"].as_bool().unwrap());
+ let withdraw_event = &simulation_resp["events"].as_array().unwrap()[0];
+ assert_eq!(
+ withdraw_event["type"].as_str().unwrap(),
+ "0x1::coin::CoinWithdraw"
+ );
+ let withdraw_from_account =
+ AccountAddress::from_hex_literal(withdraw_event["data"]["account"].as_str().unwrap())
+ .unwrap();
+ let withdrawn_amount = withdraw_event["data"]["amount"].as_str().unwrap();
+ assert_eq!(withdraw_from_account, multisig_account);
+ assert_eq!(withdrawn_amount, "1000");
+}
+
+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+async fn test_multisig_transaction_simulation_2_of_3() {
let mut context = new_test_context(current_function_name!());
let owner_account_1 = &mut context.create_account().await;
let owner_account_2 = &mut context.create_account().await;
@@ -429,8 +477,16 @@ async fn test_multisig_transaction_simulation() {
)
.await;
- // Should be able to simulate the multisig tx without having enough approvals or the transaction
- // created.
+ let multisig_payload = construct_multisig_txn_transfer_payload(owner_account_1.address(), 1000);
+ context
+ .create_multisig_transaction(owner_account_1, multisig_account, multisig_payload.clone())
+ .await;
+
+ context
+ .approve_multisig_transaction(owner_account_2, multisig_account, 1)
+ .await;
+
+ // Simulate the multisig transaction
let simulation_resp = context
.simulate_multisig_transaction(
owner_account_1,
@@ -456,6 +512,27 @@ async fn test_multisig_transaction_simulation() {
let withdrawn_amount = withdraw_event["data"]["amount"].as_str().unwrap();
assert_eq!(withdraw_from_account, multisig_account);
assert_eq!(withdrawn_amount, "1000");
+}
+
+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+async fn test_multisig_transaction_simulation_fail() {
+ let mut context = new_test_context(current_function_name!());
+ let owner_account_1 = &mut context.create_account().await;
+ let owner_account_2 = &mut context.create_account().await;
+ let owner_account_3 = &mut context.create_account().await;
+ let multisig_account = context
+ .create_multisig_account(
+ owner_account_1,
+ vec![owner_account_2.address(), owner_account_3.address()],
+ 1, /* 1-of-3 */
+ 1000, /* initial balance */
+ )
+ .await;
+
+ let multisig_payload = construct_multisig_txn_transfer_payload(owner_account_1.address(), 2000);
+ context
+ .create_multisig_transaction(owner_account_1, multisig_account, multisig_payload.clone())
+ .await;
// Simulating transferring more than what the multisig account has should fail.
let simulation_resp = context
@@ -469,7 +546,56 @@ async fn test_multisig_transaction_simulation() {
)
.await;
let simulation_resp = &simulation_resp.as_array().unwrap()[0];
+ let transaction_failed = &simulation_resp["events"]
+ .as_array()
+ .unwrap()
+ .iter()
+ .any(|event| {
+ event["type"]
+ .as_str()
+ .unwrap()
+ .contains("TransactionExecutionFailed")
+ });
+ assert!(transaction_failed);
+}
+
+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+async fn test_multisig_transaction_simulation_fail_2_of_3_insufficient_approvals() {
+ let mut context = new_test_context(current_function_name!());
+ let owner_account_1 = &mut context.create_account().await;
+ let owner_account_2 = &mut context.create_account().await;
+ let owner_account_3 = &mut context.create_account().await;
+ let multisig_account = context
+ .create_multisig_account(
+ owner_account_1,
+ vec![owner_account_2.address(), owner_account_3.address()],
+ 2, /* 2-of-3 */
+ 1000, /* initial balance */
+ )
+ .await;
+
+ let multisig_payload = construct_multisig_txn_transfer_payload(owner_account_1.address(), 2000);
+ context
+ .create_multisig_transaction(owner_account_1, multisig_account, multisig_payload.clone())
+ .await;
+
+ // Simulating without sufficient approvals has should fail.
+ let simulation_resp = context
+ .simulate_multisig_transaction(
+ owner_account_1,
+ multisig_account,
+ "0x1::aptos_account::transfer",
+ &[],
+ &[&owner_account_1.address().to_hex_literal(), "1000"],
+ 200,
+ )
+ .await;
+ let simulation_resp = &simulation_resp.as_array().unwrap()[0];
assert!(!simulation_resp["success"].as_bool().unwrap());
+ assert!(simulation_resp["vm_status"]
+ .as_str()
+ .unwrap()
+ .contains("MULTISIG_TRANSACTION_INSUFFICIENT_APPROVALS"));
}
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
@@ -487,6 +613,11 @@ async fn test_simulate_multisig_transaction_should_charge_gas_against_sender() {
.await;
assert_eq!(10, context.get_apt_balance(multisig_account).await);
+ let multisig_payload = construct_multisig_txn_transfer_payload(owner_account.address(), 10);
+ context
+ .create_multisig_transaction(owner_account, multisig_account, multisig_payload.clone())
+ .await;
+
// This simulation should succeed because gas should be paid out of the sender account (owner),
// not the multisig account itself.
let simulation_resp = context
diff --git a/api/src/tests/simulation_test.rs b/api/src/tests/simulation_test.rs
index 3e60ecb9af937..7f2623e1f028e 100644
--- a/api/src/tests/simulation_test.rs
+++ b/api/src/tests/simulation_test.rs
@@ -2,10 +2,14 @@
// SPDX-License-Identifier: Apache-2.0
use super::new_test_context;
-use aptos_api_test_context::{current_function_name, TestContext};
+use aptos_api_test_context::{current_function_name, pretty, TestContext};
use aptos_crypto::ed25519::Ed25519Signature;
-use aptos_types::transaction::{
- authenticator::TransactionAuthenticator, EntryFunction, TransactionPayload,
+use aptos_types::{
+ account_address::AccountAddress,
+ transaction::{
+ authenticator::{AccountAuthenticator, TransactionAuthenticator},
+ EntryFunction, RawTransaction, SignedTransaction, TransactionPayload,
+ },
};
use move_core_types::{ident_str, language_storage::ModuleId};
use serde_json::json;
@@ -153,3 +157,272 @@ async fn test_simulate_txn_with_aggregator() {
unreachable!("Simulation uses Ed25519 authenticator.");
}
}
+
+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+async fn test_bcs_simulate_simple() {
+ let transfer_amount: u64 = SMALL_TRANSFER_AMOUNT;
+
+ let mut context = new_test_context(current_function_name!());
+ let alice = &mut context.gen_account();
+ let bob = &mut context.gen_account();
+ let txn = context.mint_user_account(alice).await;
+ context.commit_block(&vec![txn]).await;
+
+ let txn = context.account_transfer_to(alice, bob.address(), transfer_amount);
+ let body = bcs::to_bytes(&txn).unwrap();
+
+ // expected to fail due to using a valid signature.
+ let _resp = context
+ .expect_status_code(400)
+ .post_bcs_txn("/transactions/simulate", body)
+ .await;
+
+ if let TransactionAuthenticator::Ed25519 {
+ public_key,
+ signature: _,
+ } = txn.authenticator_ref()
+ {
+ let txn = SignedTransaction::new_signed_transaction(
+ txn.clone().into_raw_transaction(),
+ TransactionAuthenticator::Ed25519 {
+ public_key: public_key.clone(),
+ signature: Ed25519Signature::dummy_signature(),
+ },
+ );
+
+ let body = bcs::to_bytes(&txn).unwrap();
+
+ // expected to succeed
+ let resp = context
+ .expect_status_code(200)
+ .post_bcs_txn("/transactions/simulate", body)
+ .await;
+
+ assert!(resp[0]["success"].as_bool().unwrap(), "{}", pretty(&resp));
+ } else {
+ unreachable!("Simulation uses Ed25519 authenticator.");
+ }
+}
+
+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+async fn test_bcs_simulate_without_auth_key_check() {
+ let transfer_amount: u64 = SMALL_TRANSFER_AMOUNT;
+
+ let mut context = new_test_context(current_function_name!());
+ let alice = &mut context.gen_account();
+ let bob = &mut context.gen_account();
+ let txn = context.mint_user_account(alice).await;
+ context.commit_block(&vec![txn]).await;
+
+ // Construct a signed transaction.
+ let txn = context.account_transfer_to(alice, bob.address(), transfer_amount);
+ // Replace the authenticator with a NoAccountAuthenticator in the transaction.
+ let txn = SignedTransaction::new_signed_transaction(
+ txn.clone().into_raw_transaction(),
+ TransactionAuthenticator::SingleSender {
+ sender: AccountAuthenticator::NoAccountAuthenticator,
+ },
+ );
+
+ let body = bcs::to_bytes(&txn).unwrap();
+
+ // expected to succeed
+ let resp = context
+ .expect_status_code(200)
+ .post_bcs_txn("/transactions/simulate", body)
+ .await;
+ assert!(resp[0]["success"].as_bool().unwrap(), "{}", pretty(&resp));
+}
+
+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+async fn test_bcs_simulate_fee_payer_transaction_without_gas_fee_check() {
+ let mut context = new_test_context(current_function_name!());
+ let alice = &mut context.gen_account();
+ let bob = &mut context.gen_account();
+ let txn = context.mint_user_account(alice).await;
+ context.commit_block(&vec![txn]).await;
+
+ let transfer_amount: u64 = SMALL_TRANSFER_AMOUNT;
+ let txn = context.account_transfer_to(alice, bob.address(), transfer_amount);
+ let raw_txn = RawTransaction::new(
+ txn.sender(),
+ txn.sequence_number(),
+ txn.payload().clone(),
+ txn.max_gas_amount(),
+ 100,
+ txn.expiration_timestamp_secs(),
+ txn.chain_id(),
+ );
+ let txn = SignedTransaction::new_signed_transaction(
+ raw_txn.clone(),
+ TransactionAuthenticator::FeePayer {
+ sender: AccountAuthenticator::NoAccountAuthenticator,
+ secondary_signer_addresses: vec![],
+ secondary_signers: vec![],
+ fee_payer_address: AccountAddress::ONE,
+ fee_payer_signer: AccountAuthenticator::NoAccountAuthenticator,
+ },
+ );
+ let body = bcs::to_bytes(&txn).unwrap();
+ let resp = context
+ .expect_status_code(200)
+ .post_bcs_txn("/transactions/simulate", body)
+ .await;
+ assert!(!resp[0]["success"].as_bool().unwrap(), "{}", pretty(&resp));
+ assert!(
+ resp[0]["vm_status"]
+ .as_str()
+ .unwrap()
+ .contains("INSUFFICIENT_BALANCE_FOR_TRANSACTION_FEE"),
+ "{}",
+ pretty(&resp)
+ );
+
+ let txn = SignedTransaction::new_signed_transaction(
+ raw_txn.clone(),
+ TransactionAuthenticator::FeePayer {
+ sender: AccountAuthenticator::NoAccountAuthenticator,
+ secondary_signer_addresses: vec![],
+ secondary_signers: vec![],
+ fee_payer_address: AccountAddress::ZERO,
+ fee_payer_signer: AccountAuthenticator::NoAccountAuthenticator,
+ },
+ );
+ let body = bcs::to_bytes(&txn).unwrap();
+ let resp = context
+ .expect_status_code(200)
+ .post_bcs_txn("/transactions/simulate", body)
+ .await;
+ assert!(resp[0]["success"].as_bool().unwrap(), "{}", pretty(&resp));
+}
+
+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+async fn test_bcs_simulate_automated_account_creation() {
+ let mut context = new_test_context(current_function_name!());
+ let alice = &mut context.gen_account();
+ let bob = &mut context.gen_account();
+
+ let transfer_amount: u64 = 0;
+ let txn = context.account_transfer_to(alice, bob.address(), transfer_amount);
+ let raw_txn = RawTransaction::new(
+ txn.sender(),
+ txn.sequence_number(),
+ txn.payload().clone(),
+ txn.max_gas_amount(),
+ 100,
+ txn.expiration_timestamp_secs(),
+ txn.chain_id(),
+ );
+ // Replace the authenticator with a NoAccountAuthenticator in the transaction.
+ let txn = SignedTransaction::new_signed_transaction(
+ raw_txn.clone(),
+ TransactionAuthenticator::SingleSender {
+ sender: AccountAuthenticator::NoAccountAuthenticator,
+ },
+ );
+
+ let body = bcs::to_bytes(&txn).unwrap();
+
+ let resp = context
+ .expect_status_code(200)
+ .post_bcs_txn("/transactions/simulate", body)
+ .await;
+ assert!(!resp[0]["success"].as_bool().unwrap(), "{}", pretty(&resp));
+ assert!(
+ resp[0]["vm_status"]
+ .as_str()
+ .unwrap()
+ .contains("SENDING_ACCOUNT_DOES_NOT_EXIST"),
+ "{}",
+ pretty(&resp)
+ );
+
+ let txn =
+ SignedTransaction::new_signed_transaction(raw_txn, TransactionAuthenticator::FeePayer {
+ sender: AccountAuthenticator::NoAccountAuthenticator,
+ secondary_signer_addresses: vec![],
+ secondary_signers: vec![],
+ fee_payer_address: AccountAddress::ZERO,
+ fee_payer_signer: AccountAuthenticator::NoAccountAuthenticator,
+ });
+ let body = bcs::to_bytes(&txn).unwrap();
+ let resp = context
+ .expect_status_code(200)
+ .post_bcs_txn("/transactions/simulate", body)
+ .await;
+ assert!(resp[0]["success"].as_bool().unwrap(), "{}", pretty(&resp));
+}
+
+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+async fn test_bcs_execute_simple_no_authenticator_fail() {
+ let transfer_amount: u64 = SMALL_TRANSFER_AMOUNT;
+
+ let mut context = new_test_context(current_function_name!());
+ let alice = &mut context.gen_account();
+ let bob = &mut context.gen_account();
+ let txn = context.mint_user_account(alice).await;
+ context.commit_block(&vec![txn]).await;
+
+ // Construct a signed transaction.
+ let txn = context.account_transfer_to(alice, bob.address(), transfer_amount);
+ // Replace the authenticator with a NoAccountAuthenticator in the transaction.
+ let txn = SignedTransaction::new_signed_transaction(
+ txn.clone().into_raw_transaction(),
+ TransactionAuthenticator::SingleSender {
+ sender: AccountAuthenticator::NoAccountAuthenticator,
+ },
+ );
+
+ let body = bcs::to_bytes(&txn).unwrap();
+
+ // expected to fail due to the use of NoAccountAuthenticator in an actual execution
+ let resp = context
+ .expect_status_code(400)
+ .post_bcs_txn("/transactions", body)
+ .await;
+ assert!(resp["message"]
+ .as_str()
+ .unwrap()
+ .contains("INVALID_SIGNATURE"));
+}
+
+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+async fn test_bcs_execute_fee_payer_transaction_no_authenticator_fail() {
+ let mut context = new_test_context(current_function_name!());
+ let alice = &mut context.gen_account();
+ let bob = &mut context.gen_account();
+ let txn = context.mint_user_account(alice).await;
+ context.commit_block(&vec![txn]).await;
+
+ let transfer_amount: u64 = SMALL_TRANSFER_AMOUNT;
+ let txn = context.account_transfer_to(alice, bob.address(), transfer_amount);
+ let raw_txn = RawTransaction::new(
+ txn.sender(),
+ txn.sequence_number(),
+ txn.payload().clone(),
+ txn.max_gas_amount(),
+ 100,
+ txn.expiration_timestamp_secs(),
+ txn.chain_id(),
+ );
+
+ let txn = SignedTransaction::new_signed_transaction(
+ raw_txn.clone(),
+ TransactionAuthenticator::FeePayer {
+ sender: AccountAuthenticator::NoAccountAuthenticator,
+ secondary_signer_addresses: vec![],
+ secondary_signers: vec![],
+ fee_payer_address: AccountAddress::ZERO,
+ fee_payer_signer: AccountAuthenticator::NoAccountAuthenticator,
+ },
+ );
+ let body = bcs::to_bytes(&txn).unwrap();
+ let resp = context
+ .expect_status_code(400)
+ .post_bcs_txn("/transactions", body)
+ .await;
+ assert!(resp["message"]
+ .as_str()
+ .unwrap()
+ .contains("INVALID_SIGNATURE"));
+}
diff --git a/api/src/tests/state_test.rs b/api/src/tests/state_test.rs
index 48ba32bc23444..e1ace9ca255e9 100644
--- a/api/src/tests/state_test.rs
+++ b/api/src/tests/state_test.rs
@@ -171,7 +171,7 @@ async fn test_merkle_leaves_with_nft_transfer() {
let num_leaves_at_beginning = ctx
.db
- .get_state_leaf_count(ctx.db.get_latest_ledger_info_version().unwrap())
+ .get_state_item_count(ctx.db.get_latest_ledger_info_version().unwrap())
.unwrap();
let transfer_to_owner_txn = creator.sign_multi_agent_with_transaction_builder(
@@ -188,7 +188,7 @@ async fn test_merkle_leaves_with_nft_transfer() {
ctx.commit_block(&vec![transfer_to_owner_txn]).await;
let num_leaves_after_transfer_nft = ctx
.db
- .get_state_leaf_count(ctx.db.get_latest_ledger_info_version().unwrap())
+ .get_state_item_count(ctx.db.get_latest_ledger_info_version().unwrap())
.unwrap();
assert_eq!(
num_leaves_after_transfer_nft,
@@ -209,7 +209,7 @@ async fn test_merkle_leaves_with_nft_transfer() {
ctx.commit_block(&vec![transfer_to_creator_txn]).await;
let num_leaves_after_return_nft = ctx
.db
- .get_state_leaf_count(ctx.db.get_latest_ledger_info_version().unwrap())
+ .get_state_item_count(ctx.db.get_latest_ledger_info_version().unwrap())
.unwrap();
assert_eq!(
diff --git a/api/src/tests/transactions_test.rs b/api/src/tests/transactions_test.rs
index 0c5ef97e0db06..a05da2c713e49 100644
--- a/api/src/tests/transactions_test.rs
+++ b/api/src/tests/transactions_test.rs
@@ -3,7 +3,9 @@
// SPDX-License-Identifier: Apache-2.0
use super::new_test_context;
-use crate::tests::new_test_context_with_config;
+use crate::tests::{
+ new_test_context_with_config, new_test_context_with_db_sharding_and_internal_indexer,
+};
use aptos_api_test_context::{assert_json, current_function_name, pretty, TestContext};
use aptos_config::config::{GasEstimationStaticOverride, NodeConfig};
use aptos_crypto::{
@@ -19,7 +21,7 @@ use aptos_types::{
authenticator::{AuthenticationKey, TransactionAuthenticator},
EntryFunction, Script, SignedTransaction,
},
- utility_coin::SUPRA_COIN_TYPE,
+ utility_coin::{SupraCoinType, CoinType},
};
use move_core_types::{
identifier::Identifier,
@@ -750,13 +752,15 @@ async fn test_signing_message_with_payload(
assert_eq!(ledger["ledger_version"].as_str().unwrap(), "3"); // metadata + user txn + state checkpoint
}
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn test_get_account_transactions() {
- let mut context = new_test_context(current_function_name!());
+async fn test_account_transaction_with_context(mut context: TestContext) {
let account = context.gen_account();
let txn = context.create_user_account(&account).await;
context.commit_block(&vec![txn]).await;
+ if let Some(indexer_reader) = context.context.indexer_reader.as_ref() {
+ indexer_reader.wait_for_internal_indexer(2).unwrap();
+ }
+
let txns = context
.get(
format!(
@@ -771,6 +775,15 @@ async fn test_get_account_transactions() {
assert_json(txns, expected_txns);
}
+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+async fn test_get_account_transactions() {
+ let context = new_test_context(current_function_name!());
+ test_account_transaction_with_context(context).await;
+ let shard_context =
+ new_test_context_with_db_sharding_and_internal_indexer(current_function_name!());
+ test_account_transaction_with_context(shard_context).await;
+}
+
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
async fn test_get_account_transactions_filter_transactions_by_start_sequence_number() {
let mut context = new_test_context(current_function_name!());
@@ -866,7 +879,7 @@ async fn test_get_txn_execute_failed_by_invalid_entry_function_address() {
"0x1222",
"Coin",
"transfer",
- vec![SUPRA_COIN_TYPE.clone()],
+ vec![SupraCoinType::type_tag()],
vec![
bcs::to_bytes(&AccountAddress::from_hex_literal("0xdd").unwrap()).unwrap(),
bcs::to_bytes(&1u64).unwrap(),
@@ -885,7 +898,7 @@ async fn test_get_txn_execute_failed_by_invalid_entry_function_module_name() {
"0x1",
"CoinInvalid",
"transfer",
- vec![SUPRA_COIN_TYPE.clone()],
+ vec![SupraCoinType::type_tag()],
vec![
bcs::to_bytes(&AccountAddress::from_hex_literal("0xdd").unwrap()).unwrap(),
bcs::to_bytes(&1u64).unwrap(),
@@ -904,7 +917,7 @@ async fn test_get_txn_execute_failed_by_invalid_entry_function_name() {
"0x1",
"Coin",
"transfer_invalid",
- vec![SUPRA_COIN_TYPE.clone()],
+ vec![SupraCoinType::type_tag()],
vec![
bcs::to_bytes(&AccountAddress::from_hex_literal("0xdd").unwrap()).unwrap(),
bcs::to_bytes(&1u64).unwrap(),
@@ -923,7 +936,7 @@ async fn test_get_txn_execute_failed_by_invalid_entry_function_arguments() {
"0x1",
"Coin",
"transfer",
- vec![SUPRA_COIN_TYPE.clone()],
+ vec![SupraCoinType::type_tag()],
vec![
bcs::to_bytes(&AccountAddress::from_hex_literal("0xdd").unwrap()).unwrap(),
bcs::to_bytes(&1u8).unwrap(), // invalid type
@@ -942,7 +955,7 @@ async fn test_get_txn_execute_failed_by_missing_entry_function_arguments() {
"0x1",
"Coin",
"transfer",
- vec![SUPRA_COIN_TYPE.clone()],
+ vec![SupraCoinType::type_tag()],
vec![
bcs::to_bytes(&AccountAddress::from_hex_literal("0xdd").unwrap()).unwrap(),
// missing arguments
@@ -965,7 +978,7 @@ async fn test_get_txn_execute_failed_by_entry_function_validation() {
"0x1",
"Coin",
"transfer",
- vec![SUPRA_COIN_TYPE.clone()],
+ vec![SupraCoinType::type_tag()],
vec![
bcs::to_bytes(&AccountAddress::from_hex_literal("0xdd").unwrap()).unwrap(),
bcs::to_bytes(&123u64).unwrap(), // exceed limit, account balance is 0.
@@ -988,7 +1001,7 @@ async fn test_get_txn_execute_failed_by_entry_function_invalid_module_name() {
"0x1",
"coin",
"transfer::what::what",
- vec![SUPRA_COIN_TYPE.clone()],
+ vec![SupraCoinType::type_tag()],
vec![
bcs::to_bytes(&AccountAddress::from_hex_literal("0xdd").unwrap()).unwrap(),
bcs::to_bytes(&123u64).unwrap(), // exceed limit, account balance is 0.
@@ -1011,7 +1024,7 @@ async fn test_get_txn_execute_failed_by_entry_function_invalid_function_name() {
"0x1",
"coin::coin",
"transfer",
- vec![SUPRA_COIN_TYPE.clone()],
+ vec![SupraCoinType::type_tag()],
vec![
bcs::to_bytes(&AccountAddress::from_hex_literal("0xdd").unwrap()).unwrap(),
bcs::to_bytes(&123u64).unwrap(), // exceed limit, account balance is 0.
@@ -1552,7 +1565,7 @@ async fn test_simulation_failure_with_detail_error() {
Identifier::new("MemeCoin").unwrap(),
),
Identifier::new("transfer").unwrap(),
- vec![SUPRA_COIN_TYPE.clone()],
+ vec![SupraCoinType::type_tag()],
vec![
bcs::to_bytes(&AccountAddress::from_hex_literal("0xdd").unwrap()).unwrap(),
bcs::to_bytes(&1u64).unwrap(),
diff --git a/api/src/transactions.rs b/api/src/transactions.rs
index 76e78c8bea425..4d972b17161e4 100644
--- a/api/src/transactions.rs
+++ b/api/src/transactions.rs
@@ -37,7 +37,7 @@ use aptos_types::{
RawTransactionWithData, SignedTransaction, TransactionPayload,
},
vm_status::StatusCode,
- SUPRA_COIN_TYPE,
+ SupraCoinType, CoinType,
};
use aptos_vm::{AptosSimulationVM, AptosVM};
use move_core_types::{ident_str, language_storage::ModuleId, vm_status::VMStatus};
@@ -568,7 +568,7 @@ impl TransactionsApi {
&state_view,
ModuleId::new(AccountAddress::ONE, ident_str!("coin").into()),
ident_str!("balance").into(),
- vec![SUPRA_COIN_TYPE.clone()],
+ vec![SupraCoinType::type_tag()],
vec![signed_transaction.sender().to_vec()],
context.node_config.api.max_gas_view_function,
);
@@ -995,7 +995,7 @@ impl TransactionsApi {
address.into(),
page.start_option(),
page.limit(&latest_ledger_info)?,
- latest_ledger_info.version(),
+ account.ledger_version,
&latest_ledger_info,
)?;
match accept_type {
@@ -1435,8 +1435,7 @@ impl TransactionsApi {
let mut user_transactions = Vec::new();
for transaction in transactions.into_iter() {
match transaction {
- Transaction::UserTransaction(user_txn) => {
- let mut txn = *user_txn;
+ Transaction::UserTransaction(mut user_txn) => {
match &vm_status {
VMStatus::Error {
message: Some(msg), ..
@@ -1444,13 +1443,13 @@ impl TransactionsApi {
| VMStatus::ExecutionFailure {
message: Some(msg), ..
} => {
- txn.info.vm_status +=
+ user_txn.info.vm_status +=
format!("\nExecution failed with message: {}", msg)
.as_str();
},
_ => (),
}
- user_transactions.push(txn);
+ user_transactions.push(user_txn);
},
_ => {
return Err(SubmitTransactionError::internal_with_code(
diff --git a/api/test-context/Cargo.toml b/api/test-context/Cargo.toml
index 9c4a9e61a8858..db9be88d6dee1 100644
--- a/api/test-context/Cargo.toml
+++ b/api/test-context/Cargo.toml
@@ -23,6 +23,7 @@ aptos-executor = { workspace = true }
aptos-executor-types = { workspace = true }
aptos-framework = { workspace = true }
aptos-genesis = { workspace = true }
+aptos-indexer-grpc-table-info = { workspace = true }
aptos-mempool = { workspace = true, features = ["fuzzing"] }
aptos-mempool-notifications = { workspace = true }
aptos-sdk = { workspace = true }
diff --git a/api/test-context/src/test_context.rs b/api/test-context/src/test_context.rs
index 609019db0d513..4f17097f7c271 100644
--- a/api/test-context/src/test_context.rs
+++ b/api/test-context/src/test_context.rs
@@ -10,7 +10,7 @@ use aptos_api_types::{
use aptos_cached_packages::aptos_stdlib;
use aptos_config::{
config::{
- NodeConfig, RocksdbConfigs, StorageDirPaths, BUFFERED_STATE_TARGET_ITEMS,
+ NodeConfig, RocksdbConfigs, StorageDirPaths, BUFFERED_STATE_TARGET_ITEMS_FOR_TEST,
DEFAULT_MAX_NUM_NODES_PER_LRU_CACHE_SHARD, NO_OP_STORAGE_PRUNER_CONFIG,
},
keys::ConfigKey,
@@ -20,6 +20,7 @@ use aptos_db::AptosDB;
use aptos_executor::{block_executor::BlockExecutor, db_bootstrapper};
use aptos_executor_types::BlockExecutorTrait;
use aptos_framework::BuiltPackage;
+use aptos_indexer_grpc_table_info::internal_indexer_db_service::MockInternalIndexerDBService;
use aptos_mempool::mocks::MockSharedMempool;
use aptos_mempool_notifications::MempoolNotificationSender;
use aptos_sdk::{
@@ -94,7 +95,7 @@ impl ApiSpecificConfig {
pub fn new_test_context(
test_name: String,
- node_config: NodeConfig,
+ mut node_config: NodeConfig,
use_db_with_indexer: bool,
) -> TestContext {
// Speculative logging uses a global variable and when many instances use it together, they
@@ -119,17 +120,27 @@ pub fn new_test_context(
let validator_owner = validator_identity.account_address.unwrap();
let (db, db_rw) = if use_db_with_indexer {
- DbReaderWriter::wrap(AptosDB::new_for_test_with_indexer(&tmp_dir))
+ DbReaderWriter::wrap(AptosDB::new_for_test_with_indexer(
+ &tmp_dir,
+ node_config.storage.rocksdb_configs.enable_storage_sharding,
+ ))
} else {
DbReaderWriter::wrap(
AptosDB::open(
StorageDirPaths::from_path(&tmp_dir),
false, /* readonly */
NO_OP_STORAGE_PRUNER_CONFIG, /* pruner */
- RocksdbConfigs::default(),
+ RocksdbConfigs {
+ enable_storage_sharding: node_config
+ .storage
+ .rocksdb_configs
+ .enable_storage_sharding,
+ ..Default::default()
+ },
false, /* indexer */
- BUFFERED_STATE_TARGET_ITEMS,
+ BUFFERED_STATE_TARGET_ITEMS_FOR_TEST,
DEFAULT_MAX_NUM_NODES_PER_LRU_CACHE_SHARD,
+ None,
)
.unwrap(),
)
@@ -140,12 +151,18 @@ pub fn new_test_context(
let mempool = MockSharedMempool::new_in_runtime(&db_rw, VMValidator::new(db.clone()));
+ node_config
+ .storage
+ .set_data_dir(tmp_dir.path().to_path_buf());
+ let mock_indexer_service =
+ MockInternalIndexerDBService::new_for_test(db_rw.reader.clone(), &node_config);
+
let context = Context::new(
ChainId::test(),
db.clone(),
mempool.ac_client.clone(),
node_config.clone(),
- None, /* table info reader */
+ mock_indexer_service.get_indexer_reader(),
);
// Configure the testing depending on which API version we're testing.
diff --git a/api/types/src/bytecode.rs b/api/types/src/bytecode.rs
index 83e6ab0b8d89f..0f9a40e243805 100644
--- a/api/types/src/bytecode.rs
+++ b/api/types/src/bytecode.rs
@@ -46,6 +46,16 @@ pub trait Bytecode {
fn function_is_view(&self, name: &IdentStr) -> bool;
+ fn struct_is_event(&self, name: &IdentStr) -> bool {
+ match self.metadata() {
+ Some(m) => match m.struct_attributes.get(name.as_str()) {
+ Some(attrs) => attrs.iter().any(|attr| attr.is_event()),
+ None => false,
+ },
+ None => false,
+ }
+ }
+
fn new_move_struct_field(&self, def: &FieldDefinition) -> MoveStructField {
MoveStructField {
name: self.identifier_at(def.name).to_owned().into(),
@@ -109,8 +119,13 @@ pub trait Bytecode {
.map(|f| self.new_move_struct_field(f))
.collect(),
),
+ StructFieldInformation::DeclaredVariants(..) => {
+ // TODO(#13806): implement for enums. Currently we pretend they don't have fields
+ (false, vec![])
+ },
};
let name = self.identifier_at(handle.name).to_owned();
+ let is_event = self.struct_is_event(&name);
let abilities = handle
.abilities
.into_iter()
@@ -124,6 +139,7 @@ pub trait Bytecode {
MoveStruct {
name: name.into(),
is_native,
+ is_event,
abilities,
generic_type_params,
fields,
diff --git a/api/types/src/convert.rs b/api/types/src/convert.rs
index d7d160fb1d585..c5101f72d7d2e 100644
--- a/api/types/src/convert.rs
+++ b/api/types/src/convert.rs
@@ -45,6 +45,7 @@ use move_core_types::{
ident_str,
identifier::{IdentStr, Identifier},
language_storage::{ModuleId, StructTag, TypeTag},
+ transaction_argument::convert_txn_args,
value::{MoveStructLayout, MoveTypeLayout},
};
use serde_json::Value;
@@ -154,7 +155,10 @@ impl<'a, S: StateView> MoveConverter<'a, S> {
&self,
typ: &StructTag,
bytes: &'_ [u8],
- ) -> Result> {
+ ) -> Result<(
+ Option,
+ Vec<(Identifier, move_core_types::value::MoveValue)>,
+ )> {
self.inner.view_struct_fields(typ, bytes)
}
@@ -272,7 +276,26 @@ impl<'a, S: StateView> MoveConverter<'a, S> {
) -> Result {
use aptos_types::transaction::TransactionPayload::*;
let ret = match payload {
- Script(s) => TransactionPayload::ScriptPayload(s.try_into()?),
+ Script(s) => {
+ let (code, ty_args, args) = s.into_inner();
+ let script_args = self.inner.view_script_arguments(&code, &args, &ty_args);
+
+ let json_args = match script_args {
+ Ok(values) => values
+ .into_iter()
+ .map(|v| MoveValue::try_from(v)?.json())
+ .collect::>()?,
+ Err(_e) => convert_txn_args(&args)
+ .into_iter()
+ .map(|arg| HexEncodedBytes::from(arg).json())
+ .collect::>()?,
+ };
+ TransactionPayload::ScriptPayload(ScriptPayload {
+ code: MoveScriptBytecode::new(code).try_parse_abi(),
+ type_arguments: ty_args.into_iter().map(|arg| arg.into()).collect(),
+ arguments: json_args,
+ })
+ },
EntryFunction(fun) => {
let (module, function, ty_args, args) = fun.into_inner();
let func_args = self
@@ -988,14 +1011,9 @@ impl<'a, S: StateView> MoveConverter<'a, S> {
fn get_table_info(&self, handle: TableHandle) -> Result> {
if let Some(indexer_reader) = self.indexer_reader.as_ref() {
- // Attempt to get table_info from the indexer_reader if it exists
- Ok(indexer_reader.get_table_info(handle)?)
- } else if self.db.indexer_enabled() {
- // Attempt to get table_info from the db if indexer is enabled
- Ok(Some(self.db.get_table_info(handle)?))
- } else {
- Ok(None)
+ return Ok(indexer_reader.get_table_info(handle).unwrap_or(None));
}
+ Ok(None)
}
pub fn explain_vm_status(
@@ -1003,7 +1021,13 @@ impl<'a, S: StateView> MoveConverter<'a, S> {
status: &ExecutionStatus,
txn_aux_data: Option,
) -> String {
- match status {
+ let mut status = status.to_owned();
+ status = if let Some(aux_data) = txn_aux_data {
+ ExecutionStatus::aug_with_aux_data(status, &aux_data)
+ } else {
+ status
+ };
+ match &status {
ExecutionStatus::MoveAbort {
location,
code,
@@ -1055,17 +1079,10 @@ impl<'a, S: StateView> MoveConverter<'a, S> {
)
},
ExecutionStatus::MiscellaneousError(code) => {
- if txn_aux_data.is_none() && code.is_none() {
+ if code.is_none() {
"Execution failed with miscellaneous error and no status code".to_owned()
- } else if code.is_some() {
- format!("{:#?}", code.unwrap())
} else {
- let aux_data = txn_aux_data.unwrap();
- let vm_details = aux_data.get_detail_error_message();
- vm_details.map_or(
- "Execution failed with miscellaneous error and no status code".to_owned(),
- |e| format!("{:#?}", e.status_code()),
- )
+ format!("{:#?}", code.unwrap())
}
},
}
diff --git a/api/types/src/error.rs b/api/types/src/error.rs
index cb0d61bc67ffb..3f7454f50c9b8 100644
--- a/api/types/src/error.rs
+++ b/api/types/src/error.rs
@@ -53,7 +53,7 @@ impl AptosError {
/// These codes provide more granular error information beyond just the HTTP
/// status code of the response.
-#[derive(Copy, Clone, Debug, Serialize, Deserialize, Enum)]
+#[derive(Copy, Clone, Debug, PartialEq, Serialize, Deserialize, Enum)]
#[oai(rename_all = "snake_case")]
#[serde(rename_all = "snake_case")]
#[repr(u32)]
diff --git a/api/types/src/ledger_info.rs b/api/types/src/ledger_info.rs
index ef912190c94c9..97438ae104013 100644
--- a/api/types/src/ledger_info.rs
+++ b/api/types/src/ledger_info.rs
@@ -40,6 +40,26 @@ impl LedgerInfo {
}
}
+ pub fn new_ledger_info(
+ chain_id: &ChainId,
+ epoch: u64,
+ ledger_version: u64,
+ oldest_ledger_version: u64,
+ oldest_block_height: u64,
+ block_height: u64,
+ ledger_timestamp: u64,
+ ) -> Self {
+ Self {
+ chain_id: chain_id.id(),
+ epoch: epoch.into(),
+ ledger_version: ledger_version.into(),
+ oldest_ledger_version: oldest_ledger_version.into(),
+ block_height: block_height.into(),
+ oldest_block_height: oldest_block_height.into(),
+ ledger_timestamp: ledger_timestamp.into(),
+ }
+ }
+
pub fn epoch(&self) -> u64 {
self.epoch.into()
}
diff --git a/api/types/src/lib.rs b/api/types/src/lib.rs
index ccb1da50d0a8c..e7ab206cde38a 100644
--- a/api/types/src/lib.rs
+++ b/api/types/src/lib.rs
@@ -49,9 +49,9 @@ pub use transaction::{
DirectWriteSet, Ed25519Signature, EncodeSubmissionRequest, EntryFunctionPayload, Event,
FeePayerSignature, GasEstimation, GasEstimationBcs, GenesisPayload, GenesisTransaction,
MultiAgentSignature, MultiEd25519Signature, MultiKeySignature, MultisigPayload,
- MultisigTransactionPayload, PendingTransaction, PublicKey, ScriptPayload, ScriptWriteSet,
- Signature, SingleKeySignature, SubmitTransactionRequest, Transaction, TransactionData,
- TransactionId, TransactionInfo, TransactionOnChainData, TransactionPayload,
+ MultisigTransactionPayload, NoAccountSignature, PendingTransaction, PublicKey, ScriptPayload,
+ ScriptWriteSet, Signature, SingleKeySignature, SubmitTransactionRequest, Transaction,
+ TransactionData, TransactionId, TransactionInfo, TransactionOnChainData, TransactionPayload,
TransactionSignature, TransactionSigningMessage, TransactionsBatchSingleSubmissionFailure,
TransactionsBatchSubmissionResult, UserCreateSigningMessageRequest, UserTransaction,
UserTransactionRequest, VersionedEvent, WriteModule, WriteResource, WriteSet, WriteSetChange,
diff --git a/api/types/src/move_types.rs b/api/types/src/move_types.rs
index 38aaadbf82c7f..885b01e39b3cd 100644
--- a/api/types/src/move_types.rs
+++ b/api/types/src/move_types.rs
@@ -225,6 +225,12 @@ impl TryFrom for MoveStructValue {
fn try_from(s: AnnotatedMoveStruct) -> anyhow::Result {
let mut map = BTreeMap::new();
+ if let Some((_, name)) = s.variant_info {
+ map.insert(
+ IdentifierWrapper::from_str("__variant__")?,
+ MoveValue::String(name.to_string()).json()?,
+ );
+ }
for (id, val) in s.value {
map.insert(id.into(), MoveValue::try_from(val)?.json()?);
}
@@ -324,6 +330,7 @@ impl From for MoveValue {
TransactionArgument::Bool(v) => MoveValue::Bool(v),
TransactionArgument::Address(v) => MoveValue::Address(v.into()),
TransactionArgument::U8Vector(bytes) => MoveValue::Bytes(HexEncodedBytes(bytes)),
+ TransactionArgument::Serialized(bytes) => MoveValue::Bytes(HexEncodedBytes(bytes)),
}
}
}
@@ -853,6 +860,8 @@ pub struct MoveStruct {
pub name: IdentifierWrapper,
/// Whether the struct is a native struct of Move
pub is_native: bool,
+ /// Whether the struct is marked with the #[event] annotation
+ pub is_event: bool,
/// Abilities associated with the struct
pub abilities: Vec,
/// Generic types associated with the struct
@@ -1506,6 +1515,7 @@ mod tests {
AnnotatedMoveStruct {
abilities: AbilitySet::EMPTY,
ty_tag: type_struct(typ),
+ variant_info: None,
value: values,
}
}
diff --git a/api/types/src/transaction.rs b/api/types/src/transaction.rs
index 602d40607c2b3..4af7dae0b843e 100755
--- a/api/types/src/transaction.rs
+++ b/api/types/src/transaction.rs
@@ -176,7 +176,7 @@ impl
#[oai(one_of, discriminator_name = "type", rename_all = "snake_case")]
pub enum Transaction {
PendingTransaction(PendingTransaction),
- UserTransaction(Box),
+ UserTransaction(UserTransaction),
GenesisTransaction(GenesisTransaction),
BlockMetadataTransaction(BlockMetadataTransaction),
StateCheckpointTransaction(StateCheckpointTransaction),
@@ -292,12 +292,12 @@ impl
u64,
),
) -> Self {
- Transaction::UserTransaction(Box::new(UserTransaction {
+ Transaction::UserTransaction(UserTransaction {
info,
request: (txn, payload).into(),
events,
timestamp: timestamp.into(),
- }))
+ })
}
}
@@ -1412,7 +1412,12 @@ impl VerifyInput for KeylessSignature {
fn verify(&self) -> anyhow::Result<()> {
let public_key_len = self.public_key.inner().len();
let signature_len = self.signature.inner().len();
- if public_key_len > keyless::KeylessPublicKey::MAX_LEN {
+ if public_key_len
+ > std::cmp::max(
+ keyless::KeylessPublicKey::MAX_LEN,
+ keyless::FederatedKeylessPublicKey::MAX_LEN,
+ )
+ {
bail!(
"Keyless public key length is greater than the maximum number of {} bytes: found {} bytes",
keyless::KeylessPublicKey::MAX_LEN, public_key_len
@@ -1492,6 +1497,17 @@ impl Keyless {
}
}
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Object)]
+pub struct FederatedKeyless {
+ pub value: HexEncodedBytes,
+}
+
+impl FederatedKeyless {
+ pub fn new(value: HexEncodedBytes) -> Self {
+ Self { value }
+ }
+}
+
impl TryFrom for AnySignature {
type Error = anyhow::Error;
@@ -1534,6 +1550,7 @@ pub enum PublicKey {
Secp256k1Ecdsa(Secp256k1Ecdsa),
Secp256r1Ecdsa(Secp256r1Ecdsa),
Keyless(Keyless),
+ FederatedKeyless(FederatedKeyless),
}
impl TryFrom for AnyPublicKey {
@@ -1549,6 +1566,9 @@ impl TryFrom for AnyPublicKey {
AnyPublicKey::secp256r1_ecdsa(p.value.inner().try_into()?)
},
PublicKey::Keyless(p) => AnyPublicKey::keyless(p.value.inner().try_into()?),
+ PublicKey::FederatedKeyless(p) => {
+ AnyPublicKey::federated_keyless(p.value.inner().try_into()?)
+ },
})
}
}
@@ -1568,6 +1588,9 @@ impl From for PublicKey {
AnyPublicKey::Keyless { public_key } => {
PublicKey::Keyless(Keyless::new(public_key.to_bytes().into()))
},
+ AnyPublicKey::FederatedKeyless { public_key } => {
+ PublicKey::FederatedKeyless(FederatedKeyless::new(public_key.to_bytes().into()))
+ },
}
}
}
@@ -1604,6 +1627,11 @@ impl VerifyInput for SingleKeySignature {
signature: s.value.clone(),
}
.verify(),
+ (PublicKey::FederatedKeyless(p), Signature::Keyless(s)) => KeylessSignature {
+ public_key: p.value.clone(),
+ signature: s.value.clone(),
+ }
+ .verify(),
_ => bail!("Invalid public key, signature match."),
}
}
@@ -1649,6 +1677,12 @@ impl TryFrom for AccountAuthenticator {
)?;
AnyPublicKey::keyless(key)
},
+ PublicKey::FederatedKeyless(p) => {
+ let key = p.value.inner().try_into().context(
+ "Failed to parse given public_key bytes as AnyPublicKey::FederatedKeyless",
+ )?;
+ AnyPublicKey::keyless(key)
+ },
};
let signature = match value.signature {
@@ -1751,6 +1785,12 @@ impl TryFrom for AccountAuthenticator {
)?;
AnyPublicKey::keyless(key)
},
+ PublicKey::FederatedKeyless(p) => {
+ let key = p.value.inner().try_into().context(
+ "Failed to parse given public_key bytes as AnyPublicKey::FederatedKeyless",
+ )?;
+ AnyPublicKey::federated_keyless(key)
+ },
};
public_keys.push(key);
}
@@ -1794,6 +1834,33 @@ impl TryFrom for AccountAuthenticator {
}
}
+/// A placeholder to represent the absence of account signature
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Object)]
+pub struct NoAccountSignature;
+
+impl VerifyInput for NoAccountSignature {
+ fn verify(&self) -> anyhow::Result<()> {
+ Ok(())
+ }
+}
+
+impl TryFrom for TransactionAuthenticator {
+ type Error = anyhow::Error;
+
+ fn try_from(signature: NoAccountSignature) -> Result {
+ let account_auth = signature.try_into()?;
+ Ok(TransactionAuthenticator::single_sender(account_auth))
+ }
+}
+
+impl TryFrom for AccountAuthenticator {
+ type Error = anyhow::Error;
+
+ fn try_from(_value: NoAccountSignature) -> Result {
+ Ok(AccountAuthenticator::NoAccountAuthenticator)
+ }
+}
+
/// Account signature scheme
///
/// The account signature scheme allows you to have two types of accounts:
@@ -1809,6 +1876,7 @@ pub enum AccountSignature {
MultiEd25519Signature(MultiEd25519Signature),
SingleKeySignature(SingleKeySignature),
MultiKeySignature(MultiKeySignature),
+ NoAccountSignature(NoAccountSignature),
}
impl VerifyInput for AccountSignature {
@@ -1818,6 +1886,7 @@ impl VerifyInput for AccountSignature {
AccountSignature::MultiEd25519Signature(inner) => inner.verify(),
AccountSignature::SingleKeySignature(inner) => inner.verify(),
AccountSignature::MultiKeySignature(inner) => inner.verify(),
+ AccountSignature::NoAccountSignature(inner) => inner.verify(),
}
}
}
@@ -1831,6 +1900,7 @@ impl TryFrom for AccountAuthenticator {
AccountSignature::MultiEd25519Signature(s) => s.try_into()?,
AccountSignature::SingleKeySignature(s) => s.try_into()?,
AccountSignature::MultiKeySignature(s) => s.try_into()?,
+ AccountSignature::NoAccountSignature(s) => s.try_into()?,
})
}
}
@@ -1991,6 +2061,7 @@ impl From<&AccountAuthenticator> for AccountSignature {
signatures_required: public_keys.signatures_required(),
})
},
+ NoAccountAuthenticator => AccountSignature::NoAccountSignature(NoAccountSignature),
}
}
}
diff --git a/aptos-move/aptos-abstract-gas-usage/Cargo.toml b/aptos-move/aptos-abstract-gas-usage/Cargo.toml
index b1af513ea2e2e..d1a5026aea75f 100644
--- a/aptos-move/aptos-abstract-gas-usage/Cargo.toml
+++ b/aptos-move/aptos-abstract-gas-usage/Cargo.toml
@@ -2,7 +2,7 @@
name = "aptos-abstract-gas-usage"
version = "0.1.0"
edition = "2021"
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+license = { workspace = true }
[dependencies]
anyhow = { workspace = true }
diff --git a/aptos-move/aptos-debugger/Cargo.toml b/aptos-move/aptos-debugger/Cargo.toml
index 208fabb573c27..896f868ddcfc3 100644
--- a/aptos-move/aptos-debugger/Cargo.toml
+++ b/aptos-move/aptos-debugger/Cargo.toml
@@ -14,6 +14,7 @@ rust-version = { workspace = true }
[dependencies]
anyhow = { workspace = true }
+aptos-block-executor = { workspace = true }
aptos-consensus = { workspace = true }
aptos-crypto = { workspace = true }
aptos-gas-profiling = { workspace = true }
@@ -26,6 +27,7 @@ aptos-vm-logging = { workspace = true }
aptos-vm-types = { workspace = true }
bcs = { workspace = true }
clap = { workspace = true }
+itertools = { workspace = true }
regex = { workspace = true }
reqwest = { workspace = true }
tokio = { workspace = true }
diff --git a/aptos-move/aptos-debugger/src/aptos_debugger.rs b/aptos-move/aptos-debugger/src/aptos_debugger.rs
index 1fc70796f6cbc..8a8c1409dec54 100644
--- a/aptos-move/aptos-debugger/src/aptos_debugger.rs
+++ b/aptos-move/aptos-debugger/src/aptos_debugger.rs
@@ -2,24 +2,34 @@
// SPDX-License-Identifier: Apache-2.0
use anyhow::{bail, format_err, Result};
+use aptos_block_executor::txn_commit_hook::NoOpTransactionCommitHook;
use aptos_gas_profiling::{GasProfiler, TransactionGasLog};
use aptos_rest_client::Client;
use aptos_types::{
account_address::AccountAddress,
+ block_executor::config::{
+ BlockExecutorConfig, BlockExecutorConfigFromOnchain, BlockExecutorLocalConfig,
+ },
state_store::TStateView,
transaction::{
- signature_verified_transaction::SignatureVerifiedTransaction, SignedTransaction,
- Transaction, TransactionInfo, TransactionOutput, TransactionPayload, Version,
+ signature_verified_transaction::SignatureVerifiedTransaction, BlockOutput,
+ SignedTransaction, Transaction, TransactionInfo, TransactionOutput, TransactionPayload,
+ Version,
},
vm_status::VMStatus,
};
use aptos_validator_interface::{
AptosValidatorInterface, DBDebuggerInterface, DebuggerStateView, RestDebuggerInterface,
};
-use aptos_vm::{data_cache::AsMoveResolver, AptosVM, VMExecutor};
+use aptos_vm::{
+ block_executor::{AptosTransactionOutput, BlockAptosVM},
+ data_cache::AsMoveResolver,
+ AptosVM,
+};
use aptos_vm_logging::log_schema::AdapterLogSchema;
use aptos_vm_types::output::VMOutput;
-use std::{path::Path, sync::Arc};
+use itertools::Itertools;
+use std::{path::Path, sync::Arc, time::Instant};
pub struct AptosDebugger {
debugger: Arc,
@@ -45,31 +55,50 @@ impl AptosDebugger {
version: Version,
txns: Vec,
repeat_execution_times: u64,
+ concurrency_levels: &[usize],
) -> Result> {
let sig_verified_txns: Vec =
txns.into_iter().map(|x| x.into()).collect::>();
let state_view = DebuggerStateView::new(self.debugger.clone(), version);
- let result = AptosVM::execute_block_no_limit(&sig_verified_txns, &state_view)
- .map_err(|err| format_err!("Unexpected VM Error: {:?}", err))?;
+ print_transaction_stats(&sig_verified_txns, version);
- for i in 1..repeat_execution_times {
- let repeat_result = AptosVM::execute_block_no_limit(&sig_verified_txns, &state_view)
- .map_err(|err| format_err!("Unexpected VM Error: {:?}", err))?;
- println!(
- "Finished execution round {}/{} with {} transactions",
- i,
- repeat_execution_times,
- sig_verified_txns.len()
- );
- if !Self::ensure_output_matches(&repeat_result, &result, version) {
- bail!(
- "Execution result mismatched in round {}/{}",
- i,
- repeat_execution_times
+ let mut result = None;
+
+ for concurrency_level in concurrency_levels {
+ for i in 0..repeat_execution_times {
+ let start_time = Instant::now();
+ let cur_result =
+ execute_block_no_limit(&sig_verified_txns, &state_view, *concurrency_level)
+ .map_err(|err| format_err!("Unexpected VM Error: {:?}", err))?;
+
+ println!(
+ "[{} txns from {}] Finished execution round {}/{} with concurrency_level={} in {}ms",
+ sig_verified_txns.len(),
+ version,
+ i + 1,
+ repeat_execution_times,
+ concurrency_level,
+ start_time.elapsed().as_millis(),
);
+
+ match &result {
+ None => result = Some(cur_result),
+ Some(prev_result) => {
+ if !Self::ensure_output_matches(&cur_result, prev_result, version) {
+ bail!(
+ "Execution result mismatched in round {}/{}",
+ i,
+ repeat_execution_times
+ );
+ }
+ },
+ }
}
}
+
+ let result = result.unwrap();
+ assert_eq!(sig_verified_txns.len(), result.len());
Ok(result)
}
@@ -121,33 +150,39 @@ impl AptosDebugger {
pub async fn execute_past_transactions(
&self,
- mut begin: Version,
- mut limit: u64,
+ begin: Version,
+ limit: u64,
+ use_same_block_boundaries: bool,
repeat_execution_times: u64,
+ concurrency_levels: &[usize],
) -> Result> {
- let (mut txns, mut txn_infos) = self
+ let (txns, txn_infos) = self
.debugger
.get_committed_transactions(begin, limit)
.await?;
- let mut ret = vec![];
- while limit != 0 {
- println!(
- "Starting epoch execution at {:?}, {:?} transactions remaining",
- begin, limit
- );
- let mut epoch_result = self
- .execute_transactions_by_epoch(begin, txns.clone(), repeat_execution_times)
- .await?;
- begin += epoch_result.len() as u64;
- limit -= epoch_result.len() as u64;
- txns = txns.split_off(epoch_result.len());
- let epoch_txn_infos = txn_infos.drain(0..epoch_result.len()).collect::>();
- Self::print_mismatches(&epoch_result, &epoch_txn_infos, begin);
-
- ret.append(&mut epoch_result);
+ if use_same_block_boundaries {
+ // when going block by block, no need to worry about epoch boundaries
+ // as new epoch is always a new block.
+ Ok(self
+ .execute_transactions_by_block(
+ begin,
+ txns.clone(),
+ repeat_execution_times,
+ concurrency_levels,
+ )
+ .await?)
+ } else {
+ self.execute_transactions_by_epoch(
+ limit,
+ begin,
+ txns,
+ repeat_execution_times,
+ concurrency_levels,
+ txn_infos,
+ )
+ .await
}
- Ok(ret)
}
fn print_mismatches(
@@ -186,13 +221,19 @@ impl AptosDebugger {
all_match
}
- pub async fn execute_transactions_by_epoch(
+ async fn execute_transactions_until_epoch_end(
&self,
begin: Version,
txns: Vec,
repeat_execution_times: u64,
+ concurrency_levels: &[usize],
) -> Result> {
- let results = self.execute_transactions_at_version(begin, txns, repeat_execution_times)?;
+ let results = self.execute_transactions_at_version(
+ begin,
+ txns,
+ repeat_execution_times,
+ concurrency_levels,
+ )?;
let mut ret = vec![];
let mut is_reconfig = false;
@@ -208,6 +249,78 @@ impl AptosDebugger {
Ok(ret)
}
+ async fn execute_transactions_by_epoch(
+ &self,
+ mut limit: u64,
+ mut begin: u64,
+ mut txns: Vec,
+ repeat_execution_times: u64,
+ concurrency_levels: &[usize],
+ mut txn_infos: Vec,
+ ) -> Result> {
+ let mut ret = vec![];
+ while limit != 0 {
+ println!(
+ "Starting epoch execution at {:?}, {:?} transactions remaining",
+ begin, limit
+ );
+
+ let mut epoch_result = self
+ .execute_transactions_until_epoch_end(
+ begin,
+ txns.clone(),
+ repeat_execution_times,
+ concurrency_levels,
+ )
+ .await?;
+ begin += epoch_result.len() as u64;
+ limit -= epoch_result.len() as u64;
+ txns = txns.split_off(epoch_result.len());
+ let epoch_txn_infos = txn_infos.drain(0..epoch_result.len()).collect::>();
+ Self::print_mismatches(&epoch_result, &epoch_txn_infos, begin);
+
+ ret.append(&mut epoch_result);
+ }
+ Ok(ret)
+ }
+
+ async fn execute_transactions_by_block(
+ &self,
+ begin: Version,
+ txns: Vec,
+ repeat_execution_times: u64,
+ concurrency_levels: &[usize],
+ ) -> Result> {
+ let mut ret = vec![];
+ let mut cur = vec![];
+ let mut cur_version = begin;
+ for txn in txns {
+ if txn.is_block_start() && !cur.is_empty() {
+ let to_execute = std::mem::take(&mut cur);
+ let results = self.execute_transactions_at_version(
+ cur_version,
+ to_execute,
+ repeat_execution_times,
+ concurrency_levels,
+ )?;
+ cur_version += results.len() as u64;
+ ret.extend(results);
+ }
+ cur.push(txn);
+ }
+ if !cur.is_empty() {
+ let results = self.execute_transactions_at_version(
+ cur_version,
+ cur,
+ repeat_execution_times,
+ concurrency_levels,
+ )?;
+ ret.extend(results);
+ }
+
+ Ok(ret)
+ }
+
pub async fn get_version_by_account_sequence(
&self,
account: AccountAddress,
@@ -237,6 +350,67 @@ impl AptosDebugger {
}
}
+fn print_transaction_stats(sig_verified_txns: &[SignatureVerifiedTransaction], version: u64) {
+ let transaction_types = sig_verified_txns
+ .iter()
+ .map(|txn| txn.expect_valid().type_name().to_string())
+ // conflate same consecutive elements into one with count
+ .chunk_by(|k| k.clone())
+ .into_iter()
+ .map(|(k, r)| {
+ let num = r.count();
+ if num > 1 {
+ format!("{} {}s", num, k)
+ } else {
+ k
+ }
+ })
+ .collect::>();
+ let entry_functions = sig_verified_txns
+ .iter()
+ .filter_map(|txn| {
+ txn.expect_valid()
+ .try_as_signed_user_txn()
+ .map(|txn| match &txn.payload() {
+ TransactionPayload::EntryFunction(txn) => format!(
+ "entry: {:?}::{:?}",
+ txn.module().name.as_str(),
+ txn.function().as_str()
+ ),
+ TransactionPayload::Script(_) => "script".to_string(),
+ TransactionPayload::ModuleBundle(_) => panic!("deprecated module bundle"),
+ TransactionPayload::Multisig(_) => "multisig".to_string(),
+ })
+ })
+ // Count number of instances for each (irrsepsecitve of order)
+ .sorted()
+ .chunk_by(|k| k.clone())
+ .into_iter()
+ .map(|(k, r)| (r.count(), k))
+ .sorted_by_key(|(num, _k)| *num)
+ .rev()
+ .map(|(num, k)| {
+ if num > 1 {
+ format!("{} {}s", num, k)
+ } else {
+ k
+ }
+ })
+ .collect::>();
+ println!(
+ "[{} txns from {}] Transaction types: {:?}",
+ sig_verified_txns.len(),
+ version,
+ transaction_types
+ );
+ println!(
+ "[{} txns from {}] Entry Functions {:?}",
+ sig_verified_txns.len(),
+ version,
+ entry_functions
+ );
+}
+
fn is_reconfiguration(vm_output: &TransactionOutput) -> bool {
let new_epoch_event_key = aptos_types::on_chain_config::new_epoch_event_key();
vm_output
@@ -244,3 +418,24 @@ fn is_reconfiguration(vm_output: &TransactionOutput) -> bool {
.iter()
.any(|event| event.event_key() == Some(&new_epoch_event_key))
}
+
+fn execute_block_no_limit(
+ sig_verified_txns: &[SignatureVerifiedTransaction],
+ state_view: &DebuggerStateView,
+ concurrency_level: usize,
+) -> Result, VMStatus> {
+ BlockAptosVM::execute_block::<_, NoOpTransactionCommitHook>(
+ sig_verified_txns,
+ state_view,
+ BlockExecutorConfig {
+ local: BlockExecutorLocalConfig {
+ concurrency_level,
+ allow_fallback: true,
+ discard_failed_blocks: false,
+ },
+ onchain: BlockExecutorConfigFromOnchain::new_no_block_limit(),
+ },
+ None,
+ )
+ .map(BlockOutput::into_transaction_outputs_forced)
+}
diff --git a/aptos-move/aptos-debugger/src/bcs_txn_decoder.rs b/aptos-move/aptos-debugger/src/bcs_txn_decoder.rs
index b444aa2311ff1..204b04621f2b0 100644
--- a/aptos-move/aptos-debugger/src/bcs_txn_decoder.rs
+++ b/aptos-move/aptos-debugger/src/bcs_txn_decoder.rs
@@ -5,7 +5,6 @@ use crate::aptos_debugger::AptosDebugger;
use anyhow::Result;
use aptos_rest_client::Client;
use aptos_types::transaction::SignedTransaction;
-use aptos_vm::AptosVM;
use clap::Parser;
use regex::Regex;
use std::io;
@@ -65,14 +64,15 @@ impl Command {
);
if self.execute {
- AptosVM::set_concurrency_level_once(self.concurrency_level);
println!();
println!("===============================");
println!("Transaction re-execution result");
println!("===============================");
println!(
"{:#?}",
- debugger.execute_past_transactions(version, 1, 1).await?
+ debugger
+ .execute_past_transactions(version, 1, false, 1, &[self.concurrency_level])
+ .await?
);
}
diff --git a/aptos-move/aptos-debugger/src/common.rs b/aptos-move/aptos-debugger/src/common.rs
index 6b250b8108b42..584a040fb59fa 100644
--- a/aptos-move/aptos-debugger/src/common.rs
+++ b/aptos-move/aptos-debugger/src/common.rs
@@ -27,8 +27,8 @@ pub struct Opts {
#[clap(flatten)]
pub(crate) target: Target,
- #[clap(long, default_value_t = 1)]
- pub(crate) concurrency_level: usize,
+ #[clap(long, num_args = 0..)]
+ pub(crate) concurrency_level: Vec,
}
#[derive(Parser)]
diff --git a/aptos-move/aptos-debugger/src/execute_past_transactions.rs b/aptos-move/aptos-debugger/src/execute_past_transactions.rs
index 9c949b2a877da..0403e3f51e6db 100644
--- a/aptos-move/aptos-debugger/src/execute_past_transactions.rs
+++ b/aptos-move/aptos-debugger/src/execute_past_transactions.rs
@@ -4,7 +4,6 @@
use crate::{aptos_debugger::AptosDebugger, common::Opts};
use anyhow::Result;
use aptos_rest_client::Client;
-use aptos_vm::AptosVM;
use clap::Parser;
use url::Url;
@@ -24,12 +23,13 @@ pub struct Command {
#[clap(long)]
repeat_execution_times: Option,
+
+ #[clap(long)]
+ use_same_block_boundaries: bool,
}
impl Command {
pub async fn run(self) -> Result<()> {
- AptosVM::set_concurrency_level_once(self.opts.concurrency_level);
-
let debugger = if let Some(rest_endpoint) = self.opts.target.rest_endpoint {
AptosDebugger::rest_client(Client::new(Url::parse(&rest_endpoint)?))?
} else if let Some(db_path) = self.opts.target.db_path {
@@ -42,7 +42,9 @@ impl Command {
.execute_past_transactions(
self.begin_version,
self.limit,
+ self.use_same_block_boundaries,
self.repeat_execution_times.unwrap_or(1),
+ &self.opts.concurrency_level,
)
.await?;
diff --git a/aptos-move/aptos-debugger/src/execute_pending_block.rs b/aptos-move/aptos-debugger/src/execute_pending_block.rs
index 1f7b6dabc9506..7235dff6e9b01 100644
--- a/aptos-move/aptos-debugger/src/execute_pending_block.rs
+++ b/aptos-move/aptos-debugger/src/execute_pending_block.rs
@@ -6,7 +6,6 @@ use anyhow::Result;
use aptos_crypto::HashValue;
use aptos_logger::info;
use aptos_rest_client::Client;
-use aptos_vm::AptosVM;
use clap::Parser;
use std::path::PathBuf;
use url::Url;
@@ -42,8 +41,6 @@ pub struct Command {
impl Command {
pub async fn run(self) -> Result<()> {
- AptosVM::set_concurrency_level_once(self.opts.concurrency_level);
-
let debugger = if let Some(rest_endpoint) = self.opts.target.rest_endpoint {
AptosDebugger::rest_client(Client::new(Url::parse(&rest_endpoint)?))?
} else if let Some(db_path) = self.opts.target.db_path {
@@ -91,6 +88,7 @@ impl Command {
self.begin_version,
block,
self.repeat_execution_times.unwrap_or(1),
+ &self.opts.concurrency_level,
)?;
println!("{txn_outputs:#?}");
diff --git a/aptos-move/aptos-e2e-comparison-testing/Cargo.toml b/aptos-move/aptos-e2e-comparison-testing/Cargo.toml
index e28cf89d1a5d4..30c851670b4df 100644
--- a/aptos-move/aptos-e2e-comparison-testing/Cargo.toml
+++ b/aptos-move/aptos-e2e-comparison-testing/Cargo.toml
@@ -22,6 +22,7 @@ bcs = { workspace = true }
clap = { workspace = true }
futures = { workspace = true }
itertools = { workspace = true }
+move-binary-format = { workspace = true }
move-compiler = { workspace = true }
move-core-types = { workspace = true }
move-model = { workspace = true }
@@ -31,4 +32,3 @@ serde = { workspace = true }
tempfile = { workspace = true }
tokio = { workspace = true }
url = { workspace = true }
-
diff --git a/aptos-move/aptos-e2e-comparison-testing/src/data_state_view.rs b/aptos-move/aptos-e2e-comparison-testing/src/data_state_view.rs
index f5c81a5dc56e3..be1938618686f 100644
--- a/aptos-move/aptos-e2e-comparison-testing/src/data_state_view.rs
+++ b/aptos-move/aptos-e2e-comparison-testing/src/data_state_view.rs
@@ -12,6 +12,7 @@ use aptos_types::{
use aptos_validator_interface::{AptosValidatorInterface, DebuggerStateView};
use std::{
collections::HashMap,
+ ops::DerefMut,
sync::{Arc, Mutex},
};
@@ -20,7 +21,6 @@ pub struct DataStateView {
code_data: Option,
data_read_state_keys: Option>>>,
}
-use std::ops::DerefMut;
impl DataStateView {
pub fn new(
diff --git a/aptos-move/aptos-e2e-comparison-testing/src/execution.rs b/aptos-move/aptos-e2e-comparison-testing/src/execution.rs
index 9e85437fce474..4a803878916de 100644
--- a/aptos-move/aptos-e2e-comparison-testing/src/execution.rs
+++ b/aptos-move/aptos-e2e-comparison-testing/src/execution.rs
@@ -12,20 +12,20 @@ use aptos_language_e2e_tests::{data_store::FakeDataStore, executor::FakeExecutor
use aptos_types::{
contract_event::ContractEvent,
on_chain_config::{FeatureFlag, Features, OnChainConfig},
- transaction::{Transaction, TransactionPayload, Version},
+ transaction::{Transaction, Version},
vm_status::VMStatus,
write_set::WriteSet,
};
use aptos_validator_interface::AptosValidatorInterface;
-use aptos_vm::data_cache::AsMoveResolver;
use clap::ValueEnum;
use itertools::Itertools;
+use move_binary_format::file_format_common::VERSION_6;
use move_core_types::{account_address::AccountAddress, language_storage::ModuleId};
use move_model::metadata::CompilerVersion;
use std::{cmp, collections::HashMap, path::PathBuf, sync::Arc};
-fn load_packages_to_executor(
- executor: &mut FakeExecutor,
+fn add_packages_to_data_store(
+ data_store: &mut FakeDataStore,
package_info: &PackageInfo,
compiled_package_cache: &HashMap>>,
) {
@@ -34,12 +34,12 @@ fn load_packages_to_executor(
}
let compiled_package = compiled_package_cache.get(package_info).unwrap();
for (module_id, module_blob) in compiled_package {
- executor.add_module(module_id, module_blob.clone());
+ data_store.add_module(module_id, module_blob.clone());
}
}
-fn load_aptos_packages_to_executor(
- executor: &mut FakeExecutor,
+fn add_aptos_packages_to_data_store(
+ data_store: &mut FakeDataStore,
compiled_package_map: &HashMap>>,
) {
for package in APTOS_PACKAGES {
@@ -48,7 +48,7 @@ fn load_aptos_packages_to_executor(
package_name: package.to_string(),
upgrade_number: None,
};
- load_packages_to_executor(executor, &package_info, compiled_package_map);
+ add_packages_to_data_store(data_store, &package_info, compiled_package_map);
}
}
@@ -102,7 +102,7 @@ impl Execution {
Self {
input_path,
execution_mode,
- bytecode_version: 6,
+ bytecode_version: VERSION_6,
}
}
@@ -270,9 +270,8 @@ impl Execution {
return compiled_result;
}
}
- // read the state data;
+ // read the state data
let state = data_manager.get_state(cur_version);
- // execute and compare
self.execute_and_compare(
cur_version,
state,
@@ -301,7 +300,7 @@ impl Execution {
package_cache_main = compiled_package_cache_v2;
v2_flag = true;
}
- let res_main_opt = self.execute_code(
+ let res_main = self.execute_code(
cur_version,
state.clone(),
&txn_idx.package_info,
@@ -311,7 +310,7 @@ impl Execution {
v2_flag,
);
if self.execution_mode.is_compare() {
- let res_other_opt = self.execute_code(
+ let res_other = self.execute_code(
cur_version,
state,
&txn_idx.package_info,
@@ -320,20 +319,21 @@ impl Execution {
debugger.clone(),
true,
);
- self.print_mismatches(cur_version, &res_main_opt.unwrap(), &res_other_opt.unwrap());
+ self.print_mismatches(cur_version, &res_main, &res_other);
} else {
- let res = res_main_opt.unwrap();
- if let Ok(res_ok) = res {
- self.output_result_str(format!(
- "version:{}\nwrite set:{:?}\n events:{:?}\n",
- cur_version, res_ok.0, res_ok.1
- ));
- } else {
- self.output_result_str(format!(
- "execution error {} at version: {}, error",
- res.unwrap_err(),
- cur_version
- ));
+ match res_main {
+ Ok((write_set, events)) => {
+ self.output_result_str(format!(
+ "version:{}\nwrite set:{:?}\n events:{:?}\n",
+ cur_version, write_set, events
+ ));
+ },
+ Err(vm_status) => {
+ self.output_result_str(format!(
+ "execution error {} at version: {}, error",
+ vm_status, cur_version
+ ));
+ },
}
}
}
@@ -341,74 +341,44 @@ impl Execution {
fn execute_code(
&self,
version: Version,
- state: FakeDataStore,
+ mut state: FakeDataStore,
package_info: &PackageInfo,
txn: &Transaction,
compiled_package_cache: &HashMap>>,
debugger_opt: Option>,
v2_flag: bool,
- ) -> Option), VMStatus>> {
- let executor = FakeExecutor::no_genesis();
- let mut executor = executor.set_not_parallel();
- *executor.data_store_mut() = state;
- if let Transaction::UserTransaction(signed_trans) = txn {
- let sender = signed_trans.sender();
- let payload = signed_trans.payload();
- if let TransactionPayload::EntryFunction(entry_function) = payload {
- // Always load 0x1 modules
- load_aptos_packages_to_executor(&mut executor, compiled_package_cache);
- // Load modules
- if package_info.is_compilable() {
- load_packages_to_executor(&mut executor, package_info, compiled_package_cache);
- }
- let mut senders = vec![sender];
- senders.extend(signed_trans.authenticator().secondary_signer_addresses());
- let enable_v7 = |features: &mut Features| {
- if v2_flag {
- features.enable(FeatureFlag::VM_BINARY_FORMAT_V7);
- } else {
- features.enable(FeatureFlag::VM_BINARY_FORMAT_V6);
- }
- };
- if let Some(debugger) = debugger_opt {
- let data_view =
- DataStateView::new(debugger, version, executor.data_store().clone());
- let mut features =
- Features::fetch_config(&data_view.as_move_resolver()).unwrap_or_default();
- enable_v7(&mut features);
- return Some(executor.try_exec_entry_with_state_view(
- senders,
- entry_function,
- &data_view.as_move_resolver(),
- features,
- ));
- } else {
- let mut features =
- Features::fetch_config(&executor.data_store().clone().as_move_resolver())
- .unwrap_or_default();
- enable_v7(&mut features);
- return Some(executor.try_exec_entry_with_state_view(
- senders,
- entry_function,
- &executor.data_store().clone().as_move_resolver(),
- features,
- ));
- }
- }
+ ) -> Result<(WriteSet, Vec), VMStatus> {
+ // Always add Aptos (0x1) packages.
+ add_aptos_packages_to_data_store(&mut state, compiled_package_cache);
+
+ // Add other modules.
+ if package_info.is_compilable() {
+ add_packages_to_data_store(&mut state, package_info, compiled_package_cache);
}
+
+ // Update features if needed to the correct binary format used by V2 compiler.
+ let mut features = Features::fetch_config(&state).unwrap_or_default();
+ if v2_flag {
+ features.enable(FeatureFlag::VM_BINARY_FORMAT_V7);
+ } else {
+ features.enable(FeatureFlag::VM_BINARY_FORMAT_V6);
+ }
+ state.set_features(features);
+
+ // We use executor only to get access to block executor and avoid some of
+ // the initializations, but ignore its internal state, i.e., FakeDataStore.
+ let executor = FakeExecutor::no_genesis();
+ let txns = vec![txn.clone()];
+
if let Some(debugger) = debugger_opt {
- let data_view = DataStateView::new(debugger, version, executor.data_store().clone());
- Some(
- executor
- .execute_transaction_block_with_state_view([txn.clone()].to_vec(), &data_view)
- .map(|res| res[0].clone().into()),
- )
+ let data_view = DataStateView::new(debugger, version, state);
+ executor
+ .execute_transaction_block_with_state_view(txns, &data_view)
+ .map(|mut res| res.pop().unwrap().into())
} else {
- Some(
- executor
- .execute_transaction_block(vec![txn.clone()])
- .map(|res| res[0].clone().into()),
- )
+ executor
+ .execute_transaction_block_with_state_view(txns, &state)
+ .map(|mut res| res.pop().unwrap().into())
}
}
diff --git a/aptos-move/aptos-gas-calibration/Cargo.toml b/aptos-move/aptos-gas-calibration/Cargo.toml
index c4ba044ef4430..b2375eaccdeb7 100644
--- a/aptos-move/aptos-gas-calibration/Cargo.toml
+++ b/aptos-move/aptos-gas-calibration/Cargo.toml
@@ -2,7 +2,7 @@
name = "aptos-gas-calibration"
version = "0.1.0"
edition = "2021"
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+license = { workspace = true }
[dependencies]
anyhow = { workspace = true }
diff --git a/aptos-move/aptos-gas-meter/src/meter.rs b/aptos-move/aptos-gas-meter/src/meter.rs
index 1bbcf85a26191..f17c266e09fef 100644
--- a/aptos-move/aptos-gas-meter/src/meter.rs
+++ b/aptos-move/aptos-gas-meter/src/meter.rs
@@ -101,6 +101,13 @@ where
MutBorrowField => MUT_BORROW_FIELD,
ImmBorrowFieldGeneric => IMM_BORROW_FIELD_GENERIC,
MutBorrowFieldGeneric => MUT_BORROW_FIELD_GENERIC,
+ ImmBorrowVariantField => IMM_BORROW_VARIANT_FIELD,
+ MutBorrowVariantField => MUT_BORROW_VARIANT_FIELD,
+ ImmBorrowVariantFieldGeneric => IMM_BORROW_VARIANT_FIELD_GENERIC,
+ MutBorrowVariantFieldGeneric => MUT_BORROW_VARIANT_FIELD_GENERIC,
+ TestVariant => TEST_VARIANT,
+ TestVariantGeneric => TEST_VARIANT_GENERIC,
+
FreezeRef => FREEZE_REF,
CastU8 => CAST_U8,
diff --git a/aptos-move/aptos-gas-meter/src/traits.rs b/aptos-move/aptos-gas-meter/src/traits.rs
index fd2f2b3c367e0..92eed86690800 100644
--- a/aptos-move/aptos-gas-meter/src/traits.rs
+++ b/aptos-move/aptos-gas-meter/src/traits.rs
@@ -7,7 +7,7 @@ use aptos_types::{
contract_event::ContractEvent, state_store::state_key::StateKey, write_set::WriteOpSize,
};
use aptos_vm_types::{
- change_set::VMChangeSet,
+ change_set::ChangeSetInterface,
resolver::ExecutorView,
storage::{
io_pricing::IoPricing,
@@ -140,7 +140,7 @@ pub trait AptosGasMeter: MoveGasMeter {
/// unless you are doing something special, such as injecting additional logging logic.
fn process_storage_fee_for_all(
&mut self,
- change_set: &mut VMChangeSet,
+ change_set: &mut impl ChangeSetInterface,
txn_size: NumBytes,
gas_unit_price: FeePerGasUnit,
executor_view: &dyn ExecutorView,
@@ -173,12 +173,9 @@ pub trait AptosGasMeter: MoveGasMeter {
}
// Events (no event fee in v2)
- let event_fee = change_set
- .events()
- .iter()
- .fold(Fee::new(0), |acc, (event, _)| {
- acc + pricing.legacy_storage_fee_per_event(params, event)
- });
+ let event_fee = change_set.events_iter().fold(Fee::new(0), |acc, event| {
+ acc + pricing.legacy_storage_fee_per_event(params, event)
+ });
let event_discount = pricing.legacy_storage_discount_for_events(params, event_fee);
let event_net_fee = event_fee
.checked_sub(event_discount)
diff --git a/aptos-move/aptos-gas-profiling/src/aggregate.rs b/aptos-move/aptos-gas-profiling/src/aggregate.rs
index ee1aab3891f8b..0095dad224670 100644
--- a/aptos-move/aptos-gas-profiling/src/aggregate.rs
+++ b/aptos-move/aptos-gas-profiling/src/aggregate.rs
@@ -11,6 +11,7 @@ use std::collections::{btree_map, BTreeMap};
/// Represents an aggregation of execution gas events, including the count and total gas costs for each type of event.
///
/// The events are sorted by the amount of gas used, from high to low.
+#[derive(Debug)]
pub struct AggregatedExecutionGasEvents {
/// The gas scaling factor.
/// This is included so to make this struct self-contained, suitable for displaying in (external) gas units.
diff --git a/aptos-move/aptos-gas-profiling/src/profiler.rs b/aptos-move/aptos-gas-profiling/src/profiler.rs
index 89ba8fa72e0b5..01b7c8076a350 100644
--- a/aptos-move/aptos-gas-profiling/src/profiler.rs
+++ b/aptos-move/aptos-gas-profiling/src/profiler.rs
@@ -11,7 +11,7 @@ use aptos_types::{
contract_event::ContractEvent, state_store::state_key::StateKey, write_set::WriteOpSize,
};
use aptos_vm_types::{
- change_set::VMChangeSet, resolver::ExecutorView, storage::space_pricing::ChargeAndRefund,
+ change_set::ChangeSetInterface, resolver::ExecutorView, storage::space_pricing::ChargeAndRefund,
};
use move_binary_format::{
errors::{Location, PartialVMResult, VMResult},
@@ -568,7 +568,7 @@ where
fn process_storage_fee_for_all(
&mut self,
- change_set: &mut VMChangeSet,
+ change_set: &mut impl ChangeSetInterface,
txn_size: NumBytes,
gas_unit_price: FeePerGasUnit,
executor_view: &dyn ExecutorView,
@@ -612,7 +612,7 @@ where
// Events (no event fee in v2)
let mut event_fee = Fee::new(0);
let mut event_fees = vec![];
- for (event, _) in change_set.events().iter() {
+ for event in change_set.events_iter() {
let fee = pricing.legacy_storage_fee_per_event(params, event);
event_fees.push(EventStorage {
ty: event.type_tag().clone(),
diff --git a/aptos-move/aptos-gas-schedule/src/gas_schedule/instr.rs b/aptos-move/aptos-gas-schedule/src/gas_schedule/instr.rs
index e965f8d918b55..1e7f1a4860103 100644
--- a/aptos-move/aptos-gas-schedule/src/gas_schedule/instr.rs
+++ b/aptos-move/aptos-gas-schedule/src/gas_schedule/instr.rs
@@ -3,7 +3,7 @@
//! This module defines the gas parameters for all Move instructions.
-use crate::gas_schedule::VMGasParameters;
+use crate::{gas_feature_versions::RELEASE_V1_18, gas_schedule::VMGasParameters};
use aptos_gas_algebra::{
InternalGas, InternalGasPerAbstractValueUnit, InternalGasPerArg, InternalGasPerByte,
InternalGasPerTypeNode,
@@ -43,8 +43,23 @@ crate::gas_schedule::macros::define_gas_parameters!(
[mut_borrow_loc: InternalGas, "mut_borrow_loc", 220],
[imm_borrow_field: InternalGas, "imm_borrow_field", 735],
[mut_borrow_field: InternalGas, "mut_borrow_field", 735],
- [imm_borrow_field_generic: InternalGas, "imm_borrow_field_generic", 735],
+ [imm_borrow_field_generic: InternalGas, "imm_borrow_field_generic" , 735],
[mut_borrow_field_generic: InternalGas, "mut_borrow_field_generic", 735],
+ [imm_borrow_variant_field: InternalGas,
+ { RELEASE_V1_18.. => "imm_borrow_variant_field" }, 835],
+ [mut_borrow_variant_field: InternalGas,
+ { RELEASE_V1_18.. => "mut_borrow_variant_field" }, 835],
+ [imm_borrow_variant_field_generic: InternalGas,
+ { RELEASE_V1_18.. => "imm_borrow_variant_field_generic" }, 835],
+ [mut_borrow_variant_field_generic: InternalGas,
+ { RELEASE_V1_18.. => "mut_borrow_variant_field_generic" }, 835],
+
+ // variant testing
+ [test_variant: InternalGas,
+ { RELEASE_V1_18.. => "test_variant" }, 535],
+ [test_variant_generic: InternalGas,
+ { RELEASE_V1_18.. => "test_variant_generic" }, 535],
+
// locals
[copy_loc_base: InternalGas, "copy_loc.base", 294],
[copy_loc_per_abs_val_unit: InternalGasPerAbstractValueUnit, "copy_loc.per_abs_val_unit", 14],
diff --git a/aptos-move/aptos-gas-schedule/src/gas_schedule/move_stdlib.rs b/aptos-move/aptos-gas-schedule/src/gas_schedule/move_stdlib.rs
index aa93df0d93859..c25afc6e515ba 100644
--- a/aptos-move/aptos-gas-schedule/src/gas_schedule/move_stdlib.rs
+++ b/aptos-move/aptos-gas-schedule/src/gas_schedule/move_stdlib.rs
@@ -3,7 +3,7 @@
//! This module defines the gas parameters for Move Stdlib.
-use crate::gas_schedule::NativeGasParameters;
+use crate::{gas_feature_versions::RELEASE_V1_18, gas_schedule::NativeGasParameters};
use aptos_gas_algebra::{InternalGas, InternalGasPerByte};
crate::gas_schedule::macros::define_gas_parameters!(
@@ -31,5 +31,10 @@ crate::gas_schedule::macros::define_gas_parameters!(
[string_index_of_base: InternalGas, "string.index_of.base", 1470],
[string_index_of_per_byte_pattern: InternalGasPerByte, "string.index_of.per_byte_pattern", 73],
[string_index_of_per_byte_searched: InternalGasPerByte, "string.index_of.per_byte_searched", 36],
+
+ // Note(Gas): these initial values are guesswork.
+ [bcs_serialized_size_base: InternalGas, { RELEASE_V1_18.. => "bcs.serialized_size.base" }, 735],
+ [bcs_serialized_size_per_byte_serialized: InternalGasPerByte, { RELEASE_V1_18.. => "bcs.serialized_size.per_byte_serialized" }, 36],
+ [bcs_serialized_size_failure: InternalGas, { RELEASE_V1_18.. => "bcs.serialized_size.failure" }, 3676],
]
);
diff --git a/aptos-move/aptos-gas-schedule/src/ver.rs b/aptos-move/aptos-gas-schedule/src/ver.rs
index 3951385af5187..d424c330b6884 100644
--- a/aptos-move/aptos-gas-schedule/src/ver.rs
+++ b/aptos-move/aptos-gas-schedule/src/ver.rs
@@ -8,6 +8,9 @@
/// - Changing how gas is calculated in any way
///
/// Change log:
+/// - V22
+/// - Gas parameters for enums
+/// - Gas parameters for new native function `bcs::serialized_size`
/// - V21
/// - Fix type to type tag conversion in MoveVM
/// - V20
@@ -66,7 +69,7 @@
/// global operations.
/// - V1
/// - TBA
-pub const LATEST_GAS_FEATURE_VERSION: u64 = gas_feature_versions::RELEASE_V1_16;
+pub const LATEST_GAS_FEATURE_VERSION: u64 = gas_feature_versions::RELEASE_V1_20;
pub mod gas_feature_versions {
pub const RELEASE_V1_8: u64 = 11;
@@ -79,4 +82,8 @@ pub mod gas_feature_versions {
pub const RELEASE_V1_14: u64 = 19;
pub const RELEASE_V1_15: u64 = 20;
pub const RELEASE_V1_16: u64 = 21;
+ pub const RELEASE_V1_18: u64 = 22;
+ pub const RELEASE_V1_19: u64 = 23;
+ pub const RELEASE_V1_20: u64 = 24;
+ pub const RELEASE_V1_21: u64 = 25;
}
diff --git a/aptos-move/aptos-release-builder/Cargo.toml b/aptos-move/aptos-release-builder/Cargo.toml
index a42cff88383d2..5b57f024147fc 100644
--- a/aptos-move/aptos-release-builder/Cargo.toml
+++ b/aptos-move/aptos-release-builder/Cargo.toml
@@ -24,18 +24,28 @@ aptos-gas-schedule-updator = { workspace = true }
aptos-genesis = { workspace = true }
aptos-infallible = { workspace = true }
aptos-keygen = { workspace = true }
+aptos-language-e2e-tests = { workspace = true }
+aptos-move-debugger = { workspace = true }
aptos-rest-client = { workspace = true }
aptos-temppath = { workspace = true }
aptos-types = { workspace = true }
+aptos-vm = { workspace = true }
+aptos-vm-logging = { workspace = true }
+aptos-vm-types = { workspace = true }
bcs = { workspace = true }
clap = { workspace = true }
futures = { workspace = true }
git2 = { workspace = true }
handlebars = { workspace = true }
hex = { workspace = true }
+move-binary-format = { workspace = true }
+move-bytecode-verifier = { workspace = true }
move-core-types = { workspace = true }
move-model = { workspace = true }
+move-vm-runtime = { workspace = true }
+move-vm-types = { workspace = true }
once_cell = { workspace = true }
+parking_lot = { workspace = true }
reqwest = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
@@ -45,6 +55,7 @@ strum = { workspace = true }
strum_macros = { workspace = true }
tokio = { workspace = true }
url = { workspace = true }
+walkdir = { workspace = true }
[[bin]]
name = "aptos-release-builder"
diff --git a/aptos-move/aptos-release-builder/data/release.yaml b/aptos-move/aptos-release-builder/data/release.yaml
index bb9643f6fdcca..a12d498463731 100644
--- a/aptos-move/aptos-release-builder/data/release.yaml
+++ b/aptos-move/aptos-release-builder/data/release.yaml
@@ -1,16 +1,19 @@
---
-remote_endpoint: ~
-name: "v1.16"
+remote_endpoint: https://fullnode.mainnet.aptoslabs.com
+name: "TBD"
proposals:
- - name: step_1_upgrade_framework
+ - name: proposal_1_upgrade_framework
metadata:
- title: "Multi-step proposal to upgrade mainnet framework to v1.16"
- description: "This includes changes in https://github.com/aptos-labs/aptos-core/commits/aptos-release-v1.16"
+ title: "Multi-step proposal to upgrade mainnet framework, version TBD"
+ description: "This includes changes in (TBA: URL to changes)"
execution_mode: MultiStep
update_sequence:
- Gas:
- old: https://raw.githubusercontent.com/aptos-labs/aptos-networks/main/gas/v1.15.2.json
- new: https://raw.githubusercontent.com/aptos-labs/aptos-networks/main/gas/v1.16.1-rc.json
+ new: current
- Framework:
bytecode_version: 6
git_hash: ~
+ - FeatureFlag:
+ enabled:
+ - allow_serialized_script_args
+
diff --git a/aptos-move/aptos-release-builder/src/components/consensus_config.rs b/aptos-move/aptos-release-builder/src/components/consensus_config.rs
index 84411598933f4..9eeac9ab67549 100644
--- a/aptos-move/aptos-release-builder/src/components/consensus_config.rs
+++ b/aptos-move/aptos-release-builder/src/components/consensus_config.rs
@@ -3,13 +3,16 @@
use crate::{components::get_signer_arg, utils::*};
use anyhow::Result;
+use aptos_crypto::HashValue;
+use aptos_framework::generate_blob_as_hex_string;
use aptos_types::on_chain_config::OnChainConsensusConfig;
use move_model::{code_writer::CodeWriter, emit, emitln, model::Loc};
pub fn generate_consensus_upgrade_proposal(
consensus_config: &OnChainConsensusConfig,
is_testnet: bool,
- next_execution_hash: Vec,
+ next_execution_hash: Option,
+ is_multi_step: bool,
) -> Result> {
let signer_arg = get_signer_arg(is_testnet, &next_execution_hash);
let mut result = vec![];
@@ -23,7 +26,8 @@ pub fn generate_consensus_upgrade_proposal(
let proposal = generate_governance_proposal(
&writer,
is_testnet,
- next_execution_hash.clone(),
+ next_execution_hash,
+ is_multi_step,
&["aptos_framework::consensus_config"],
|writer| {
let consensus_config_blob = bcs::to_bytes(consensus_config).unwrap();
diff --git a/aptos-move/aptos-release-builder/src/components/execution_config.rs b/aptos-move/aptos-release-builder/src/components/execution_config.rs
index 27e27138711d5..554d163141c4f 100644
--- a/aptos-move/aptos-release-builder/src/components/execution_config.rs
+++ b/aptos-move/aptos-release-builder/src/components/execution_config.rs
@@ -3,13 +3,16 @@
use crate::{components::get_signer_arg, utils::*};
use anyhow::Result;
+use aptos_crypto::HashValue;
+use aptos_framework::generate_blob_as_hex_string;
use aptos_types::on_chain_config::OnChainExecutionConfig;
use move_model::{code_writer::CodeWriter, emit, emitln, model::Loc};
pub fn generate_execution_config_upgrade_proposal(
execution_config: &OnChainExecutionConfig,
is_testnet: bool,
- next_execution_hash: Vec,
+ next_execution_hash: Option,
+ is_multi_step: bool,
) -> Result> {
let signer_arg = get_signer_arg(is_testnet, &next_execution_hash);
let mut result = vec![];
@@ -23,7 +26,8 @@ pub fn generate_execution_config_upgrade_proposal(
let proposal = generate_governance_proposal(
&writer,
is_testnet,
- next_execution_hash.clone(),
+ next_execution_hash,
+ is_multi_step,
&["aptos_framework::execution_config"],
|writer| {
let execution_config_blob = bcs::to_bytes(execution_config).unwrap();
diff --git a/aptos-move/aptos-release-builder/src/components/feature_flags.rs b/aptos-move/aptos-release-builder/src/components/feature_flags.rs
index 2d6edd728308e..6a1cbabc37f95 100644
--- a/aptos-move/aptos-release-builder/src/components/feature_flags.rs
+++ b/aptos-move/aptos-release-builder/src/components/feature_flags.rs
@@ -3,6 +3,7 @@
use crate::{components::get_signer_arg, utils::*};
use anyhow::Result;
+use aptos_crypto::HashValue;
use aptos_types::on_chain_config::{FeatureFlag as AptosFeatureFlag, Features as AptosFeatures};
use move_model::{code_writer::CodeWriter, emit, emitln, model::Loc};
use serde::{Deserialize, Serialize};
@@ -121,6 +122,15 @@ pub enum FeatureFlag {
DefaultToConcurrentFungibleBalance,
LimitVMTypeSize,
AbortIfMultisigPayloadMismatch,
+ DisallowUserNative,
+ AllowSerializedScriptArgs,
+ UseCompatibilityCheckerV2,
+ EnableEnumTypes,
+ EnableResourceAccessControl,
+ RejectUnstableBytecodeForScript,
+ FederatedKeyless,
+ TransactionSimulationEnhancement,
+ CollectionOwner,
}
fn generate_features_blob(writer: &CodeWriter, data: &[u64]) {
@@ -144,7 +154,8 @@ fn generate_features_blob(writer: &CodeWriter, data: &[u64]) {
pub fn generate_feature_upgrade_proposal(
features: &Features,
is_testnet: bool,
- next_execution_hash: Vec,
+ next_execution_hash: Option,
+ is_multi_step: bool,
) -> Result> {
let signer_arg = get_signer_arg(is_testnet, &next_execution_hash);
let mut result = vec![];
@@ -173,7 +184,8 @@ pub fn generate_feature_upgrade_proposal(
let proposal = generate_governance_proposal(
&writer,
is_testnet,
- next_execution_hash.clone(),
+ next_execution_hash,
+ is_multi_step,
&["std::features"],
|writer| {
emit!(writer, "let enabled_blob: vector = ");
@@ -316,6 +328,25 @@ impl From for AptosFeatureFlag {
FeatureFlag::AbortIfMultisigPayloadMismatch => {
AptosFeatureFlag::ABORT_IF_MULTISIG_PAYLOAD_MISMATCH
},
+ FeatureFlag::DisallowUserNative => AptosFeatureFlag::DISALLOW_USER_NATIVES,
+ FeatureFlag::AllowSerializedScriptArgs => {
+ AptosFeatureFlag::ALLOW_SERIALIZED_SCRIPT_ARGS
+ },
+ FeatureFlag::UseCompatibilityCheckerV2 => {
+ AptosFeatureFlag::USE_COMPATIBILITY_CHECKER_V2
+ },
+ FeatureFlag::EnableEnumTypes => AptosFeatureFlag::ENABLE_ENUM_TYPES,
+ FeatureFlag::EnableResourceAccessControl => {
+ AptosFeatureFlag::ENABLE_RESOURCE_ACCESS_CONTROL
+ },
+ FeatureFlag::RejectUnstableBytecodeForScript => {
+ AptosFeatureFlag::REJECT_UNSTABLE_BYTECODE_FOR_SCRIPT
+ },
+ FeatureFlag::FederatedKeyless => AptosFeatureFlag::FEDERATED_KEYLESS,
+ FeatureFlag::TransactionSimulationEnhancement => {
+ AptosFeatureFlag::TRANSACTION_SIMULATION_ENHANCEMENT
+ },
+ FeatureFlag::CollectionOwner => AptosFeatureFlag::COLLECTION_OWNER,
}
}
}
@@ -440,6 +471,25 @@ impl From for FeatureFlag {
AptosFeatureFlag::ABORT_IF_MULTISIG_PAYLOAD_MISMATCH => {
FeatureFlag::AbortIfMultisigPayloadMismatch
},
+ AptosFeatureFlag::DISALLOW_USER_NATIVES => FeatureFlag::DisallowUserNative,
+ AptosFeatureFlag::ALLOW_SERIALIZED_SCRIPT_ARGS => {
+ FeatureFlag::AllowSerializedScriptArgs
+ },
+ AptosFeatureFlag::USE_COMPATIBILITY_CHECKER_V2 => {
+ FeatureFlag::UseCompatibilityCheckerV2
+ },
+ AptosFeatureFlag::ENABLE_ENUM_TYPES => FeatureFlag::EnableEnumTypes,
+ AptosFeatureFlag::ENABLE_RESOURCE_ACCESS_CONTROL => {
+ FeatureFlag::EnableResourceAccessControl
+ },
+ AptosFeatureFlag::REJECT_UNSTABLE_BYTECODE_FOR_SCRIPT => {
+ FeatureFlag::RejectUnstableBytecodeForScript
+ },
+ AptosFeatureFlag::FEDERATED_KEYLESS => FeatureFlag::FederatedKeyless,
+ AptosFeatureFlag::TRANSACTION_SIMULATION_ENHANCEMENT => {
+ FeatureFlag::TransactionSimulationEnhancement
+ },
+ AptosFeatureFlag::COLLECTION_OWNER => FeatureFlag::CollectionOwner,
}
}
}
diff --git a/aptos-move/aptos-release-builder/src/components/framework.rs b/aptos-move/aptos-release-builder/src/components/framework.rs
index d95c585d8e4fc..df8509cfe8934 100644
--- a/aptos-move/aptos-release-builder/src/components/framework.rs
+++ b/aptos-move/aptos-release-builder/src/components/framework.rs
@@ -3,6 +3,7 @@
use crate::{aptos_core_path, components::get_execution_hash};
use anyhow::Result;
+use aptos_crypto::HashValue;
use aptos_framework::{BuildOptions, BuiltPackage, ReleasePackage};
use aptos_temppath::TempPath;
use aptos_types::account_address::AccountAddress;
@@ -21,8 +22,14 @@ pub struct FrameworkReleaseConfig {
pub fn generate_upgrade_proposals(
config: &FrameworkReleaseConfig,
is_testnet: bool,
- next_execution_hash: Vec,
+ next_execution_hash: Option,
+ is_multi_step: bool,
) -> Result> {
+ assert!(
+ is_multi_step || next_execution_hash.is_none(),
+ "only multi-step proposals can have a next execution hash"
+ );
+
const APTOS_GIT_PATH: &str = "https://github.com/aptos-labs/aptos-core.git";
let mut package_path_list = [
@@ -54,7 +61,7 @@ pub fn generate_upgrade_proposals(
// For generating multi-step proposal files, we need to generate them in the reverse order since
// we need the hash of the next script.
// We will reverse the order back when writing the files into a directory.
- if !next_execution_hash.is_empty() {
+ if is_multi_step {
package_path_list.reverse();
}
@@ -102,16 +109,10 @@ pub fn generate_upgrade_proposals(
let package = BuiltPackage::build(package_path, options)?;
let release = ReleasePackage::new(package)?;
- // If we're generating a single-step proposal on testnet
- if is_testnet && next_execution_hash.is_empty() {
- release.generate_script_proposal_testnet(account, move_script_path.clone())?;
- // If we're generating a single-step proposal on mainnet
- } else if next_execution_hash.is_empty() {
- release.generate_script_proposal(account, move_script_path.clone())?;
+ if is_multi_step {
// If we're generating a multi-step proposal
- } else {
let next_execution_hash_bytes = if result.is_empty() {
- next_execution_hash.clone()
+ next_execution_hash
} else {
get_execution_hash(&result)
};
@@ -120,7 +121,13 @@ pub fn generate_upgrade_proposals(
move_script_path.clone(),
next_execution_hash_bytes,
)?;
- };
+ } else if is_testnet {
+ // If we're generating a single-step proposal on testnet
+ release.generate_script_proposal_testnet(account, move_script_path.clone())?;
+ } else {
+ // If we're generating a single-step proposal on mainnet
+ release.generate_script_proposal(account, move_script_path.clone())?;
+ }
let mut script = format!(
"// Framework commit hash: {}\n// Builder commit hash: {}\n",
diff --git a/aptos-move/aptos-release-builder/src/components/gas.rs b/aptos-move/aptos-release-builder/src/components/gas.rs
index 7e247e8a402a1..9534e6960da05 100644
--- a/aptos-move/aptos-release-builder/src/components/gas.rs
+++ b/aptos-move/aptos-release-builder/src/components/gas.rs
@@ -3,6 +3,8 @@
use crate::{components::get_signer_arg, utils::*};
use anyhow::Result;
+use aptos_crypto::HashValue;
+use aptos_framework::generate_blob_as_hex_string;
use aptos_types::on_chain_config::{DiffItem, GasScheduleV2};
use move_model::{code_writer::CodeWriter, emit, emitln, model::Loc};
use sha3::{Digest, Sha3_512};
@@ -79,7 +81,8 @@ pub fn generate_gas_upgrade_proposal(
old_gas_schedule: Option<&GasScheduleV2>,
new_gas_schedule: &GasScheduleV2,
is_testnet: bool,
- next_execution_hash: Vec,
+ next_execution_hash: Option,
+ is_multi_step: bool,
) -> Result> {
let signer_arg = get_signer_arg(is_testnet, &next_execution_hash);
let mut result = vec![];
@@ -114,7 +117,8 @@ pub fn generate_gas_upgrade_proposal(
let proposal = generate_governance_proposal(
&writer,
is_testnet,
- next_execution_hash.clone(),
+ next_execution_hash,
+ is_multi_step,
&["aptos_framework::gas_schedule"],
|writer| {
let gas_schedule_blob = bcs::to_bytes(new_gas_schedule).unwrap();
diff --git a/aptos-move/aptos-release-builder/src/components/jwk_consensus_config.rs b/aptos-move/aptos-release-builder/src/components/jwk_consensus_config.rs
index fbe08d117fd82..930ac77028eab 100644
--- a/aptos-move/aptos-release-builder/src/components/jwk_consensus_config.rs
+++ b/aptos-move/aptos-release-builder/src/components/jwk_consensus_config.rs
@@ -2,13 +2,15 @@
// SPDX-License-Identifier: Apache-2.0
use crate::{components::get_signer_arg, utils::generate_governance_proposal};
+use aptos_crypto::HashValue;
use aptos_types::on_chain_config::OnChainJWKConsensusConfig;
use move_model::{code_writer::CodeWriter, emitln, model::Loc};
pub fn generate_jwk_consensus_config_update_proposal(
config: &OnChainJWKConsensusConfig,
is_testnet: bool,
- next_execution_hash: Vec,
+ next_execution_hash: Option,
+ is_multi_step: bool,
) -> anyhow::Result> {
let signer_arg = get_signer_arg(is_testnet, &next_execution_hash);
let mut result = vec![];
@@ -18,7 +20,8 @@ pub fn generate_jwk_consensus_config_update_proposal(
let proposal = generate_governance_proposal(
&writer,
is_testnet,
- next_execution_hash.clone(),
+ next_execution_hash,
+ is_multi_step,
&["aptos_framework::jwk_consensus_config", "std::string::utf8"],
|writer| {
match config {
diff --git a/aptos-move/aptos-release-builder/src/components/mod.rs b/aptos-move/aptos-release-builder/src/components/mod.rs
index 378404cbb6227..35b4e05e4de3a 100644
--- a/aptos-move/aptos-release-builder/src/components/mod.rs
+++ b/aptos-move/aptos-release-builder/src/components/mod.rs
@@ -11,6 +11,7 @@ use crate::{
};
use anyhow::{anyhow, bail, Context, Result};
use aptos::governance::GenerateExecutionHash;
+use aptos_crypto::HashValue;
use aptos_gas_schedule::LATEST_GAS_FEATURE_VERSION;
use aptos_infallible::duration_since_epoch;
use aptos_rest_client::Client;
@@ -25,6 +26,7 @@ use aptos_types::{
};
use futures::executor::block_on;
use handlebars::Handlebars;
+use move_binary_format::file_format_common::VERSION_6;
use once_cell::sync::Lazy;
use serde::{de::Visitor, Deserialize, Deserializer, Serialize, Serializer};
use std::{
@@ -232,8 +234,9 @@ impl ReleaseEntry {
if is_multi_step {
get_execution_hash(result)
} else {
- "".to_owned().into_bytes()
+ None
},
+ is_multi_step,
)
.unwrap(),
);
@@ -251,7 +254,12 @@ impl ReleaseEntry {
),
None => {
match client {
- Some(client) => Some(fetch_config::(client)?),
+ Some(_client) => {
+ // We could return `Some(fetch_config::(client)?)`,
+ // but this makes certain test scenarios flaky, so just return
+ // None here
+ None
+ },
None => {
println!("!!! WARNING !!!");
println!("Generating gas schedule upgrade without a base for comparison.");
@@ -275,8 +283,9 @@ impl ReleaseEntry {
if is_multi_step {
get_execution_hash(result)
} else {
- "".to_owned().into_bytes()
+ None
},
+ is_multi_step,
)?);
}
},
@@ -288,8 +297,9 @@ impl ReleaseEntry {
if is_multi_step {
get_execution_hash(result)
} else {
- "".to_owned().into_bytes()
+ None
},
+ is_multi_step,
)?);
}
},
@@ -316,8 +326,9 @@ impl ReleaseEntry {
if is_multi_step {
get_execution_hash(result)
} else {
- "".to_owned().into_bytes()
+ None
},
+ is_multi_step,
)?);
}
},
@@ -329,8 +340,9 @@ impl ReleaseEntry {
if is_multi_step {
get_execution_hash(result)
} else {
- "".to_owned().into_bytes()
+ None
},
+ is_multi_step,
)?);
}
},
@@ -343,8 +355,9 @@ impl ReleaseEntry {
if is_multi_step {
get_execution_hash(result)
} else {
- "".to_owned().into_bytes()
+ None
},
+ is_multi_step,
)?,
);
}
@@ -356,8 +369,9 @@ impl ReleaseEntry {
if is_multi_step {
get_execution_hash(result)
} else {
- "".to_owned().into_bytes()
+ None
},
+ is_multi_step,
)?);
},
ReleaseEntry::RawScript(script_path) => {
@@ -409,8 +423,9 @@ impl ReleaseEntry {
if is_multi_step {
get_execution_hash(result)
} else {
- "".to_owned().into_bytes()
+ None
},
+ is_multi_step,
)?,
);
},
@@ -422,8 +437,9 @@ impl ReleaseEntry {
if is_multi_step {
get_execution_hash(result)
} else {
- "".to_owned().into_bytes()
+ None
},
+ is_multi_step,
)?,
);
},
@@ -717,7 +733,7 @@ impl Default for ReleaseConfig {
metadata: ProposalMetadata::default(),
name: "framework".to_string(),
update_sequence: vec![ReleaseEntry::Framework(FrameworkReleaseConfig {
- bytecode_version: 6, // TODO: remove explicit bytecode version from sources
+ bytecode_version: VERSION_6,
git_hash: None,
})],
},
@@ -747,9 +763,9 @@ impl Default for ReleaseConfig {
transaction_shuffler_type:
TransactionShufflerType::DeprecatedSenderAwareV1(32),
})),
- ReleaseEntry::RawScript(PathBuf::from(
- "data/proposals/empty_multi_step.move",
- )),
+ //ReleaseEntry::RawScript(PathBuf::from(
+ // "data/proposals/empty_multi_step.move",
+ //)),
],
},
],
@@ -757,9 +773,9 @@ impl Default for ReleaseConfig {
}
}
-pub fn get_execution_hash(result: &[(String, String)]) -> Vec {
+pub fn get_execution_hash(result: &[(String, String)]) -> Option {
if result.is_empty() {
- "vector::empty()".to_owned().into_bytes()
+ None
} else {
let temp_script_path = TempPath::new();
temp_script_path.create_as_file().unwrap();
@@ -780,7 +796,7 @@ pub fn get_execution_hash(result: &[(String, String)]) -> Vec {
}
.generate_hash()
.unwrap();
- hash.to_vec()
+ Some(hash)
}
}
@@ -821,8 +837,8 @@ impl Default for ProposalMetadata {
}
}
-fn get_signer_arg(is_testnet: bool, next_execution_hash: &[u8]) -> &str {
- if is_testnet && next_execution_hash.is_empty() {
+fn get_signer_arg(is_testnet: bool, next_execution_hash: &Option) -> &str {
+ if is_testnet && next_execution_hash.is_none() {
"framework_signer"
} else {
"&framework_signer"
diff --git a/aptos-move/aptos-release-builder/src/components/oidc_providers.rs b/aptos-move/aptos-release-builder/src/components/oidc_providers.rs
index 1da209d3e2c86..4baa424ad116a 100644
--- a/aptos-move/aptos-release-builder/src/components/oidc_providers.rs
+++ b/aptos-move/aptos-release-builder/src/components/oidc_providers.rs
@@ -2,6 +2,7 @@
// SPDX-License-Identifier: Apache-2.0
use crate::{components::get_signer_arg, utils::generate_governance_proposal};
+use aptos_crypto::HashValue;
use move_model::{code_writer::CodeWriter, emitln, model::Loc};
use serde::{Deserialize, Serialize};
@@ -20,7 +21,8 @@ pub enum OidcProviderOp {
pub fn generate_oidc_provider_ops_proposal(
ops: &[OidcProviderOp],
is_testnet: bool,
- next_execution_hash: Vec,
+ next_execution_hash: Option,
+ is_multi_step: bool,
) -> anyhow::Result> {
let signer_arg = get_signer_arg(is_testnet, &next_execution_hash);
let mut result = vec![];
@@ -30,7 +32,8 @@ pub fn generate_oidc_provider_ops_proposal(
let proposal = generate_governance_proposal(
&writer,
is_testnet,
- next_execution_hash.clone(),
+ next_execution_hash,
+ is_multi_step,
&["aptos_framework::jwks"],
|writer| {
for op in ops {
diff --git a/aptos-move/aptos-release-builder/src/components/randomness_config.rs b/aptos-move/aptos-release-builder/src/components/randomness_config.rs
index f3a59713874db..3f01c08376e2b 100644
--- a/aptos-move/aptos-release-builder/src/components/randomness_config.rs
+++ b/aptos-move/aptos-release-builder/src/components/randomness_config.rs
@@ -2,6 +2,7 @@
// SPDX-License-Identifier: Apache-2.0
use crate::{components::get_signer_arg, utils::generate_governance_proposal};
+use aptos_crypto::HashValue;
use aptos_types::on_chain_config::OnChainRandomnessConfig;
use move_model::{code_writer::CodeWriter, emitln, model::Loc};
use serde::{Deserialize, Serialize};
@@ -47,7 +48,8 @@ impl From for OnChainRandomnessConfig {
pub fn generate_randomness_config_update_proposal(
config: &ReleaseFriendlyRandomnessConfig,
is_testnet: bool,
- next_execution_hash: Vec,
+ next_execution_hash: Option,
+ is_multi_step: bool,
) -> anyhow::Result> {
let signer_arg = get_signer_arg(is_testnet, &next_execution_hash);
let mut result = vec![];
@@ -57,7 +59,8 @@ pub fn generate_randomness_config_update_proposal(
let proposal = generate_governance_proposal(
&writer,
is_testnet,
- next_execution_hash.clone(),
+ next_execution_hash,
+ is_multi_step,
&[
"aptos_framework::randomness_config",
"aptos_std::fixed_point64",
diff --git a/aptos-move/aptos-release-builder/src/components/transaction_fee.rs b/aptos-move/aptos-release-builder/src/components/transaction_fee.rs
index 9b4b17dce06c7..a9f72e416bd5e 100644
--- a/aptos-move/aptos-release-builder/src/components/transaction_fee.rs
+++ b/aptos-move/aptos-release-builder/src/components/transaction_fee.rs
@@ -3,13 +3,15 @@
use crate::utils::*;
use anyhow::Result;
+use aptos_crypto::HashValue;
use move_model::{code_writer::CodeWriter, emitln, model::Loc};
pub fn generate_fee_distribution_proposal(
function_name: String,
burn_percentage: u8,
is_testnet: bool,
- next_execution_hash: Vec,
+ next_execution_hash: Option,
+ is_multi_step: bool,
) -> Result> {
let mut result = vec![];
@@ -19,6 +21,7 @@ pub fn generate_fee_distribution_proposal(
&writer,
is_testnet,
next_execution_hash,
+ is_multi_step,
&["aptos_framework::transaction_fee"],
|writer| {
emitln!(
@@ -37,25 +40,29 @@ pub fn generate_fee_distribution_proposal(
pub fn generate_proposal_to_initialize_fee_collection_and_distribution(
burn_percentage: u8,
is_testnet: bool,
- next_execution_hash: Vec,
+ next_execution_hash: Option,
+ is_multi_step: bool,
) -> Result> {
generate_fee_distribution_proposal(
"initialize_fee_collection_and_distribution".to_string(),
burn_percentage,
is_testnet,
next_execution_hash,
+ is_multi_step,
)
}
pub fn generate_proposal_to_upgrade_burn_percentage(
burn_percentage: u8,
is_testnet: bool,
- next_execution_hash: Vec,
+ next_execution_hash: Option,
+ is_multi_step: bool,
) -> Result> {
generate_fee_distribution_proposal(
"upgrade_burn_percentage".to_string(),
burn_percentage,
is_testnet,
next_execution_hash,
+ is_multi_step,
)
}
diff --git a/aptos-move/aptos-release-builder/src/components/version.rs b/aptos-move/aptos-release-builder/src/components/version.rs
index 50cbd6987527f..3d385f118ad9a 100644
--- a/aptos-move/aptos-release-builder/src/components/version.rs
+++ b/aptos-move/aptos-release-builder/src/components/version.rs
@@ -3,13 +3,15 @@
use crate::{components::get_signer_arg, utils::*};
use anyhow::Result;
+use aptos_crypto::HashValue;
use aptos_types::on_chain_config::AptosVersion;
use move_model::{code_writer::CodeWriter, emitln, model::Loc};
pub fn generate_version_upgrade_proposal(
version: &AptosVersion,
is_testnet: bool,
- next_execution_hash: Vec,
+ next_execution_hash: Option,
+ is_multi_step: bool,
) -> Result> {
let signer_arg = get_signer_arg(is_testnet, &next_execution_hash);
let mut result = vec![];
@@ -19,7 +21,8 @@ pub fn generate_version_upgrade_proposal(
let proposal = generate_governance_proposal(
&writer,
is_testnet,
- next_execution_hash.clone(),
+ next_execution_hash,
+ is_multi_step,
&["aptos_framework::version"],
|writer| {
emitln!(
diff --git a/aptos-move/aptos-release-builder/src/lib.rs b/aptos-move/aptos-release-builder/src/lib.rs
index 913af0d23002d..1a74516d9827e 100644
--- a/aptos-move/aptos-release-builder/src/lib.rs
+++ b/aptos-move/aptos-release-builder/src/lib.rs
@@ -2,6 +2,7 @@
// SPDX-License-Identifier: Apache-2.0
pub mod components;
+pub mod simulate;
mod utils;
pub mod validate;
diff --git a/aptos-move/aptos-release-builder/src/main.rs b/aptos-move/aptos-release-builder/src/main.rs
index 205e8d8224621..8352800e81cd7 100644
--- a/aptos-move/aptos-release-builder/src/main.rs
+++ b/aptos-move/aptos-release-builder/src/main.rs
@@ -8,6 +8,7 @@ use aptos_gas_schedule::LATEST_GAS_FEATURE_VERSION;
use aptos_release_builder::{
components::fetch_config,
initialize_aptos_core_path,
+ simulate::simulate_all_proposals,
validate::{DEFAULT_RESOLUTION_TIME, FAST_RESOLUTION_TIME},
};
use aptos_types::{
@@ -17,6 +18,7 @@ use aptos_types::{
};
use clap::{Parser, Subcommand};
use std::{path::PathBuf, str::FromStr};
+use url::Url;
#[derive(Parser)]
pub struct Argument {
@@ -26,6 +28,43 @@ pub struct Argument {
aptos_core_path: Option,
}
+// TODO(vgao1996): unify with `ReplayNetworkSelection` in the `aptos` crate.
+#[derive(Clone, Debug)]
+pub enum NetworkSelection {
+ Mainnet,
+ Testnet,
+ Devnet,
+ RestEndpoint(String),
+}
+
+impl FromStr for NetworkSelection {
+ type Err = anyhow::Error;
+
+ fn from_str(s: &str) -> Result {
+ Ok(match s {
+ "mainnet" => Self::Mainnet,
+ "testnet" => Self::Testnet,
+ "devnet" => Self::Devnet,
+ _ => Self::RestEndpoint(s.to_owned()),
+ })
+ }
+}
+
+impl NetworkSelection {
+ fn to_url(&self) -> anyhow::Result {
+ use NetworkSelection::*;
+
+ let s = match &self {
+ Mainnet => "https://fullnode.mainnet.aptoslabs.com",
+ Testnet => "https://fullnode.testnet.aptoslabs.com",
+ Devnet => "https://fullnode.devnet.aptoslabs.com",
+ RestEndpoint(url) => url,
+ };
+
+ Ok(Url::parse(s)?)
+ }
+}
+
#[derive(Subcommand, Debug)]
pub enum Commands {
/// Generate sets of governance proposals based on the release_config file passed in
@@ -34,6 +73,24 @@ pub enum Commands {
release_config: PathBuf,
#[clap(short, long)]
output_dir: PathBuf,
+
+ #[clap(long)]
+ simulate: Option,
+ },
+ /// Simulate a multi-step proposal on the specified network, using its current states.
+ /// The simulation will execute the governance scripts, as if the proposal is already
+ /// approved.
+ Simulate {
+ /// Directory that may contain one or more proposals at any level
+ /// within its sub-directory hierarchy.
+ #[clap(short, long)]
+ path: PathBuf,
+
+ /// The network to simulate on.
+ ///
+ /// Possible values: devnet, testnet, mainnet,
+ #[clap(long)]
+ network: NetworkSelection,
},
/// Generate sets of governance proposals with default release config.
WriteDefault {
@@ -126,12 +183,23 @@ async fn main() -> anyhow::Result<()> {
Commands::GenerateProposals {
release_config,
output_dir,
+ simulate,
} => {
aptos_release_builder::ReleaseConfig::load_config(release_config.as_path())
.with_context(|| "Failed to load release config".to_string())?
.generate_release_proposal_scripts(output_dir.as_path())
.await
.with_context(|| "Failed to generate release proposal scripts".to_string())?;
+
+ if let Some(network) = simulate {
+ let remote_endpoint = network.to_url()?;
+ simulate_all_proposals(remote_endpoint, output_dir.as_path()).await?;
+ }
+
+ Ok(())
+ },
+ Commands::Simulate { network, path } => {
+ simulate_all_proposals(network.to_url()?, &path).await?;
Ok(())
},
Commands::WriteDefault { output_path } => {
diff --git a/aptos-move/aptos-release-builder/src/simulate.rs b/aptos-move/aptos-release-builder/src/simulate.rs
new file mode 100644
index 0000000000000..0909e62d6df8d
--- /dev/null
+++ b/aptos-move/aptos-release-builder/src/simulate.rs
@@ -0,0 +1,731 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module implements the simulation of governance proposals.
+//! Currently, it supports only multi-step proposals.
+//!
+//! It utilizes the remote debugger infrastructure to fetch real chain states
+//! for local simulation, but adds another in-memory database to store the new side effects
+//! generated by the governance scripts.
+//!
+//! Normally, governance scripts needs to be approved through on-chain governance
+//! before they could be executed. This process involves setting up various states
+//! (e.g., staking pool, delegated voter), which can be quite complex.
+//!
+//! This simulation bypasses these challenges by patching specific Move functions
+//! with mock versions, most notably `fun resolve_multi_step_proposal`, thus allowing
+//! the governance process to be skipped altogether.
+//!
+//! In other words, this simulation is intended for checking whether a governance
+//! proposal will execute successfully, assuming it gets approved, not whether the
+//! governance framework itself is working as intended.
+
+use crate::aptos_framework_path;
+use anyhow::{anyhow, bail, Context, Result};
+use aptos::{
+ common::types::PromptOptions, governance::compile_in_temp_dir, move_tool::FrameworkPackageArgs,
+};
+use aptos_crypto::HashValue;
+use aptos_gas_schedule::{AptosGasParameters, FromOnChainGasSchedule};
+use aptos_language_e2e_tests::account::AccountData;
+use aptos_move_debugger::aptos_debugger::AptosDebugger;
+use aptos_rest_client::Client;
+use aptos_types::{
+ account_address::AccountAddress,
+ account_config::ChainIdResource,
+ on_chain_config::{ApprovedExecutionHashes, Features, GasScheduleV2, OnChainConfig},
+ state_store::{
+ in_memory_state_view::InMemoryStateView, state_key::StateKey,
+ state_storage_usage::StateStorageUsage, state_value::StateValue,
+ Result as StateStoreResult, StateView, TStateView,
+ },
+ transaction::{ExecutionStatus, Script, TransactionArgument, TransactionStatus},
+ vm::configs::aptos_prod_deserializer_config,
+ write_set::{TransactionWrite, WriteSet},
+};
+use aptos_vm::{
+ data_cache::AsMoveResolver,
+ move_vm_ext::{flush_warm_vm_cache, SessionId},
+ AptosVM,
+};
+use aptos_vm_logging::log_schema::AdapterLogSchema;
+use aptos_vm_types::storage::change_set_configs::ChangeSetConfigs;
+use clap::Parser;
+use move_binary_format::{
+ access::ModuleAccess,
+ deserializer::DeserializerConfig,
+ file_format::{
+ AddressIdentifierIndex, Bytecode, FunctionDefinition, FunctionHandle, FunctionHandleIndex,
+ IdentifierIndex, ModuleHandle, ModuleHandleIndex, Signature, SignatureIndex,
+ SignatureToken, Visibility,
+ },
+ CompiledModule,
+};
+use move_core_types::{
+ identifier::{IdentStr, Identifier},
+ language_storage::{ModuleId, StructTag},
+ move_resource::MoveResource,
+};
+use move_vm_runtime::module_traversal::{TraversalContext, TraversalStorage};
+use move_vm_types::{gas::UnmeteredGasMeter, resolver::ModuleResolver};
+use once_cell::sync::Lazy;
+use parking_lot::Mutex;
+use serde::Serialize;
+use std::{
+ collections::HashMap,
+ io::Write,
+ path::{Path, PathBuf},
+};
+use url::Url;
+use walkdir::WalkDir;
+
+/***************************************************************************************************
+ * Compiled Module Helpers
+ *
+ **************************************************************************************************/
+fn find_function_def_by_name<'a>(
+ m: &'a mut CompiledModule,
+ name: &IdentStr,
+) -> Option<&'a mut FunctionDefinition> {
+ for (idx, func_def) in m.function_defs.iter().enumerate() {
+ let func_handle = m.function_handle_at(func_def.function);
+ let func_name = m.identifier_at(func_handle.name);
+ if name == func_name {
+ return Some(&mut m.function_defs[idx]);
+ }
+ }
+ None
+}
+
+fn get_or_add(pool: &mut Vec, val: T) -> usize {
+ match pool.iter().position(|elem| elem == &val) {
+ Some(idx) => idx,
+ None => {
+ let idx = pool.len();
+ pool.push(val);
+ idx
+ },
+ }
+}
+
+#[allow(dead_code)]
+fn get_or_add_addr(m: &mut CompiledModule, addr: AccountAddress) -> AddressIdentifierIndex {
+ AddressIdentifierIndex::new(get_or_add(&mut m.address_identifiers, addr) as u16)
+}
+
+fn get_or_add_ident(m: &mut CompiledModule, ident: Identifier) -> IdentifierIndex {
+ IdentifierIndex::new(get_or_add(&mut m.identifiers, ident) as u16)
+}
+
+#[allow(dead_code)]
+fn get_or_add_module_handle(
+ m: &mut CompiledModule,
+ addr: AccountAddress,
+ name: Identifier,
+) -> ModuleHandleIndex {
+ let addr = get_or_add_addr(m, addr);
+ let name = get_or_add_ident(m, name);
+ let module_handle = ModuleHandle {
+ address: addr,
+ name,
+ };
+ ModuleHandleIndex::new(get_or_add(&mut m.module_handles, module_handle) as u16)
+}
+
+fn get_or_add_signature(m: &mut CompiledModule, sig: Vec) -> SignatureIndex {
+ SignatureIndex::new(get_or_add(&mut m.signatures, Signature(sig)) as u16)
+}
+
+fn find_function_handle_by_name(
+ m: &CompiledModule,
+ addr: AccountAddress,
+ module_name: &IdentStr,
+ func_name: &IdentStr,
+) -> Option {
+ for (idx, func_handle) in m.function_handles().iter().enumerate() {
+ let module_handle = m.module_handle_at(func_handle.module);
+ if m.address_identifier_at(module_handle.address) == &addr
+ && m.identifier_at(module_handle.name) == module_name
+ && m.identifier_at(func_handle.name) == func_name
+ {
+ return Some(FunctionHandleIndex(idx as u16));
+ }
+ }
+ None
+}
+
+fn add_simple_native_function(
+ m: &mut CompiledModule,
+ func_name: Identifier,
+ params: Vec,
+ returns: Vec,
+) -> Result {
+ if let Some(func_handle_idx) =
+ find_function_handle_by_name(m, *m.self_addr(), m.self_name(), &func_name)
+ {
+ return Ok(func_handle_idx);
+ }
+
+ let name = get_or_add_ident(m, func_name);
+ let parameters = get_or_add_signature(m, params);
+ let return_ = get_or_add_signature(m, returns);
+ let func_handle = FunctionHandle {
+ module: m.self_handle_idx(),
+ name,
+ parameters,
+ return_,
+ type_parameters: vec![],
+ access_specifiers: None,
+ };
+ let func_handle_idx = FunctionHandleIndex(m.function_handles.len() as u16);
+ m.function_handles.push(func_handle);
+
+ let func_def = FunctionDefinition {
+ function: func_handle_idx,
+ visibility: Visibility::Private,
+ is_entry: false,
+ acquires_global_resources: vec![],
+ code: None,
+ };
+ m.function_defs.push(func_def);
+
+ Ok(func_handle_idx)
+}
+/***************************************************************************************************
+ * Simulation State View
+ *
+ **************************************************************************************************/
+/// A state view specifically designed for managing the side effects generated by
+/// the governance scripts.
+///
+/// It comprises two components:
+/// - A remote debugger state view to enable on-demand data fetching.
+/// - A local state store to allow new changes to be stacked on top of the remote state.
+struct SimulationStateView<'a, S> {
+ remote: &'a S,
+ states: Mutex>>,
+}
+
+impl<'a, S> SimulationStateView<'a, S>
+where
+ S: StateView,
+{
+ fn set_state_value(&self, state_key: StateKey, state_val: StateValue) {
+ self.states.lock().insert(state_key, Some(state_val));
+ }
+
+ fn set_on_chain_config(&self, config: &C) -> Result<()>
+ where
+ C: OnChainConfig + Serialize,
+ {
+ let addr = AccountAddress::from_hex_literal(C::ADDRESS).unwrap();
+
+ self.set_state_value(
+ StateKey::resource(&addr, &StructTag {
+ address: addr,
+ module: Identifier::new(C::MODULE_IDENTIFIER).unwrap(),
+ name: Identifier::new(C::TYPE_IDENTIFIER).unwrap(),
+ type_args: vec![],
+ })?,
+ StateValue::new_legacy(bcs::to_bytes(&config)?.into()),
+ );
+
+ Ok(())
+ }
+
+ fn modify_on_chain_config(&self, modify: F) -> Result<()>
+ where
+ C: OnChainConfig + Serialize,
+ F: FnOnce(&mut C) -> Result<()>,
+ {
+ let mut config = C::fetch_config(self).ok_or_else(|| {
+ anyhow!(
+ "failed to fetch on-chain config: {:?}",
+ std::any::type_name::()
+ )
+ })?;
+
+ modify(&mut config)?;
+
+ self.set_on_chain_config(&config)?;
+
+ Ok(())
+ }
+
+ #[allow(dead_code)]
+ fn remove_state_value(&mut self, state_key: &StateKey) {
+ self.states.lock().remove(state_key);
+ }
+
+ fn apply_write_set(&self, write_set: WriteSet) {
+ let mut states = self.states.lock();
+
+ for (state_key, write_op) in write_set {
+ match write_op.as_state_value() {
+ None => {
+ states.remove(&state_key);
+ },
+ Some(state_val) => {
+ states.insert(state_key, Some(state_val));
+ },
+ }
+ }
+ }
+
+ #[allow(dead_code)]
+ fn read_resource(&self, addr: &AccountAddress) -> T {
+ let data_blob = self
+ .get_state_value_bytes(
+ &StateKey::resource_typed::(addr).expect("failed to create StateKey"),
+ )
+ .expect("account must exist in data store")
+ .unwrap_or_else(|| panic!("Can't fetch {} resource for {}", T::STRUCT_NAME, addr));
+
+ bcs::from_bytes(&data_blob).expect("failed to deserialize resource")
+ }
+}
+
+impl<'a, S> TStateView for SimulationStateView<'a, S>
+where
+ S: StateView,
+{
+ type Key = StateKey;
+
+ fn get_state_value(&self, state_key: &Self::Key) -> StateStoreResult> {
+ if let Some(res) = self.states.lock().get(state_key) {
+ return Ok(res.clone());
+ }
+ self.remote.get_state_value(state_key)
+ }
+
+ fn get_usage(&self) -> StateStoreResult {
+ Ok(StateStorageUsage::Untracked)
+ }
+
+ fn as_in_memory_state_view(&self) -> InMemoryStateView {
+ panic!("not supported")
+ }
+}
+
+/***************************************************************************************************
+ * Patches
+ *
+ **************************************************************************************************/
+static MODULE_ID_APTOS_GOVERNANCE: Lazy = Lazy::new(|| {
+ ModuleId::new(
+ AccountAddress::ONE,
+ Identifier::new("aptos_governance").unwrap(),
+ )
+});
+
+static FUNC_NAME_CREATE_SIGNER: Lazy =
+ Lazy::new(|| Identifier::new("create_signer").unwrap());
+
+static FUNC_NAME_RESOLVE_MULTI_STEP_PROPOSAL: Lazy =
+ Lazy::new(|| Identifier::new("resolve_multi_step_proposal").unwrap());
+
+const DUMMY_PROPOSAL_ID: u64 = u64::MAX;
+
+const MAGIC_FAILED_NEXT_EXECUTION_HASH_CHECK: u64 = 0xDEADBEEF;
+
+/// Helper to load a module from the state view, deserialize it, modify it with
+/// the provided callback, reserialize it and finally write it back.
+fn patch_module(
+ state_view: &SimulationStateView,
+ deserializer_config: &DeserializerConfig,
+ module_id: &ModuleId,
+ modify_module: F,
+) -> Result<()>
+where
+ F: FnOnce(&mut CompiledModule) -> Result<()>,
+{
+ let resolver = state_view.as_move_resolver();
+ let blob = resolver
+ .get_module(module_id)?
+ .ok_or_else(|| anyhow!("module {} does not exist", module_id))?;
+
+ let mut m = CompiledModule::deserialize_with_config(&blob, deserializer_config)?;
+
+ modify_module(&mut m)?;
+
+ // Sanity check to ensure the correctness of the check
+ move_bytecode_verifier::verify_module(&m).map_err(|err| {
+ anyhow!(
+ "patched module failed to verify -- check if the patch is correct: {}",
+ err
+ )
+ })?;
+
+ let mut blob = vec![];
+ m.serialize(&mut blob)?;
+
+ state_view.set_state_value(
+ StateKey::module_id(module_id),
+ StateValue::new_legacy(blob.into()),
+ );
+
+ Ok(())
+}
+
+/// Patches `aptos_framework::aptos_governance::resolve_multi_step_proposal` so that
+/// it returns the requested signer directly, skipping the governance process altogether.
+fn patch_aptos_governance(
+ state_view: &SimulationStateView,
+ deserializer_config: &DeserializerConfig,
+ forbid_next_execution_hash: bool,
+) -> Result<()> {
+ use Bytecode::*;
+
+ patch_module(
+ state_view,
+ deserializer_config,
+ &MODULE_ID_APTOS_GOVERNANCE,
+ |m| {
+ // Inject `native fun create_signer`.
+ let create_signer_handle_idx = add_simple_native_function(
+ m,
+ FUNC_NAME_CREATE_SIGNER.clone(),
+ vec![SignatureToken::Address],
+ vec![SignatureToken::Signer],
+ )?;
+
+ // Patch `fun resolve_multi_step_proposal`.
+ let sig_u8_idx = get_or_add_signature(m, vec![SignatureToken::U8]);
+
+ let func_def = find_function_def_by_name(m, &FUNC_NAME_RESOLVE_MULTI_STEP_PROPOSAL)
+ .ok_or_else(|| {
+ anyhow!(
+ "failed to locate `fun {}`",
+ &*FUNC_NAME_RESOLVE_MULTI_STEP_PROPOSAL
+ )
+ })?;
+ func_def.acquires_global_resources = vec![];
+ let code = func_def.code.as_mut().ok_or_else(|| {
+ anyhow!(
+ "`fun {}` must have a Move-defined body",
+ &*FUNC_NAME_RESOLVE_MULTI_STEP_PROPOSAL
+ )
+ })?;
+
+ code.code.clear();
+ if forbid_next_execution_hash {
+ // If it is needed to forbid a next execution hash, inject additional Move
+ // code at the beginning that aborts with a magic number if the vector
+ // representing the hash is not empty.
+ //
+ // if (!vector::is_empty(&next_execution_hash)) {
+ // abort MAGIC_FAILED_NEXT_EXECUTION_HASH_CHECK;
+ // }
+ //
+ // The magic number can later be checked in Rust to determine if such violation
+ // has happened.
+ code.code.extend([
+ ImmBorrowLoc(2),
+ VecLen(sig_u8_idx),
+ LdU64(0),
+ Eq,
+ BrTrue(7),
+ LdU64(MAGIC_FAILED_NEXT_EXECUTION_HASH_CHECK),
+ Abort,
+ ]);
+ }
+ // Replace the original logic with `create_signer(signer_address)`, bypassing
+ // the governance process.
+ code.code
+ .extend([MoveLoc(1), Call(create_signer_handle_idx), Ret]);
+
+ Ok(())
+ },
+ )
+}
+
+// Add the hash of the script to the list of approved hashes, so to enable the
+// alternative (higher) execution limits.
+fn add_script_execution_hash(
+ state_view: &SimulationStateView,
+ hash: HashValue,
+) -> Result<()> {
+ let entry = (DUMMY_PROPOSAL_ID, hash.to_vec());
+
+ state_view.modify_on_chain_config(|approved_hashes: &mut ApprovedExecutionHashes| {
+ if !approved_hashes.entries.contains(&entry) {
+ approved_hashes.entries.push(entry);
+ }
+ Ok(())
+ })
+}
+
+/***************************************************************************************************
+ * Simulation Workflow
+ *
+ **************************************************************************************************/
+fn force_end_epoch(state_view: &SimulationStateView) -> Result<()> {
+ flush_warm_vm_cache();
+ let vm = AptosVM::new_for_gov_sim(&state_view);
+ let resolver = state_view.as_move_resolver();
+
+ let gas_schedule =
+ GasScheduleV2::fetch_config(&state_view).context("failed to fetch gas schedule v2")?;
+ let gas_feature_version = gas_schedule.feature_version;
+
+ let change_set_configs =
+ ChangeSetConfigs::unlimited_at_gas_feature_version(gas_feature_version);
+
+ let traversal_storage = TraversalStorage::new();
+ let mut sess = vm.new_session(&resolver, SessionId::void(), None);
+ sess.execute_function_bypass_visibility(
+ &MODULE_ID_APTOS_GOVERNANCE,
+ IdentStr::new("force_end_epoch").unwrap(),
+ vec![],
+ vec![bcs::to_bytes(&AccountAddress::ONE)?],
+ &mut UnmeteredGasMeter,
+ &mut TraversalContext::new(&traversal_storage),
+ )?;
+ let (mut change_set, module_write_set) = sess.finish(&change_set_configs)?;
+ change_set.try_materialize_aggregator_v1_delta_set(&resolver)?;
+
+ let (write_set, _events) = change_set
+ .try_combine_into_storage_change_set(module_write_set)
+ .expect("Failed to convert to storage ChangeSet")
+ .into_inner();
+
+ state_view.apply_write_set(write_set);
+
+ Ok(())
+}
+
+pub async fn simulate_multistep_proposal(
+ remote_url: Url,
+ proposal_dir: &Path,
+ proposal_scripts: &[PathBuf],
+) -> Result<()> {
+ println!("Simulating proposal at {}", proposal_dir.display());
+
+ // Compile all scripts.
+ println!("Compiling scripts...");
+ let mut compiled_scripts = vec![];
+ for path in proposal_scripts {
+ let framework_package_args = FrameworkPackageArgs::try_parse_from([
+ "dummy_executable_name",
+ "--framework-local-dir",
+ &aptos_framework_path().to_string_lossy(),
+ "--skip-fetch-latest-git-deps",
+ ])
+ .context(
+ "failed to parse framework package args for compiling scripts, this should not happen",
+ )?;
+
+ let (blob, hash) = compile_in_temp_dir(
+ "script",
+ path,
+ &framework_package_args,
+ PromptOptions::yes(),
+ None, // bytecode_version
+ None, // language_version
+ None, // compiler_version
+ )
+ .with_context(|| format!("failed to compile script {}", path.display()))?;
+
+ compiled_scripts.push((blob, hash));
+ }
+
+ // Set up the simulation state view.
+ let client = Client::new(remote_url);
+ let debugger =
+ AptosDebugger::rest_client(client.clone()).context("failed to create AptosDebugger")?;
+ let state = client.get_ledger_information().await?.into_inner();
+
+ let state_view = SimulationStateView {
+ remote: &debugger.state_view_at_version(state.version),
+ states: Mutex::new(HashMap::new()),
+ };
+
+ // Create and fund a sender account that is used to send the governance scripts.
+ print!("Creating and funding sender account.. ");
+ std::io::stdout().flush()?;
+ let mut rng = aptos_keygen::KeyGen::from_seed([0; 32]);
+ let balance = 100 * 1_0000_0000; // 100 APT
+ let account = AccountData::new_from_seed(&mut rng, balance, 0);
+ state_view.apply_write_set(account.to_writeset());
+ // TODO: should update coin info (total supply)
+ println!("done");
+
+ // Execute the governance scripts in sorted order.
+ println!("Executing governance scripts...");
+
+ for (script_idx, (script_path, (script_blob, script_hash))) in
+ proposal_scripts.iter().zip(compiled_scripts).enumerate()
+ {
+ // Force-end the epoch so that buffered configuration changes get applied.
+ force_end_epoch(&state_view).context("failed to force end epoch")?;
+
+ // Fetch the on-chain configs that are needed for the simulation.
+ let chain_id =
+ ChainIdResource::fetch_config(&state_view).context("failed to fetch chain id")?;
+
+ let gas_schedule =
+ GasScheduleV2::fetch_config(&state_view).context("failed to fetch gas schedule v2")?;
+ let gas_feature_version = gas_schedule.feature_version;
+ let gas_params = AptosGasParameters::from_on_chain_gas_schedule(
+ &gas_schedule.into_btree_map(),
+ gas_feature_version,
+ )
+ .map_err(|err| {
+ anyhow!(
+ "failed to construct gas params at gas version {}: {}",
+ gas_feature_version,
+ err
+ )
+ })?;
+
+ // Patch framework functions to skip the governance process.
+ // This is redone every time we execute a script because the previous script could have
+ // overwritten the framework.
+ let features =
+ Features::fetch_config(&state_view).context("failed to fetch feature flags")?;
+ let deserializer_config = aptos_prod_deserializer_config(&features);
+
+ // If the script is the last step of the proposal, it MUST NOT have a next execution hash.
+ // Set the boolean flag to true to use a modified patch to catch this.
+ let forbid_next_execution_hash = script_idx == proposal_scripts.len() - 1;
+ patch_aptos_governance(
+ &state_view,
+ &deserializer_config,
+ forbid_next_execution_hash,
+ )
+ .context("failed to patch resolve_multistep_proposal")?;
+
+ // Add the hash of the script to the list of approved hashes, so that the
+ // alternative (usually higher) execution limits can be used.
+ add_script_execution_hash(&state_view, script_hash)
+ .context("failed to add script execution hash")?;
+
+ let script_name = script_path.file_name().unwrap().to_string_lossy();
+ println!(" {}", script_name);
+
+ // Create a new VM to ensure the loader is clean.
+ // The warm vm cache also needs to be explicitly flushed as it cannot detect the
+ // patches we performed.
+ flush_warm_vm_cache();
+ let vm = AptosVM::new_for_gov_sim(&state_view);
+ let log_context = AdapterLogSchema::new(state_view.id(), 0);
+ let resolver = state_view.as_move_resolver();
+ let (_vm_status, vm_output) = vm.execute_user_transaction(
+ &resolver,
+ &account
+ .account()
+ .transaction()
+ .script(Script::new(script_blob, vec![], vec![
+ TransactionArgument::U64(DUMMY_PROPOSAL_ID), // dummy proposal id, ignored by the patched function
+ ]))
+ .chain_id(chain_id.chain_id())
+ .sequence_number(script_idx as u64)
+ .gas_unit_price(gas_params.vm.txn.min_price_per_gas_unit.into())
+ .max_gas_amount(100000)
+ .ttl(u64::MAX)
+ .sign(),
+ &log_context,
+ );
+ // TODO: ensure all scripts trigger reconfiguration.
+
+ let txn_output = vm_output
+ .try_materialize_into_transaction_output(&resolver)
+ .context("failed to materialize transaction output")?;
+ let txn_status = txn_output.status();
+ match txn_status {
+ TransactionStatus::Keep(ExecutionStatus::Success) => {
+ println!(" Success")
+ },
+ TransactionStatus::Keep(ExecutionStatus::MoveAbort { code, .. })
+ if *code == MAGIC_FAILED_NEXT_EXECUTION_HASH_CHECK =>
+ {
+ bail!("the last script has a non-zero next execution hash")
+ },
+ _ => {
+ println!(
+ "{}",
+ format!("{:#?}", txn_status)
+ .lines()
+ .map(|line| format!(" {}", line))
+ .collect::>()
+ .join("\n")
+ );
+ bail!("failed to execute governance script: {}", script_name)
+ },
+ }
+
+ let (write_set, _events) = txn_output.into();
+ state_view.apply_write_set(write_set);
+ }
+
+ println!("All scripts succeeded!");
+
+ Ok(())
+}
+
+pub fn collect_proposals(root_dir: &Path) -> Result)>> {
+ let mut result = Vec::new();
+
+ for entry in WalkDir::new(root_dir) {
+ let entry = entry.unwrap();
+ if entry.path().is_dir() {
+ let sub_dir = entry.path();
+ let mut move_files = Vec::new();
+
+ for sub_entry in WalkDir::new(sub_dir).min_depth(1).max_depth(1) {
+ let sub_entry = sub_entry.unwrap();
+ if sub_entry.path().is_file()
+ && sub_entry.path().extension() == Some(std::ffi::OsStr::new("move"))
+ {
+ move_files.push(sub_entry.path().to_path_buf());
+ }
+ }
+
+ if !move_files.is_empty() {
+ move_files.sort();
+ result.push((sub_dir.to_path_buf(), move_files));
+ }
+ }
+ }
+
+ result.sort_by(|(path1, _), (path2, _)| path1.cmp(path2));
+
+ Ok(result)
+}
+
+pub async fn simulate_all_proposals(remote_url: Url, output_dir: &Path) -> Result<()> {
+ let proposals =
+ collect_proposals(output_dir).context("failed to collect proposals for simulation")?;
+
+ if proposals.is_empty() {
+ bail!("failed to simulate proposals: no proposals found")
+ }
+
+ println!(
+ "Found {} proposal{}",
+ proposals.len(),
+ if proposals.len() == 1 { "" } else { "s" }
+ );
+ for (proposal_dir, proposal_scripts) in &proposals {
+ println!(" {}", proposal_dir.display());
+
+ for script_path in proposal_scripts {
+ println!(
+ " {}",
+ script_path.file_name().unwrap().to_string_lossy()
+ );
+ }
+ }
+
+ for (proposal_dir, proposal_scripts) in &proposals {
+ simulate_multistep_proposal(remote_url.clone(), proposal_dir, proposal_scripts)
+ .await
+ .with_context(|| {
+ format!("failed to simulate proposal at {}", proposal_dir.display())
+ })?;
+ }
+
+ println!("All proposals succeeded!");
+
+ Ok(())
+}
diff --git a/aptos-move/aptos-release-builder/src/utils.rs b/aptos-move/aptos-release-builder/src/utils.rs
index 6265bce05ce90..a22e52d216239 100644
--- a/aptos-move/aptos-release-builder/src/utils.rs
+++ b/aptos-move/aptos-release-builder/src/utils.rs
@@ -1,6 +1,8 @@
// Copyright © Aptos Foundation
// SPDX-License-Identifier: Apache-2.0
+use aptos_crypto::HashValue;
+use aptos_framework::generate_next_execution_hash_blob;
use move_core_types::account_address::AccountAddress;
use move_model::{code_writer::CodeWriter, emit, emitln};
@@ -44,7 +46,7 @@ pub(crate) fn generate_governance_proposal_header(
writer: &CodeWriter,
deps_names: &[&str],
is_multi_step: bool,
- next_execution_hash: Vec,
+ next_execution_hash: Option,
) {
emitln!(writer, "script {");
writer.indent();
@@ -53,15 +55,12 @@ pub(crate) fn generate_governance_proposal_header(
for deps_name in deps_names {
emitln!(writer, "use {};", deps_name);
}
- if next_execution_hash == "vector::empty()".as_bytes() {
- emitln!(writer, "use std::vector;");
- }
emitln!(writer);
emitln!(writer, "fun main(proposal_id: u64) {");
writer.indent();
- if is_multi_step && !next_execution_hash.is_empty() {
+ if is_multi_step {
generate_next_execution_hash_blob(writer, AccountAddress::ONE, next_execution_hash);
} else {
emitln!(
@@ -106,27 +105,26 @@ pub(crate) fn finish_with_footer(writer: &CodeWriter) -> String {
pub(crate) fn generate_governance_proposal(
writer: &CodeWriter,
is_testnet: bool,
- next_execution_hash: Vec,
+ next_execution_hash: Option,
+ is_multi_step: bool,
deps_names: &[&str],
body: F,
) -> String
where
F: FnOnce(&CodeWriter),
{
- if next_execution_hash.is_empty() {
- if is_testnet {
- generate_testnet_header(writer, deps_names);
- } else {
- generate_governance_proposal_header(
- writer,
- deps_names,
- false,
- "".to_owned().into_bytes(),
- );
- }
- } else {
+ assert!(
+ is_multi_step || next_execution_hash.is_none(),
+ "only multi-step proposals can have a next execution hash"
+ );
+
+ if is_multi_step {
generate_governance_proposal_header(writer, deps_names, true, next_execution_hash);
- };
+ } else if is_testnet {
+ generate_testnet_header(writer, deps_names);
+ } else {
+ generate_governance_proposal_header(writer, deps_names, false, None);
+ }
body(writer);
finish_with_footer(writer)
diff --git a/aptos-move/aptos-resource-viewer/src/lib.rs b/aptos-move/aptos-resource-viewer/src/lib.rs
index a5d2cc4bc5582..d3b1cc6824192 100644
--- a/aptos-move/aptos-resource-viewer/src/lib.rs
+++ b/aptos-move/aptos-resource-viewer/src/lib.rs
@@ -15,6 +15,7 @@ use move_binary_format::CompiledModule;
use move_core_types::{
identifier::{IdentStr, Identifier},
language_storage::{ModuleId, StructTag, TypeTag},
+ transaction_argument::TransactionArgument,
value::{MoveTypeLayout, MoveValue},
};
use move_resource_viewer::MoveValueAnnotator;
@@ -65,7 +66,7 @@ impl<'a, S: StateView> AptosValueAnnotator<'a, S> {
&self,
tag: &StructTag,
blob: &[u8],
- ) -> anyhow::Result> {
+ ) -> anyhow::Result<(Option, Vec<(Identifier, MoveValue)>)> {
self.0.move_struct_fields(tag, blob)
}
@@ -80,6 +81,15 @@ impl<'a, S: StateView> AptosValueAnnotator<'a, S> {
.view_function_arguments(module, function, ty_args, args)
}
+ pub fn view_script_arguments(
+ &self,
+ script_bytes: &[u8],
+ args: &[TransactionArgument],
+ ty_args: &[TypeTag],
+ ) -> anyhow::Result> {
+ self.0.view_script_arguments(script_bytes, args, ty_args)
+ }
+
pub fn view_fully_decorated_ty_layout(
&self,
type_tag: &TypeTag,
diff --git a/aptos-move/aptos-transaction-benchmarks/Cargo.toml b/aptos-move/aptos-transaction-benchmarks/Cargo.toml
index 4bb90c07a41ae..3fe147d12d47a 100644
--- a/aptos-move/aptos-transaction-benchmarks/Cargo.toml
+++ b/aptos-move/aptos-transaction-benchmarks/Cargo.toml
@@ -29,9 +29,7 @@ clap = { workspace = true }
criterion = { workspace = true, features = ["html_reports"] }
criterion-cpu-time = { workspace = true }
num_cpus = { workspace = true }
-once_cell = { workspace = true }
proptest = { workspace = true }
-rayon = { workspace = true }
[[bench]]
name = "transaction_benches"
diff --git a/aptos-move/aptos-transaction-benchmarks/src/transaction_bench_state.rs b/aptos-move/aptos-transaction-benchmarks/src/transaction_bench_state.rs
index 5e728586e547b..d3a71a1d22862 100644
--- a/aptos-move/aptos-transaction-benchmarks/src/transaction_bench_state.rs
+++ b/aptos-move/aptos-transaction-benchmarks/src/transaction_bench_state.rs
@@ -1,7 +1,7 @@
// Copyright © Aptos Foundation
// SPDX-License-Identifier: Apache-2.0
-use crate::{transactions, transactions::RAYON_EXEC_POOL};
+use crate::transactions;
use aptos_bitvec::BitVec;
use aptos_block_executor::txn_commit_hook::NoOpTransactionCommitHook;
use aptos_block_partitioner::{
@@ -216,7 +216,6 @@ where
_,
NoOpTransactionCommitHook,
>(
- Arc::clone(&RAYON_EXEC_POOL),
transactions,
self.state_view.as_ref(),
BlockExecutorConfig::new_maybe_block_limit(1, maybe_block_gas_limit),
@@ -265,7 +264,6 @@ where
_,
NoOpTransactionCommitHook,
>(
- Arc::clone(&RAYON_EXEC_POOL),
transactions,
self.state_view.as_ref(),
BlockExecutorConfig::new_maybe_block_limit(
diff --git a/aptos-move/aptos-transaction-benchmarks/src/transactions.rs b/aptos-move/aptos-transaction-benchmarks/src/transactions.rs
index 645bbe5475afa..d8f96d9d099a5 100644
--- a/aptos-move/aptos-transaction-benchmarks/src/transactions.rs
+++ b/aptos-move/aptos-transaction-benchmarks/src/transactions.rs
@@ -13,19 +13,8 @@ use aptos_language_e2e_tests::{
gas_costs::TXN_RESERVED,
};
use criterion::{measurement::Measurement, BatchSize, Bencher};
-use once_cell::sync::Lazy;
use proptest::strategy::Strategy;
-use std::{net::SocketAddr, sync::Arc};
-
-pub static RAYON_EXEC_POOL: Lazy> = Lazy::new(|| {
- Arc::new(
- rayon::ThreadPoolBuilder::new()
- .num_threads(num_cpus::get())
- .thread_name(|index| format!("par_exec_{}", index))
- .build()
- .unwrap(),
- )
-});
+use std::net::SocketAddr;
/// Benchmarking support for transactions.
#[derive(Clone)]
diff --git a/aptos-move/aptos-transactional-test-harness/src/aptos_test_harness.rs b/aptos-move/aptos-transactional-test-harness/src/aptos_test_harness.rs
index 70f66aa5fd4b4..fbd4baa017f34 100644
--- a/aptos-move/aptos-transactional-test-harness/src/aptos_test_harness.rs
+++ b/aptos-move/aptos-transactional-test-harness/src/aptos_test_harness.rs
@@ -26,6 +26,7 @@ use aptos_types::{
Script as TransactionScript, Transaction, TransactionOutput, TransactionStatus,
},
vm::configs::set_paranoid_type_checks,
+ AptosCoinType,
};
use aptos_vm::{AptosVM, VMExecutor};
use aptos_vm_genesis::GENESIS_KEYPAIR;
@@ -433,7 +434,7 @@ impl<'a> AptosTestAdapter<'a> {
/// Obtain the AptosCoin amount under address `signer_addr`
fn fetch_account_balance(&self, signer_addr: &AccountAddress) -> Result {
- let aptos_coin_tag = CoinStoreResource::struct_tag();
+ let aptos_coin_tag = CoinStoreResource::::struct_tag();
let balance_blob = self
.storage
diff --git a/aptos-move/aptos-transactional-test-harness/tests/aptos_test_harness/default_int_size.v2_exp b/aptos-move/aptos-transactional-test-harness/tests/aptos_test_harness/default_int_size.v2_exp
index d95c09e388b2a..05e61d5e21757 100644
--- a/aptos-move/aptos-transactional-test-harness/tests/aptos_test_harness/default_int_size.v2_exp
+++ b/aptos-move/aptos-transactional-test-harness/tests/aptos_test_harness/default_int_size.v2_exp
@@ -1,4 +1,4 @@
processed 2 tasks
task 1 'run'. lines 4-21:
-Error: Failed to execute transaction. ExecutionStatus: ExecutionFailure { location: Script, function: 0, code_offset: 12 }
+Error: Failed to execute transaction. ExecutionStatus: ExecutionFailure { location: Script, function: 0, code_offset: 10 }
diff --git a/aptos-move/aptos-transactional-test-harness/tests/aptos_test_harness/diamond_clicker.v2_exp b/aptos-move/aptos-transactional-test-harness/tests/aptos_test_harness/diamond_clicker.v2_exp
index 7905e218669b6..e454cf5a17b59 100644
--- a/aptos-move/aptos-transactional-test-harness/tests/aptos_test_harness/diamond_clicker.v2_exp
+++ b/aptos-move/aptos-transactional-test-harness/tests/aptos_test_harness/diamond_clicker.v2_exp
@@ -15,61 +15,53 @@ struct OuterStruct has key {
}
entry public test_upgrade(Arg0: &signer) /* def_idx: 0 */ {
-L1: loc0: &signer
-L2: loc1: OuterStruct
-L3: loc2: &mut vector
+L1: loc0: OuterStruct
+L2: loc1: &mut vector
+L3: loc2: u64
L4: loc3: u64
L5: loc4: u64
-L6: loc5: &mut vector
-L7: loc6: u64
B0:
0: CopyLoc[0](Arg0: &signer)
- 1: StLoc[1](loc0: &signer)
- 2: MoveLoc[1](loc0: &signer)
- 3: Call signer::address_of(&signer): address
- 4: VecPack(3, 0)
- 5: Pack[1](OuterStruct)
- 6: StLoc[2](loc1: OuterStruct)
- 7: MoveLoc[0](Arg0: &signer)
- 8: MoveLoc[2](loc1: OuterStruct)
- 9: MoveTo[1](OuterStruct)
- 10: MutBorrowGlobal[1](OuterStruct)
- 11: MutBorrowField[0](OuterStruct.any_field: vector)
- 12: StLoc[3](loc2: &mut vector)
- 13: LdU64(0)
- 14: CopyLoc[3](loc2: &mut vector)
- 15: FreezeRef
- 16: VecLen(3)
- 17: StLoc[4](loc3: u64)
- 18: StLoc[5](loc4: u64)
+ 1: Call signer::address_of(&signer): address
+ 2: VecPack(3, 0)
+ 3: Pack[1](OuterStruct)
+ 4: StLoc[1](loc0: OuterStruct)
+ 5: MoveLoc[0](Arg0: &signer)
+ 6: MoveLoc[1](loc0: OuterStruct)
+ 7: MoveTo[1](OuterStruct)
+ 8: MutBorrowGlobal[1](OuterStruct)
+ 9: MutBorrowField[0](OuterStruct.any_field: vector)
+ 10: StLoc[2](loc1: &mut vector)
+ 11: LdU64(0)
+ 12: CopyLoc[2](loc1: &mut vector)
+ 13: FreezeRef
+ 14: VecLen(3)
+ 15: StLoc[3](loc2: u64)
+ 16: StLoc[4](loc3: u64)
B1:
- 19: CopyLoc[5](loc4: u64)
- 20: CopyLoc[4](loc3: u64)
- 21: Lt
- 22: BrFalse(37)
+ 17: CopyLoc[4](loc3: u64)
+ 18: CopyLoc[3](loc2: u64)
+ 19: Lt
+ 20: BrFalse(31)
B2:
- 23: CopyLoc[3](loc2: &mut vector)
- 24: StLoc[6](loc5: &mut vector)
- 25: MoveLoc[6](loc5: &mut vector)
- 26: CopyLoc[5](loc4: u64)
- 27: VecMutBorrow(3)
- 28: FreezeRef
- 29: Call debug::print(&InnerStruct)
- 30: LdU64(1)
- 31: StLoc[7](loc6: u64)
- 32: MoveLoc[5](loc4: u64)
- 33: MoveLoc[7](loc6: u64)
- 34: Add
- 35: StLoc[5](loc4: u64)
- 36: Branch(40)
+ 21: CopyLoc[2](loc1: &mut vector)
+ 22: CopyLoc[4](loc3: u64)
+ 23: VecMutBorrow(3)
+ 24: FreezeRef
+ 25: Call debug::print(&InnerStruct)
+ 26: MoveLoc[4](loc3: u64)
+ 27: LdU64(1)
+ 28: Add
+ 29: StLoc[4](loc3: u64)
+ 30: Branch(34)
B3:
- 37: MoveLoc[3](loc2: &mut vector)
- 38: Pop
- 39: Branch(41)
+ 31: MoveLoc[2](loc1: &mut vector)
+ 32: Pop
+ 33: Branch(35)
B4:
- 40: Branch(19)
+ 34: Branch(17)
B5:
- 41: Ret
+ 35: Ret
}
}
diff --git a/aptos-move/aptos-transactional-test-harness/tests/aptos_test_harness/table.v2_exp b/aptos-move/aptos-transactional-test-harness/tests/aptos_test_harness/table.v2_exp
index fa85289717c25..b0352e4c59288 100644
--- a/aptos-move/aptos-transactional-test-harness/tests/aptos_test_harness/table.v2_exp
+++ b/aptos-move/aptos-transactional-test-harness/tests/aptos_test_harness/table.v2_exp
@@ -52,7 +52,7 @@ Events:
}
{
type: 0x1::transaction_fee::FeeStatement
- data: "9d0000000000000007000000000000000400000000000000c83a0200000000000000000000000000"
+ data: "9c0000000000000007000000000000000400000000000000c83a0200000000000000000000000000"
}mutable inputs after call: local#0: 0
return values: 0
diff --git a/aptos-move/aptos-transactional-test-harness/tests/v2-tests/default_int_size.exp b/aptos-move/aptos-transactional-test-harness/tests/v2-tests/default_int_size.exp
index d95c09e388b2a..05e61d5e21757 100644
--- a/aptos-move/aptos-transactional-test-harness/tests/v2-tests/default_int_size.exp
+++ b/aptos-move/aptos-transactional-test-harness/tests/v2-tests/default_int_size.exp
@@ -1,4 +1,4 @@
processed 2 tasks
task 1 'run'. lines 4-21:
-Error: Failed to execute transaction. ExecutionStatus: ExecutionFailure { location: Script, function: 0, code_offset: 12 }
+Error: Failed to execute transaction. ExecutionStatus: ExecutionFailure { location: Script, function: 0, code_offset: 10 }
diff --git a/aptos-move/aptos-validator-interface/src/lib.rs b/aptos-move/aptos-validator-interface/src/lib.rs
index 24e6945fd5963..9414fb2298476 100644
--- a/aptos-move/aptos-validator-interface/src/lib.rs
+++ b/aptos-move/aptos-validator-interface/src/lib.rs
@@ -12,7 +12,7 @@ use aptos_types::{
account_address::AccountAddress,
state_store::{
state_key::StateKey, state_storage_usage::StateStorageUsage, state_value::StateValue,
- Result as StateViewResult, TStateView,
+ Result as StateViewResult, StateViewId, TStateView,
},
transaction::{Transaction, TransactionInfo, Version},
};
@@ -160,6 +160,10 @@ impl DebuggerStateView {
impl TStateView for DebuggerStateView {
type Key = StateKey;
+ fn id(&self) -> StateViewId {
+ StateViewId::Replay
+ }
+
fn get_state_value(&self, state_key: &StateKey) -> StateViewResult> {
self.get_state_value_internal(state_key, self.version)
.map_err(Into::into)
diff --git a/aptos-move/aptos-validator-interface/src/storage_interface.rs b/aptos-move/aptos-validator-interface/src/storage_interface.rs
index 3abf628eeff5a..1553b9cd06b8e 100644
--- a/aptos-move/aptos-validator-interface/src/storage_interface.rs
+++ b/aptos-move/aptos-validator-interface/src/storage_interface.rs
@@ -32,6 +32,7 @@ impl DBDebuggerInterface {
false, /* indexer */
BUFFERED_STATE_TARGET_ITEMS,
DEFAULT_MAX_NUM_NODES_PER_LRU_CACHE_SHARD,
+ None,
)
.map_err(anyhow::Error::from)?,
)))
diff --git a/aptos-move/aptos-vm-benchmarks/Cargo.toml b/aptos-move/aptos-vm-benchmarks/Cargo.toml
index 2095c5a78aff1..d0718bfbad14d 100644
--- a/aptos-move/aptos-vm-benchmarks/Cargo.toml
+++ b/aptos-move/aptos-vm-benchmarks/Cargo.toml
@@ -2,7 +2,7 @@
name = "aptos-vm-benchmarks"
version = "0.1.0"
edition = "2021"
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+license = { workspace = true }
[dependencies]
aptos-cached-packages = { workspace = true }
diff --git a/aptos-move/aptos-vm-logging/src/log_schema.rs b/aptos-move/aptos-vm-logging/src/log_schema.rs
index 383dda848a4ec..494ad5dce1175 100644
--- a/aptos-move/aptos-vm-logging/src/log_schema.rs
+++ b/aptos-move/aptos-vm-logging/src/log_schema.rs
@@ -52,6 +52,13 @@ impl AdapterLogSchema {
base_version: Some(base_version),
txn_idx,
},
+ StateViewId::Replay => Self {
+ name: LogEntry::Execution,
+ block_id: None,
+ first_version: None,
+ base_version: None,
+ txn_idx,
+ },
StateViewId::Miscellaneous => Self {
name: LogEntry::Miscellaneous,
block_id: None,
diff --git a/aptos-move/aptos-vm-types/src/change_set.rs b/aptos-move/aptos-vm-types/src/change_set.rs
index f44a15b584d98..3c2ca78492403 100644
--- a/aptos-move/aptos-vm-types/src/change_set.rs
+++ b/aptos-move/aptos-vm-types/src/change_set.rs
@@ -6,7 +6,7 @@ use crate::{
AbstractResourceWriteOp, GroupWrite, InPlaceDelayedFieldChangeOp,
ResourceGroupInPlaceDelayedFieldChangeOp, WriteWithDelayedFieldsOp,
},
- check_change_set::CheckChangeSet,
+ module_write_set::ModuleWriteSet,
resolver::ExecutorView,
};
use aptos_aggregator::{
@@ -80,7 +80,6 @@ pub fn randomly_check_layout_matches(
#[derive(Debug, Clone, Eq, PartialEq)]
pub struct VMChangeSet {
resource_write_set: BTreeMap,
- module_write_set: BTreeMap,
events: Vec<(ContractEvent, Option)>,
// Changes separated out from the writes, for better concurrency,
@@ -110,7 +109,6 @@ impl VMChangeSet {
pub fn empty() -> Self {
Self {
resource_write_set: BTreeMap::new(),
- module_write_set: BTreeMap::new(),
events: vec![],
delayed_field_change_set: BTreeMap::new(),
aggregator_v1_write_set: BTreeMap::new(),
@@ -120,32 +118,24 @@ impl VMChangeSet {
pub fn new(
resource_write_set: BTreeMap,
- module_write_set: BTreeMap,
events: Vec<(ContractEvent, Option)>,
delayed_field_change_set: BTreeMap>,
aggregator_v1_write_set: BTreeMap,
aggregator_v1_delta_set: BTreeMap,
- checker: &dyn CheckChangeSet,
- ) -> PartialVMResult {
- let change_set = Self {
+ ) -> Self {
+ Self {
resource_write_set,
- module_write_set,
events,
delayed_field_change_set,
aggregator_v1_write_set,
aggregator_v1_delta_set,
- };
- // Returns an error if structure of the change set is not valid,
- // e.g. the size in bytes is too large.
- checker.check_change_set(&change_set)?;
- Ok(change_set)
+ }
}
// TODO[agg_v2](cleanup) see if we can remove in favor of `new`.
pub fn new_expanded(
resource_write_set: BTreeMap>)>,
resource_group_write_set: BTreeMap,
- module_write_set: BTreeMap,
aggregator_v1_write_set: BTreeMap,
aggregator_v1_delta_set: BTreeMap,
delayed_field_change_set: BTreeMap>,
@@ -155,9 +145,8 @@ impl VMChangeSet {
>,
group_reads_needing_delayed_field_exchange: BTreeMap,
events: Vec<(ContractEvent, Option)>,
- checker: &dyn CheckChangeSet,
) -> PartialVMResult {
- Self::new(
+ Ok(Self::new(
resource_write_set
.into_iter()
.map::, _>(|(k, (w, l))| {
@@ -214,74 +203,22 @@ impl VMChangeSet {
}
},
)?,
- module_write_set,
events,
delayed_field_change_set,
aggregator_v1_write_set,
aggregator_v1_delta_set,
- checker,
- )
- }
-
- /// Builds a new change set from the storage representation.
- ///
- /// **WARNING**: this creates a write set that assumes dynamic change set optimizations to be disabled.
- /// this needs to be applied directly to storage, you cannot get appropriate reads from this in a
- /// dynamic change set optimization enabled context.
- /// We have two dynamic change set optimizations, both there to reduce conflicts between transactions:
- /// - exchanging delayed fields and leaving their materialization to happen at the end
- /// - unpacking resource groups and treating each resource inside it separately
- ///
- /// **WARNING**: Has complexity O(#write_ops) because we need to iterate
- /// over blobs and split them into resources or modules. Only used to
- /// support transactions with write-set payload.
- ///
- /// Note: does not separate out individual resource group updates.
- pub fn try_from_storage_change_set_with_delayed_field_optimization_disabled(
- change_set: StorageChangeSet,
- checker: &dyn CheckChangeSet,
- ) -> VMResult {
- let (write_set, events) = change_set.into_inner();
-
- // There should be no aggregator writes if we have a change set from
- // storage.
- let mut resource_write_set = BTreeMap::new();
- let mut module_write_set = BTreeMap::new();
-
- for (state_key, write_op) in write_set {
- if matches!(state_key.inner(), StateKeyInner::AccessPath(ap) if ap.is_code()) {
- module_write_set.insert(state_key, write_op);
- } else {
- // TODO[agg_v1](fix) While everything else must be a resource, first
- // version of aggregators is implemented as a table item. Revisit when
- // we split MVHashMap into data and aggregators.
-
- // We can set layout to None, as we are not in the is_delayed_field_optimization_capable context
- resource_write_set.insert(state_key, AbstractResourceWriteOp::Write(write_op));
- }
- }
-
- // We can set layout to None, as we are not in the is_delayed_field_optimization_capable context
- let events = events.into_iter().map(|event| (event, None)).collect();
- let change_set = Self {
- resource_write_set,
- module_write_set,
- delayed_field_change_set: BTreeMap::new(),
- aggregator_v1_write_set: BTreeMap::new(),
- aggregator_v1_delta_set: BTreeMap::new(),
- events,
- };
- checker
- .check_change_set(&change_set)
- .map_err(|e| e.finish(Location::Undefined))?;
- Ok(change_set)
+ ))
}
/// Converts VM-native change set into its storage representation with fully
/// serialized changes. The conversion fails if:
/// - deltas are not materialized.
/// - resource group writes are not (combined &) converted to resource writes.
- pub fn try_into_storage_change_set(self) -> Result {
+ /// In addition, the caller can include changes to published modules.
+ pub fn try_combine_into_storage_change_set(
+ self,
+ module_write_set: ModuleWriteSet,
+ ) -> Result {
// Converting VMChangeSet into TransactionOutput (i.e. storage change set), can
// be done here only if dynamic_change_set_optimizations have not been used/produced
// data into the output.
@@ -290,7 +227,6 @@ impl VMChangeSet {
// that knows how to deal with it.
let Self {
resource_write_set,
- module_write_set,
aggregator_v1_write_set,
aggregator_v1_delta_set,
delayed_field_change_set,
@@ -324,7 +260,7 @@ impl VMChangeSet {
})
.collect::, _>>()?,
);
- write_set_mut.extend(module_write_set);
+ write_set_mut.extend(module_write_set.into_write_ops());
write_set_mut.extend(aggregator_v1_write_set);
let events = events.into_iter().map(|(e, _)| e).collect();
@@ -339,75 +275,16 @@ impl VMChangeSet {
.iter()
.map(|(k, v)| (k, v.try_as_concrete_write()))
.chain(
- self.module_write_set()
+ self.aggregator_v1_write_set()
.iter()
- .chain(self.aggregator_v1_write_set().iter())
.map(|(k, v)| (k, Some(v))),
)
}
- pub fn write_set_size_iter(&self) -> impl Iterator- {
- self.resource_write_set()
- .iter()
- .map(|(k, v)| (k, v.materialized_size()))
- .chain(
- self.module_write_set()
- .iter()
- .chain(self.aggregator_v1_write_set().iter())
- .map(|(k, v)| (k, v.write_op_size())),
- )
- }
-
- pub fn num_write_ops(&self) -> usize {
- self.resource_write_set().len()
- + self.module_write_set().len()
- + self.aggregator_v1_write_set().len()
- }
-
- /// Deposit amount is inserted into metadata at a different time than the WriteOp is created.
- /// So this method is needed to be able to update metadata generically across different variants.
- pub fn write_op_info_iter_mut<'a>(
- &'a mut self,
- executor_view: &'a dyn ExecutorView,
- ) -> impl Iterator
- > {
- let resources = self.resource_write_set.iter_mut().map(|(key, op)| {
- Ok(WriteOpInfo {
- key,
- op_size: op.materialized_size(),
- prev_size: op.prev_materialized_size(key, executor_view)?,
- metadata_mut: op.get_metadata_mut(),
- })
- });
- let modules = self.module_write_set.iter_mut().map(|(key, op)| {
- Ok(WriteOpInfo {
- key,
- op_size: op.write_op_size(),
- prev_size: executor_view.get_module_state_value_size(key)?.unwrap_or(0),
- metadata_mut: op.get_metadata_mut(),
- })
- });
- let v1_aggregators = self.aggregator_v1_write_set.iter_mut().map(|(key, op)| {
- Ok(WriteOpInfo {
- key,
- op_size: op.write_op_size(),
- prev_size: executor_view
- .get_aggregator_v1_state_value_size(key)?
- .unwrap_or(0),
- metadata_mut: op.get_metadata_mut(),
- })
- });
-
- resources.chain(modules).chain(v1_aggregators)
- }
-
pub fn resource_write_set(&self) -> &BTreeMap {
&self.resource_write_set
}
- pub fn module_write_set(&self) -> &BTreeMap {
- &self.module_write_set
- }
-
// Called by `into_transaction_output_with_materialized_writes` only.
pub(crate) fn extend_aggregator_v1_write_set(
&mut self,
@@ -644,23 +521,6 @@ impl VMChangeSet {
Ok(())
}
- fn squash_additional_module_writes(
- write_set: &mut BTreeMap,
- additional_write_set: BTreeMap,
- ) -> PartialVMResult<()> {
- for (key, additional_write_op) in additional_write_set.into_iter() {
- match write_set.entry(key) {
- Occupied(mut entry) => {
- squash_writes_pair!(entry, additional_write_op);
- },
- Vacant(entry) => {
- entry.insert(additional_write_op);
- },
- }
- }
- Ok(())
- }
-
fn squash_additional_resource_write_ops<
K: Hash + Eq + PartialEq + Ord + Clone + std::fmt::Debug,
>(
@@ -881,11 +741,9 @@ impl VMChangeSet {
pub fn squash_additional_change_set(
&mut self,
additional_change_set: Self,
- checker: &dyn CheckChangeSet,
) -> PartialVMResult<()> {
let Self {
resource_write_set: additional_resource_write_set,
- module_write_set: additional_module_write_set,
aggregator_v1_write_set: additional_aggregator_write_set,
aggregator_v1_delta_set: additional_aggregator_delta_set,
delayed_field_change_set: additional_delayed_field_change_set,
@@ -902,17 +760,12 @@ impl VMChangeSet {
&mut self.resource_write_set,
additional_resource_write_set,
)?;
- Self::squash_additional_module_writes(
- &mut self.module_write_set,
- additional_module_write_set,
- )?;
Self::squash_additional_delayed_field_changes(
&mut self.delayed_field_change_set,
additional_delayed_field_change_set,
)?;
self.events.extend(additional_events);
-
- checker.check_change_set(self)
+ Ok(())
}
pub fn has_creation(&self) -> bool {
@@ -921,6 +774,59 @@ impl VMChangeSet {
}
}
+/// Builds a new change set from the storage representation.
+///
+/// **WARNING**: this creates a write set that assumes dynamic change set optimizations to be disabled.
+/// this needs to be applied directly to storage, you cannot get appropriate reads from this in a
+/// dynamic change set optimization enabled context.
+/// We have two dynamic change set optimizations, both there to reduce conflicts between transactions:
+/// - exchanging delayed fields and leaving their materialization to happen at the end
+/// - unpacking resource groups and treating each resource inside it separately
+///
+/// **WARNING**: Has complexity O(#write_ops) because we need to iterate
+/// over blobs and split them into resources or modules. Only used to
+/// support transactions with write-set payload.
+///
+/// Note: does not separate out individual resource group updates.
+pub fn create_vm_change_set_with_module_write_set_when_delayed_field_optimization_disabled(
+ change_set: StorageChangeSet,
+) -> (VMChangeSet, ModuleWriteSet) {
+ let (write_set, events) = change_set.into_inner();
+
+ // There should be no aggregator writes if we have a change set from
+ // storage.
+ let mut resource_write_set = BTreeMap::new();
+ let mut module_write_ops = BTreeMap::new();
+
+ for (state_key, write_op) in write_set {
+ if matches!(state_key.inner(), StateKeyInner::AccessPath(ap) if ap.is_code()) {
+ module_write_ops.insert(state_key, write_op);
+ } else {
+ // TODO[agg_v1](fix) While everything else must be a resource, first
+ // version of aggregators is implemented as a table item. Revisit when
+ // we split MVHashMap into data and aggregators.
+
+ // We can set layout to None, as we are not in the is_delayed_field_optimization_capable context
+ resource_write_set.insert(state_key, AbstractResourceWriteOp::Write(write_op));
+ }
+ }
+
+ // We can set layout to None, as we are not in the is_delayed_field_optimization_capable context
+ let events = events.into_iter().map(|event| (event, None)).collect();
+ let change_set = VMChangeSet::new(
+ resource_write_set,
+ events,
+ BTreeMap::new(),
+ BTreeMap::new(),
+ BTreeMap::new(),
+ );
+
+ // The flag if modules have been published to a special address is irrelevant because
+ // write set transaction does not run an epilogue. Therefore, it is simply set to true.
+ let module_write_set = ModuleWriteSet::new(true, module_write_ops);
+ (change_set, module_write_set)
+}
+
pub struct WriteOpInfo<'a> {
pub key: &'a StateKey,
pub op_size: WriteOpSize,
@@ -928,4 +834,70 @@ pub struct WriteOpInfo<'a> {
pub metadata_mut: &'a mut StateValueMetadata,
}
+/// Represents the main functionality of any change set representation:
+/// 1. It must contain write ops, and allow iterating over their sizes,
+/// as well as other information.
+/// 2. it must also contain events.
+pub trait ChangeSetInterface {
+ fn num_write_ops(&self) -> usize;
+
+ fn write_set_size_iter(&self) -> impl Iterator
- ;
+
+ fn events_iter(&self) -> impl Iterator
- ;
+
+ fn write_op_info_iter_mut<'a>(
+ &'a mut self,
+ executor_view: &'a dyn ExecutorView,
+ ) -> impl Iterator
- >;
+}
+
+impl ChangeSetInterface for VMChangeSet {
+ fn num_write_ops(&self) -> usize {
+ // Note: we only use resources and aggregators because they use write ops directly,
+ // and deltas & events are not part of these.
+ self.resource_write_set().len() + self.aggregator_v1_write_set().len()
+ }
+
+ fn write_set_size_iter(&self) -> impl Iterator
- {
+ self.resource_write_set()
+ .iter()
+ .map(|(k, v)| (k, v.materialized_size()))
+ .chain(
+ self.aggregator_v1_write_set()
+ .iter()
+ .map(|(k, v)| (k, v.write_op_size())),
+ )
+ }
+
+ fn write_op_info_iter_mut<'a>(
+ &'a mut self,
+ executor_view: &'a dyn ExecutorView,
+ ) -> impl Iterator
- > {
+ let resources = self.resource_write_set.iter_mut().map(|(key, op)| {
+ Ok(WriteOpInfo {
+ key,
+ op_size: op.materialized_size(),
+ prev_size: op.prev_materialized_size(key, executor_view)?,
+ metadata_mut: op.get_metadata_mut(),
+ })
+ });
+ let v1_aggregators = self.aggregator_v1_write_set.iter_mut().map(|(key, op)| {
+ Ok(WriteOpInfo {
+ key,
+ op_size: op.write_op_size(),
+ prev_size: executor_view
+ .get_aggregator_v1_state_value_size(key)?
+ .unwrap_or(0),
+ metadata_mut: op.get_metadata_mut(),
+ })
+ });
+
+ resources.chain(v1_aggregators)
+ }
+
+ fn events_iter(&self) -> impl Iterator
- {
+ self.events().iter().map(|(e, _)| e)
+ }
+}
+
// Tests are in test_change_set.rs.
diff --git a/aptos-move/aptos-vm-types/src/check_change_set.rs b/aptos-move/aptos-vm-types/src/check_change_set.rs
deleted file mode 100644
index 1835bd82580a1..0000000000000
--- a/aptos-move/aptos-vm-types/src/check_change_set.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::change_set::VMChangeSet;
-use move_binary_format::errors::PartialVMResult;
-
-/// Trait to check the contents of a change set, e.g. the total number of
-/// bytes per write op or event.
-pub trait CheckChangeSet {
- fn check_change_set(&self, change_set: &VMChangeSet) -> PartialVMResult<()>;
-}
diff --git a/aptos-move/aptos-vm-types/src/environment.rs b/aptos-move/aptos-vm-types/src/environment.rs
index 1438884087e18..f4ca3ff253fa2 100644
--- a/aptos-move/aptos-vm-types/src/environment.rs
+++ b/aptos-move/aptos-vm-types/src/environment.rs
@@ -17,28 +17,23 @@ use std::sync::Arc;
// TODO(George): move configs here from types crate.
pub fn aptos_prod_ty_builder(
- features: &Features,
gas_feature_version: u64,
gas_params: &AptosGasParameters,
) -> TypeBuilder {
- if features.is_limit_type_size_enabled() && gas_feature_version >= RELEASE_V1_15 {
+ if gas_feature_version >= RELEASE_V1_15 {
let max_ty_size = gas_params.vm.txn.max_ty_size;
let max_ty_depth = gas_params.vm.txn.max_ty_depth;
TypeBuilder::with_limits(max_ty_size.into(), max_ty_depth.into())
} else {
- aptos_default_ty_builder(features)
+ aptos_default_ty_builder()
}
}
-pub fn aptos_default_ty_builder(features: &Features) -> TypeBuilder {
- if features.is_limit_type_size_enabled() {
- // Type builder to use when:
- // 1. Type size gas parameters are not yet in gas schedule (before V14).
- // 2. No gas parameters are found on-chain.
- TypeBuilder::with_limits(128, 20)
- } else {
- TypeBuilder::Legacy
- }
+pub fn aptos_default_ty_builder() -> TypeBuilder {
+ // Type builder to use when:
+ // 1. Type size gas parameters are not yet in gas schedule (before 1.15).
+ // 2. No gas parameters are found on-chain.
+ TypeBuilder::with_limits(128, 20)
}
/// A runtime environment which can be used for VM initialization and more.
@@ -68,7 +63,7 @@ impl Environment {
}
let timed_features = timed_features_builder.build();
- let ty_builder = aptos_default_ty_builder(&features);
+ let ty_builder = aptos_default_ty_builder();
Self::initialize(features, timed_features, chain_id, ty_builder)
}
@@ -80,7 +75,7 @@ impl Environment {
.with_override_profile(TimedFeatureOverride::Testing)
.build();
- let ty_builder = aptos_default_ty_builder(&features);
+ let ty_builder = aptos_default_ty_builder();
Arc::new(Self::initialize(
features,
timed_features,
@@ -89,16 +84,6 @@ impl Environment {
))
}
- pub fn with_features_for_testing(self, features: Features) -> Arc {
- let ty_builder = aptos_default_ty_builder(&features);
- Arc::new(Self::initialize(
- features,
- self.timed_features,
- self.chain_id,
- ty_builder,
- ))
- }
-
pub fn try_enable_delayed_field_optimization(mut self) -> Self {
if self.features.is_aggregator_v2_delayed_fields_enabled() {
self.vm_config.delayed_field_optimization_enabled = true;
@@ -132,14 +117,7 @@ impl Environment {
chain_id: ChainId,
ty_builder: TypeBuilder,
) -> Self {
- let pseudo_meter_vector_ty_to_ty_tag_construction = true;
-
- let vm_config = aptos_prod_vm_config(
- &features,
- &timed_features,
- pseudo_meter_vector_ty_to_ty_tag_construction,
- ty_builder,
- );
+ let vm_config = aptos_prod_vm_config(&features, &timed_features, ty_builder);
Self {
chain_id,
diff --git a/aptos-move/aptos-vm-types/src/lib.rs b/aptos-move/aptos-vm-types/src/lib.rs
index fd66470b0707d..7858bacc0d1d2 100644
--- a/aptos-move/aptos-vm-types/src/lib.rs
+++ b/aptos-move/aptos-vm-types/src/lib.rs
@@ -3,8 +3,8 @@
pub mod abstract_write_op;
pub mod change_set;
-pub mod check_change_set;
pub mod environment;
+pub mod module_write_set;
pub mod output;
pub mod resolver;
pub mod resource_group_adapter;
diff --git a/aptos-move/aptos-vm-types/src/module_write_set.rs b/aptos-move/aptos-vm-types/src/module_write_set.rs
new file mode 100644
index 0000000000000..a230c43780f6c
--- /dev/null
+++ b/aptos-move/aptos-vm-types/src/module_write_set.rs
@@ -0,0 +1,83 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{change_set::WriteOpInfo, resolver::ExecutorView};
+use aptos_types::{
+ state_store::state_key::StateKey,
+ write_set::{TransactionWrite, WriteOp, WriteOpSize},
+};
+use move_binary_format::errors::{PartialVMError, PartialVMResult};
+use move_core_types::vm_status::StatusCode;
+use std::collections::BTreeMap;
+
+#[must_use]
+#[derive(Debug, Clone, Eq, PartialEq)]
+pub struct ModuleWriteSet {
+ // True if there are write ops which write to 0x1, etc. A special flag
+ // is used for performance reasons, as otherwise we would need traverse
+ // the write ops and deserializes access paths.
+ has_writes_to_special_address: bool,
+ write_ops: BTreeMap